Fixed problems with plugin.yml & restructured