Folder reorganisation

Removed old folders and moved everything to the root.