Repo reorg. Tile rearrangement for v5