File cleanup and addition of Makefile