Modularized more of the main class into a Player class and updated main.cpp and Makefile