Move subsections back into new_arch