More re-orgs and tidying up