Makefiles and stuff
Renamed a few files
Cleaned up files