Move files to fit directory structure