Fix folder structure

Adjust folder structure to match with what Plugin.xml tell