reestructure some content