Tidying up folder and file names