Rearranged the src files and class files and rewrote the makefile to compile correctly. Also adjusted the run.bat so it ran correctly