Moving around code
Merge pull request #1 from AnBeug/Folder-Restructuring

Moving around code