Flatten *FactoryBase hierarchy

This renames all *FactoryBase traits to *Factory, removes
transparent *Factory objects, and propagates this flattened hierarchy
throughout the codebase.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>