Massive re-organization and simplification