Massive internal restructuring