Further restructuring and tidying