Move files to correct locations and rename where appropriate