Folder restructuring

Merging new folder structure into develop branch