Merged in the new makefile, and formatted source files