*8117* Move section management into management structure; remove old