Completed substate restructure.