Moved files around and updated to latest PluginAPI version