Folder structure

Folder structure and untested changes.