moving files and tidying up