Updated Plugins and new directory structure