Reorganized folder/file names.