diff --git a/samples/test_exif/audio.m4a b/samples/test_exif/audio/audio.m4a
similarity index 100%
rename from samples/test_exif/audio.m4a
rename to samples/test_exif/audio/audio.m4a
diff --git a/samples/test_exif/Plain With Spaces And Uppercase 123.jpg b/samples/test_exif/jpg/Plain With Spaces And Uppercase 123.jpg
similarity index 100%
rename from samples/test_exif/Plain With Spaces And Uppercase 123.jpg
rename to samples/test_exif/jpg/Plain With Spaces And Uppercase 123.jpg
diff --git a/samples/test_exif/imghdr-error.jpg b/samples/test_exif/jpg/invalid/imghdr-error.jpg
similarity index 100%
rename from samples/test_exif/imghdr-error.jpg
rename to samples/test_exif/jpg/invalid/imghdr-error.jpg
diff --git a/samples/test_exif/invalid.jpg b/samples/test_exif/jpg/invalid/invalid.jpg
similarity index 100%
rename from samples/test_exif/invalid.jpg
rename to samples/test_exif/jpg/invalid/invalid.jpg
diff --git a/samples/test_exif/with-location-inv.jpg b/samples/test_exif/jpg/invalid/with-location-inv.jpg
similarity index 100%
rename from samples/test_exif/with-location-inv.jpg
rename to samples/test_exif/jpg/invalid/with-location-inv.jpg
diff --git a/samples/test_exif/no-exif.jpg b/samples/test_exif/jpg/no-exif.jpg
similarity index 100%
rename from samples/test_exif/no-exif.jpg
rename to samples/test_exif/jpg/no-exif.jpg
diff --git a/samples/test_exif/plain.jpg b/samples/test_exif/jpg/plain.jpg
similarity index 100%
rename from samples/test_exif/plain.jpg
rename to samples/test_exif/jpg/plain.jpg
diff --git a/samples/test_exif/with-album-and-title-and-location.jpg b/samples/test_exif/jpg/with-album/with-album-and-title-and-location.jpg
similarity index 100%
rename from samples/test_exif/with-album-and-title-and-location.jpg
rename to samples/test_exif/jpg/with-album/with-album-and-title-and-location.jpg
diff --git a/samples/test_exif/with-album-and-title.jpg b/samples/test_exif/jpg/with-album/with-album-and-title.jpg
similarity index 100%
rename from samples/test_exif/with-album-and-title.jpg
rename to samples/test_exif/jpg/with-album/with-album-and-title.jpg
diff --git a/samples/test_exif/with-album.jpg b/samples/test_exif/jpg/with-album/with-album.jpg
similarity index 100%
rename from samples/test_exif/with-album.jpg
rename to samples/test_exif/jpg/with-album/with-album.jpg
diff --git a/samples/test_exif/with-filename-and-title-in-exif.jpg b/samples/test_exif/jpg/with-filename-and-title-in-exif.jpg
similarity index 100%
rename from samples/test_exif/with-filename-and-title-in-exif.jpg
rename to samples/test_exif/jpg/with-filename-and-title-in-exif.jpg
diff --git a/samples/test_exif/with-filename-in-exif.jpg b/samples/test_exif/jpg/with-filename-in-exif.jpg
similarity index 100%
rename from samples/test_exif/with-filename-in-exif.jpg
rename to samples/test_exif/jpg/with-filename-in-exif.jpg
diff --git a/samples/test_exif/with-location-and-title.jpg b/samples/test_exif/jpg/with-location/with-location-and-title.jpg
similarity index 100%
rename from samples/test_exif/with-location-and-title.jpg
rename to samples/test_exif/jpg/with-location/with-location-and-title.jpg
diff --git a/samples/test_exif/with-location-zero-coordinate.jpg b/samples/test_exif/jpg/with-location/with-location-zero-coordinate.jpg
similarity index 100%
rename from samples/test_exif/with-location-zero-coordinate.jpg
rename to samples/test_exif/jpg/with-location/with-location-zero-coordinate.jpg
diff --git a/samples/test_exif/with-location.jpg b/samples/test_exif/jpg/with-location/with-location.jpg
similarity index 100%
rename from samples/test_exif/with-location.jpg
rename to samples/test_exif/jpg/with-location/with-location.jpg
diff --git a/samples/test_exif/with-null-coordinates.jpg b/samples/test_exif/jpg/with-null-coordinates.jpg
similarity index 100%
rename from samples/test_exif/with-null-coordinates.jpg
rename to samples/test_exif/jpg/with-null-coordinates.jpg
diff --git a/samples/test_exif/with-original-name.jpg b/samples/test_exif/jpg/with-original-name.jpg
similarity index 100%
rename from samples/test_exif/with-original-name.jpg
rename to samples/test_exif/jpg/with-original-name.jpg
diff --git a/samples/test_exif/with-title.jpg b/samples/test_exif/jpg/with-title.jpg
similarity index 100%
rename from samples/test_exif/with-title.jpg
rename to samples/test_exif/jpg/with-title.jpg
diff --git a/samples/test_exif/text.txt b/samples/test_exif/txt/text.txt
similarity index 100%
rename from samples/test_exif/text.txt
rename to samples/test_exif/txt/text.txt
diff --git a/samples/test_exif/video.mov b/samples/test_exif/video/video.mov
similarity index 100%
rename from samples/test_exif/video.mov
rename to samples/test_exif/video/video.mov