refactoring the game, the yard, and the beginings of some tests