Moved the plugin providers to where they probably fit better