More restructure.