Major site structure rework