Tidying up into new structure after the merge