Changed structure of game
Fixed some bugs