Add main game class
Create dedicated GameState class
Return BASIC helper methods to top level
Move state methods to GameState class