tidying up file structure prior to merge