Revert "Merge of Game"

This reverts commit 3eacf3b9bc08d5446f8298632f03cdac1038335d.