Renaming PluginManager to Factory and de-pimplified it