Develop

Restructuring the files to make them more logical