Refactor BattleSurface -> BattleLayer