Sorted out the multiple source files and the makefile.