Made Game class and did some more reordering of folders