Refactor: merge Game and Board into Board