diff --git a/CMakeLists.txt b/CMakeLists.txt
index d18cc668e0c2e731f00ecf4f73880d8e8d97c9e6..8989f7b0ffc4f469272add1b7b1fee21ca254ad1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1204,7 +1204,7 @@ if(ENABLE_WRAP_PYTHON)
     if(SWIG_MAJOR_VERSION EQUAL 1)
       message("WARNING: Python bindings require SWIG >= 2: disabling Python")
     else(SWIG_MAJOR_VERSION EQUAL 1)
-      add_subdirectory(gmshpy)
+      add_subdirectory(wrappers/gmshpy)
     endif(SWIG_MAJOR_VERSION EQUAL 1)
   endif(SWIG_FOUND AND PYTHONLIBS_FOUND)
 endif(ENABLE_WRAP_PYTHON)
diff --git a/gmshpy/CMakeLists.txt b/wrappers/gmshpy/CMakeLists.txt
similarity index 100%
rename from gmshpy/CMakeLists.txt
rename to wrappers/gmshpy/CMakeLists.txt
diff --git a/gmshpy/__init__.py.in b/wrappers/gmshpy/__init__.py.in
similarity index 100%
rename from gmshpy/__init__.py.in
rename to wrappers/gmshpy/__init__.py.in
diff --git a/gmshpy/gmshCommon.i b/wrappers/gmshpy/gmshCommon.i
similarity index 100%
rename from gmshpy/gmshCommon.i
rename to wrappers/gmshpy/gmshCommon.i
diff --git a/gmshpy/gmshGeo.i b/wrappers/gmshpy/gmshGeo.i
similarity index 100%
rename from gmshpy/gmshGeo.i
rename to wrappers/gmshpy/gmshGeo.i
diff --git a/gmshpy/gmshMesh.i b/wrappers/gmshpy/gmshMesh.i
similarity index 100%
rename from gmshpy/gmshMesh.i
rename to wrappers/gmshpy/gmshMesh.i
diff --git a/gmshpy/gmshNumeric.i b/wrappers/gmshpy/gmshNumeric.i
similarity index 100%
rename from gmshpy/gmshNumeric.i
rename to wrappers/gmshpy/gmshNumeric.i
diff --git a/gmshpy/gmshPost.i b/wrappers/gmshpy/gmshPost.i
similarity index 100%
rename from gmshpy/gmshPost.i
rename to wrappers/gmshpy/gmshPost.i
diff --git a/gmshpy/gmshSolver.i b/wrappers/gmshpy/gmshSolver.i
similarity index 100%
rename from gmshpy/gmshSolver.i
rename to wrappers/gmshpy/gmshSolver.i