refactoring game structure

No tears, only dreams now.