Revert "Split SquareBoard into GameBoard and GameBoardComponent"

This reverts commit 560bb71ebb3b57b8921eea19374306a3196b6f16.
Raw commit, need cleaning