Moved some code into cpp files
Makefile updates