Further modularization: Game class implemented, and refactored code
Resolved conflicts and merged @dcgauld's code