Moved singletons and plugins to controller.utils