Refactor core game model to be consistent with FEN