Bring back to life...
Server restructuring...
server/Game class now handles pre-game
Merged