fixes

fixes to the structure of the plugin