reorganized data subdirectories