diff --git a/bob/io/image/bmp.cpp b/bob/io/image/cpp/bmp.cpp
similarity index 100%
rename from bob/io/image/bmp.cpp
rename to bob/io/image/cpp/bmp.cpp
diff --git a/bob/io/image/gif.cpp b/bob/io/image/cpp/gif.cpp
similarity index 100%
rename from bob/io/image/gif.cpp
rename to bob/io/image/cpp/gif.cpp
diff --git a/bob/io/image/jpeg.cpp b/bob/io/image/cpp/jpeg.cpp
similarity index 100%
rename from bob/io/image/jpeg.cpp
rename to bob/io/image/cpp/jpeg.cpp
diff --git a/bob/io/image/netpbm.cpp b/bob/io/image/cpp/netpbm.cpp
similarity index 100%
rename from bob/io/image/netpbm.cpp
rename to bob/io/image/cpp/netpbm.cpp
diff --git a/bob/io/image/png.cpp b/bob/io/image/cpp/png.cpp
similarity index 100%
rename from bob/io/image/png.cpp
rename to bob/io/image/cpp/png.cpp
diff --git a/bob/io/image/pnmio.cpp b/bob/io/image/cpp/pnmio.cpp
similarity index 100%
rename from bob/io/image/pnmio.cpp
rename to bob/io/image/cpp/pnmio.cpp
diff --git a/bob/io/image/pnmio.h b/bob/io/image/cpp/pnmio.h
similarity index 100%
rename from bob/io/image/pnmio.h
rename to bob/io/image/cpp/pnmio.h
diff --git a/bob/io/image/tiff.cpp b/bob/io/image/cpp/tiff.cpp
similarity index 100%
rename from bob/io/image/tiff.cpp
rename to bob/io/image/cpp/tiff.cpp
diff --git a/setup.py b/setup.py
index e59f544e3aa96f8d0eba48b02c34b9265cccf7bb..fdbaf6ca83a036509072a4af532f093031264f07 100644
--- a/setup.py
+++ b/setup.py
@@ -390,13 +390,13 @@ setup(
 
       Library("bob.io.image.bob_io_image",
         [
-          "bob/io/image/tiff.cpp",
-          "bob/io/image/gif.cpp",
-          "bob/io/image/png.cpp",
-          "bob/io/image/jpeg.cpp",
-          "bob/io/image/bmp.cpp",
-          "bob/io/image/pnmio.cpp",
-          "bob/io/image/netpbm.cpp",
+          "bob/io/image/cpp/tiff.cpp",
+          "bob/io/image/cpp/gif.cpp",
+          "bob/io/image/cpp/png.cpp",
+          "bob/io/image/cpp/jpeg.cpp",
+          "bob/io/image/cpp/bmp.cpp",
+          "bob/io/image/cpp/pnmio.cpp",
+          "bob/io/image/cpp/netpbm.cpp",
         ],
         packages = packages,
         boost_modules = boost_modules,