Reorganised project hierarchy and code cleanup
Merge branch 'master' of https://github.com/OllieReynolds/OpenGL-Project.git