Fixed the build and restructured the plugin a bit