More re-arranging of files