*8117* Port sections to new structures