Final reestructure