Reverted to no PluginController, only namespace