Folder restructuring

Restructured the working directory to be simpler.