Completed sub-state restructure.