fix the complete structure of the plugin