cleaned up the general structure of the game
Merge pull request #2 from Ingelheim/cleanup_structure

cleaned up the general structure of the game