Made Application.cpp into a class and removed some unused old code, more refactoring to come
Some more cleaning up of Application.cpp and Makefile