Updated project structure and moved all commands to the plugin folder for future splitting out