Structure fixes

Removed the stupid folder structure