Site structure overhaul