Move ControllerFactory to subpackage