Reorganizing files and spacenames