diff --git a/setup.py b/setup.py
index fc4646b982e..48f92e390c7 100644
--- a/setup.py
+++ b/setup.py
@@ -105,8 +105,8 @@
     'datasets/ogbg_molpcba/tasks.txt',
     'datasets/quickdraw/labels.txt',
     'datasets/smartwatch_gestures/labels.txt',
-    'image_classification/caltech101_labels.txt',
-    'image_classification/categories_places365.txt',
+    'datasets/caltech101/caltech101_labels.txt',
+    'datasets/places365_small/categories_places365.txt',
     'image_classification/cbis_ddsm_calc_distributions.txt',
     'image_classification/cbis_ddsm_calc_types.txt',
     'image_classification/cbis_ddsm_mass_margins.txt',
@@ -119,16 +119,16 @@
     'image_classification/i_naturalist2021/i_naturalist2021_labels.txt',
     'image_classification/i_naturalist2021/i_naturalist2021_supercategories.txt',
     'image_classification/imagenet_resized_labels.txt',
-    'image_classification/imagenette_labels.txt',
-    'image_classification/imagewang_labels.txt',
+    'datasets/imagenette/imagenette_labels.txt',
+    'datasets/imagewang/imagewang_labels.txt',
     'image_classification/inaturalist_labels.txt',
     'image_classification/inaturalist_supercategories.txt',
     'image_classification/placesfull/categories_placesfull.txt',
     'image_classification/plantae_k_urls.txt',
-    'image_classification/sun397_labels.txt',
-    'image_classification/sun397_tfds_te.txt',
-    'image_classification/sun397_tfds_tr.txt',
-    'image_classification/sun397_tfds_va.txt',
+    'datasets/sun397/sun397_labels.txt',
+    'datasets/sun397/sun397_tfds_te.txt',
+    'datasets/sun397/sun397_tfds_tr.txt',
+    'datasets/sun397/sun397_tfds_va.txt',
     'object_detection/open_images_classes_all.txt',
     'object_detection/open_images_classes_boxable.txt',
     'object_detection/open_images_classes_trainable.txt',
diff --git a/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py b/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py
index 3dc2ec17049..5fd26eb4ac1 100644
--- a/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py
+++ b/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py
@@ -25,7 +25,7 @@
 Imagewang contains Imagenette and Imagewoof combined.
 """
 
-_LABELS_FNAME = "image_classification/imagewang_labels.txt"
+_LABELS_FNAME = "datasets/imagewang/imagewang_labels.txt"
 _URL_PREFIX = "https://s3.amazonaws.com/fast-ai-imageclas"
 _SIZES = ["full-size", "320px", "160px"]
 
diff --git a/tensorflow_datasets/image_classification/imagewang_labels.txt b/tensorflow_datasets/datasets/imagewang/imagewang_labels.txt
similarity index 100%
rename from tensorflow_datasets/image_classification/imagewang_labels.txt
rename to tensorflow_datasets/datasets/imagewang/imagewang_labels.txt
diff --git a/tensorflow_datasets/image_classification/categories_places365.txt b/tensorflow_datasets/datasets/places365_small/categories_places365.txt
similarity index 100%
rename from tensorflow_datasets/image_classification/categories_places365.txt
rename to tensorflow_datasets/datasets/places365_small/categories_places365.txt
diff --git a/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py b/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py
index 530aa386e37..04d4326998c 100644
--- a/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py
+++ b/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py
@@ -29,7 +29,7 @@
 
 _IMAGE_SHAPE = (256, 256, 3)
 
-_LABELS_FNAME = "image_classification/categories_places365.txt"
+_LABELS_FNAME = "datasets/places365_small/categories_places365.txt"
 
 
 class Builder(tfds.core.GeneratorBasedBuilder):