Moved around folders/files and Makefiles for uniformity and consistency