Moved all the files into a more suitable structure
Merge branches 'master' and 'MovingProjects'