major overhaul to structure