Major overhaul of structure.