moved the classes to seperate header files, makes it easier to organize. Need to figure out how I can move all the method declarations there as well, not sure if that's possible