Re-factoring.
Convert all controller singletons into a singleton-managing controller
factory.