Folder structure

Folder structure re-organised