More organization and game logic