Board and Game refactoring