A little restructure never hurts.