Quick restructuring before things get out of hand