diff --git a/bindings/C/CMakeLists.txt b/bindings/C/CMakeLists.txt
index 666fdaefd9..acadf8ae21 100644
--- a/bindings/C/CMakeLists.txt
+++ b/bindings/C/CMakeLists.txt
@@ -5,12 +5,12 @@
 
 
 target_sources(adios2 PRIVATE 
-${CMAKE_CURRENT_SOURCE_DIR}/c/adios2_c_adios.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/c/adios2_c_io.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/c/adios2_c_engine.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/c/adios2_c_variable.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/c/adios2_c_attribute.cpp
-${CMAKE_CURRENT_SOURCE_DIR}/c/adios2_c_operator.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/adios2/c/adios2_c_adios.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/adios2/c/adios2_c_io.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/adios2/c/adios2_c_engine.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/adios2/c/adios2_c_variable.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/adios2/c/adios2_c_attribute.cpp
+${CMAKE_CURRENT_SOURCE_DIR}/adios2/c/adios2_c_operator.cpp
 )
 target_include_directories(adios2
   PUBLIC
@@ -26,12 +26,12 @@ install(
 )
 
 install(
-  FILES c/adios2_c_types.h 
-        c/adios2_c_adios.h
-        c/adios2_c_io.h
-        c/adios2_c_variable.h
-        c/adios2_c_attribute.h
-        c/adios2_c_engine.h
-        c/adios2_c_operator.h
+  FILES adios2/c/adios2_c_types.h 
+        adios2/c/adios2_c_adios.h
+        adios2/c/adios2_c_io.h
+        adios2/c/adios2_c_variable.h
+        adios2/c/adios2_c_attribute.h
+        adios2/c/adios2_c_engine.h
+        adios2/c/adios2_c_operator.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2/c
 )
diff --git a/bindings/C/c/adios2_c_adios.cpp b/bindings/C/adios2/c/adios2_c_adios.cpp
similarity index 100%
rename from bindings/C/c/adios2_c_adios.cpp
rename to bindings/C/adios2/c/adios2_c_adios.cpp
diff --git a/bindings/C/c/adios2_c_adios.h b/bindings/C/adios2/c/adios2_c_adios.h
similarity index 100%
rename from bindings/C/c/adios2_c_adios.h
rename to bindings/C/adios2/c/adios2_c_adios.h
diff --git a/bindings/C/c/adios2_c_attribute.cpp b/bindings/C/adios2/c/adios2_c_attribute.cpp
similarity index 100%
rename from bindings/C/c/adios2_c_attribute.cpp
rename to bindings/C/adios2/c/adios2_c_attribute.cpp
diff --git a/bindings/C/c/adios2_c_attribute.h b/bindings/C/adios2/c/adios2_c_attribute.h
similarity index 100%
rename from bindings/C/c/adios2_c_attribute.h
rename to bindings/C/adios2/c/adios2_c_attribute.h
diff --git a/bindings/C/c/adios2_c_engine.cpp b/bindings/C/adios2/c/adios2_c_engine.cpp
similarity index 100%
rename from bindings/C/c/adios2_c_engine.cpp
rename to bindings/C/adios2/c/adios2_c_engine.cpp
diff --git a/bindings/C/c/adios2_c_engine.h b/bindings/C/adios2/c/adios2_c_engine.h
similarity index 100%
rename from bindings/C/c/adios2_c_engine.h
rename to bindings/C/adios2/c/adios2_c_engine.h
diff --git a/bindings/C/c/adios2_c_internal.h b/bindings/C/adios2/c/adios2_c_internal.h
similarity index 100%
rename from bindings/C/c/adios2_c_internal.h
rename to bindings/C/adios2/c/adios2_c_internal.h
diff --git a/bindings/C/c/adios2_c_internal.inl b/bindings/C/adios2/c/adios2_c_internal.inl
similarity index 100%
rename from bindings/C/c/adios2_c_internal.inl
rename to bindings/C/adios2/c/adios2_c_internal.inl
diff --git a/bindings/C/c/adios2_c_io.cpp b/bindings/C/adios2/c/adios2_c_io.cpp
similarity index 100%
rename from bindings/C/c/adios2_c_io.cpp
rename to bindings/C/adios2/c/adios2_c_io.cpp
diff --git a/bindings/C/c/adios2_c_io.h b/bindings/C/adios2/c/adios2_c_io.h
similarity index 100%
rename from bindings/C/c/adios2_c_io.h
rename to bindings/C/adios2/c/adios2_c_io.h
diff --git a/bindings/C/c/adios2_c_operator.cpp b/bindings/C/adios2/c/adios2_c_operator.cpp
similarity index 100%
rename from bindings/C/c/adios2_c_operator.cpp
rename to bindings/C/adios2/c/adios2_c_operator.cpp
diff --git a/bindings/C/c/adios2_c_operator.h b/bindings/C/adios2/c/adios2_c_operator.h
similarity index 100%
rename from bindings/C/c/adios2_c_operator.h
rename to bindings/C/adios2/c/adios2_c_operator.h
diff --git a/bindings/C/c/adios2_c_types.h b/bindings/C/adios2/c/adios2_c_types.h
similarity index 100%
rename from bindings/C/c/adios2_c_types.h
rename to bindings/C/adios2/c/adios2_c_types.h
diff --git a/bindings/C/c/adios2_c_variable.cpp b/bindings/C/adios2/c/adios2_c_variable.cpp
similarity index 100%
rename from bindings/C/c/adios2_c_variable.cpp
rename to bindings/C/adios2/c/adios2_c_variable.cpp
diff --git a/bindings/C/c/adios2_c_variable.h b/bindings/C/adios2/c/adios2_c_variable.h
similarity index 100%
rename from bindings/C/c/adios2_c_variable.h
rename to bindings/C/adios2/c/adios2_c_variable.h
diff --git a/bindings/C/adios2_c.h b/bindings/C/adios2_c.h
index 7d83dd5ab2..ed13e24601 100644
--- a/bindings/C/adios2_c.h
+++ b/bindings/C/adios2_c.h
@@ -13,11 +13,11 @@
 
 #include "adios2/common/ADIOSConfig.h"
 
-#include "c/adios2_c_adios.h"
-#include "c/adios2_c_attribute.h"
-#include "c/adios2_c_engine.h"
-#include "c/adios2_c_io.h"
-#include "c/adios2_c_operator.h"
-#include "c/adios2_c_variable.h"
+#include "adios2/c/adios2_c_adios.h"
+#include "adios2/c/adios2_c_attribute.h"
+#include "adios2/c/adios2_c_engine.h"
+#include "adios2/c/adios2_c_io.h"
+#include "adios2/c/adios2_c_operator.h"
+#include "adios2/c/adios2_c_variable.h"
 
 #endif /* ADIOS2_BINDINGS_C_ADIOS2_C_H_ */
diff --git a/bindings/CXX11/CMakeLists.txt b/bindings/CXX11/CMakeLists.txt
index c39e76db75..ac043ead3b 100644
--- a/bindings/CXX11/CMakeLists.txt
+++ b/bindings/CXX11/CMakeLists.txt
@@ -4,17 +4,17 @@
 #------------------------------------------------------------------------------#
 
 target_sources(adios2 PRIVATE
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/ADIOS.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/Attribute.cpp 
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/Engine.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/Engine.tcc
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/IO.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/IO.tcc
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/Operator.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/Types.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/Types.tcc
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/Variable.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/cxx11/fstream/ADIOS2fstream.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/ADIOS.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/Attribute.cpp 
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/Engine.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/Engine.tcc
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/IO.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/IO.tcc
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/Operator.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/Types.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/Types.tcc
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/Variable.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/adios2/cxx11/fstream/ADIOS2fstream.cpp
 )
 
 target_include_directories(adios2
@@ -28,18 +28,18 @@ install(
 )
 
 install(
-  FILES cxx11/fstream/ADIOS2fstream.h 
+  FILES adios2/cxx11/fstream/ADIOS2fstream.h 
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2/cxx11/fstream
 )
 
 install(
-  FILES cxx11/ADIOS.h 
-        cxx11/ADIOS.inl
-        cxx11/IO.h
-        cxx11/Variable.h 
-        cxx11/Attribute.h
-        cxx11/Engine.h
-        cxx11/Operator.h
-        cxx11/Types.h
+  FILES adios2/cxx11/ADIOS.h 
+        adios2/cxx11/ADIOS.inl
+        adios2/cxx11/IO.h
+        adios2/cxx11/Variable.h 
+        adios2/cxx11/Attribute.h
+        adios2/cxx11/Engine.h
+        adios2/cxx11/Operator.h
+        adios2/cxx11/Types.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2/cxx11
 )
diff --git a/bindings/CXX11/adios2.h b/bindings/CXX11/adios2.h
index fd45efe651..d674c2f235 100644
--- a/bindings/CXX11/adios2.h
+++ b/bindings/CXX11/adios2.h
@@ -15,13 +15,13 @@
 #include "adios2/common/ADIOSMacros.h"
 #include "adios2/common/ADIOSTypes.h"
 
-#include "cxx11/ADIOS.h"
-#include "cxx11/Attribute.h"
-#include "cxx11/Engine.h"
-#include "cxx11/IO.h"
-#include "cxx11/Operator.h"
-#include "cxx11/Types.h"
-#include "cxx11/Variable.h"
-#include "cxx11/fstream/ADIOS2fstream.h"
+#include "adios2/cxx11/ADIOS.h"
+#include "adios2/cxx11/Attribute.h"
+#include "adios2/cxx11/Engine.h"
+#include "adios2/cxx11/IO.h"
+#include "adios2/cxx11/Operator.h"
+#include "adios2/cxx11/Types.h"
+#include "adios2/cxx11/Variable.h"
+#include "adios2/cxx11/fstream/ADIOS2fstream.h"
 
 #endif /* ADIOS2_BINDINGS_CXX11_H_ */
diff --git a/bindings/CXX11/cxx11/ADIOS.cpp b/bindings/CXX11/adios2/cxx11/ADIOS.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/ADIOS.cpp
rename to bindings/CXX11/adios2/cxx11/ADIOS.cpp
diff --git a/bindings/CXX11/cxx11/ADIOS.h b/bindings/CXX11/adios2/cxx11/ADIOS.h
similarity index 100%
rename from bindings/CXX11/cxx11/ADIOS.h
rename to bindings/CXX11/adios2/cxx11/ADIOS.h
diff --git a/bindings/CXX11/cxx11/ADIOS.inl b/bindings/CXX11/adios2/cxx11/ADIOS.inl
similarity index 100%
rename from bindings/CXX11/cxx11/ADIOS.inl
rename to bindings/CXX11/adios2/cxx11/ADIOS.inl
diff --git a/bindings/CXX11/cxx11/Attribute.cpp b/bindings/CXX11/adios2/cxx11/Attribute.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/Attribute.cpp
rename to bindings/CXX11/adios2/cxx11/Attribute.cpp
diff --git a/bindings/CXX11/cxx11/Attribute.h b/bindings/CXX11/adios2/cxx11/Attribute.h
similarity index 100%
rename from bindings/CXX11/cxx11/Attribute.h
rename to bindings/CXX11/adios2/cxx11/Attribute.h
diff --git a/bindings/CXX11/cxx11/Engine.cpp b/bindings/CXX11/adios2/cxx11/Engine.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/Engine.cpp
rename to bindings/CXX11/adios2/cxx11/Engine.cpp
diff --git a/bindings/CXX11/cxx11/Engine.h b/bindings/CXX11/adios2/cxx11/Engine.h
similarity index 100%
rename from bindings/CXX11/cxx11/Engine.h
rename to bindings/CXX11/adios2/cxx11/Engine.h
diff --git a/bindings/CXX11/cxx11/Engine.tcc b/bindings/CXX11/adios2/cxx11/Engine.tcc
similarity index 100%
rename from bindings/CXX11/cxx11/Engine.tcc
rename to bindings/CXX11/adios2/cxx11/Engine.tcc
diff --git a/bindings/CXX11/cxx11/IO.cpp b/bindings/CXX11/adios2/cxx11/IO.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/IO.cpp
rename to bindings/CXX11/adios2/cxx11/IO.cpp
diff --git a/bindings/CXX11/cxx11/IO.h b/bindings/CXX11/adios2/cxx11/IO.h
similarity index 100%
rename from bindings/CXX11/cxx11/IO.h
rename to bindings/CXX11/adios2/cxx11/IO.h
diff --git a/bindings/CXX11/cxx11/IO.tcc b/bindings/CXX11/adios2/cxx11/IO.tcc
similarity index 100%
rename from bindings/CXX11/cxx11/IO.tcc
rename to bindings/CXX11/adios2/cxx11/IO.tcc
diff --git a/bindings/CXX11/cxx11/Operator.cpp b/bindings/CXX11/adios2/cxx11/Operator.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/Operator.cpp
rename to bindings/CXX11/adios2/cxx11/Operator.cpp
diff --git a/bindings/CXX11/cxx11/Operator.h b/bindings/CXX11/adios2/cxx11/Operator.h
similarity index 100%
rename from bindings/CXX11/cxx11/Operator.h
rename to bindings/CXX11/adios2/cxx11/Operator.h
diff --git a/bindings/CXX11/cxx11/Types.cpp b/bindings/CXX11/adios2/cxx11/Types.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/Types.cpp
rename to bindings/CXX11/adios2/cxx11/Types.cpp
diff --git a/bindings/CXX11/cxx11/Types.h b/bindings/CXX11/adios2/cxx11/Types.h
similarity index 100%
rename from bindings/CXX11/cxx11/Types.h
rename to bindings/CXX11/adios2/cxx11/Types.h
diff --git a/bindings/CXX11/cxx11/Types.tcc b/bindings/CXX11/adios2/cxx11/Types.tcc
similarity index 100%
rename from bindings/CXX11/cxx11/Types.tcc
rename to bindings/CXX11/adios2/cxx11/Types.tcc
diff --git a/bindings/CXX11/cxx11/Variable.cpp b/bindings/CXX11/adios2/cxx11/Variable.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/Variable.cpp
rename to bindings/CXX11/adios2/cxx11/Variable.cpp
diff --git a/bindings/CXX11/cxx11/Variable.h b/bindings/CXX11/adios2/cxx11/Variable.h
similarity index 100%
rename from bindings/CXX11/cxx11/Variable.h
rename to bindings/CXX11/adios2/cxx11/Variable.h
diff --git a/bindings/CXX11/cxx11/Variable.tcc b/bindings/CXX11/adios2/cxx11/Variable.tcc
similarity index 100%
rename from bindings/CXX11/cxx11/Variable.tcc
rename to bindings/CXX11/adios2/cxx11/Variable.tcc
diff --git a/bindings/CXX11/cxx11/fstream/ADIOS2fstream.cpp b/bindings/CXX11/adios2/cxx11/fstream/ADIOS2fstream.cpp
similarity index 100%
rename from bindings/CXX11/cxx11/fstream/ADIOS2fstream.cpp
rename to bindings/CXX11/adios2/cxx11/fstream/ADIOS2fstream.cpp
diff --git a/bindings/CXX11/cxx11/fstream/ADIOS2fstream.h b/bindings/CXX11/adios2/cxx11/fstream/ADIOS2fstream.h
similarity index 100%
rename from bindings/CXX11/cxx11/fstream/ADIOS2fstream.h
rename to bindings/CXX11/adios2/cxx11/fstream/ADIOS2fstream.h
diff --git a/bindings/CXX11/cxx11/fstream/ADIOS2fstream.tcc b/bindings/CXX11/adios2/cxx11/fstream/ADIOS2fstream.tcc
similarity index 100%
rename from bindings/CXX11/cxx11/fstream/ADIOS2fstream.tcc
rename to bindings/CXX11/adios2/cxx11/fstream/ADIOS2fstream.tcc
diff --git a/docs/user_guide/source/api_full/c.rst b/docs/user_guide/source/api_full/c.rst
index 2cdf3fe599..cd6173be07 100644
--- a/docs/user_guide/source/api_full/c.rst
+++ b/docs/user_guide/source/api_full/c.rst
@@ -84,39 +84,39 @@ Usage:
 
 .. doxygenfile:: adios2_c_adios.h
    :project: C
-   :path: ../../bindings/C/c/
+   :path: ../../bindings/C/adios2/c/
 
 ``adios2_io`` handler functions
 -------------------------------
 
 .. doxygenfile:: adios2_c_io.h
    :project: C
-   :path: ../../bindings/C/c/
+   :path: ../../bindings/C/adios2/c/
 
 ``adios2_variable`` handler functions
 -------------------------------------
 
 .. doxygenfile:: adios2_c_variable.h
    :project: C
-   :path: ../../bindings/C/c/
+   :path: ../../bindings/C/adios2/c/
 
 ``adios2_attribute`` handler functions
 --------------------------------------
 
 .. doxygenfile:: adios2_c_attribute.h
    :project: C
-   :path: ../../bindings/C/c/
+   :path: ../../bindings/C/adios2/c/
 
 ``adios2_engine`` handler functions
 -----------------------------------
 
 .. doxygenfile:: adios2_c_engine.h
    :project: C
-   :path: ../../bindings/C/c/
+   :path: ../../bindings/C/adios2/c/
 
 ``adios2_operator`` handler functions
 -------------------------------------
 
 .. doxygenfile:: adios2_c_operator.h
    :project: C
-   :path: ../../bindings/C/c/
+   :path: ../../bindings/C/adios2/c/
diff --git a/docs/user_guide/source/api_full/cxx11.rst b/docs/user_guide/source/api_full/cxx11.rst
index b4cbbbd89d..a093b7cabf 100644
--- a/docs/user_guide/source/api_full/cxx11.rst
+++ b/docs/user_guide/source/api_full/cxx11.rst
@@ -41,7 +41,7 @@ The following section provides a summary of the available functionality for each
 
 .. doxygenclass:: adios2::ADIOS
    :project: CXX11
-   :path: ../../bindings/CXX11/cxx11/
+   :path: ../../bindings/CXX11/adios2/cxx11/
    :members:
    
    
@@ -50,7 +50,7 @@ The following section provides a summary of the available functionality for each
 
 .. doxygenclass:: adios2::IO
    :project: CXX11
-   :path: ../../bindings/CXX11/cxx11/
+   :path: ../../bindings/CXX11/adios2/cxx11/
    :members:
    
 :ref:`Variable` ``<T>`` class
@@ -58,7 +58,7 @@ The following section provides a summary of the available functionality for each
 
 .. doxygenclass:: adios2::Variable
    :project: CXX11
-   :path: ../../bindings/CXX11/cxx11/
+   :path: ../../bindings/CXX11/adios2/cxx11/
    :members:
 
 
@@ -67,7 +67,7 @@ The following section provides a summary of the available functionality for each
 
 .. doxygenclass:: adios2::Attribute
    :project: CXX11
-   :path: ../../bindings/CXX11/cxx11/
+   :path: ../../bindings/CXX11/adios2/cxx11/
    :members:
 
 
@@ -76,7 +76,7 @@ The following section provides a summary of the available functionality for each
 
 .. doxygenclass:: adios2::Engine
    :project: CXX11
-   :path: ../../bindings/CXX11/cxx11/
+   :path: ../../bindings/CXX11/adios2/cxx11/
    :members:
 
 :ref:`Operator` class
@@ -84,7 +84,7 @@ The following section provides a summary of the available functionality for each
 
 .. doxygenclass:: adios2::Operator
    :project: CXX11
-   :path: ../../bindings/CXX11/cxx11/
+   :path: ../../bindings/CXX11/adios2/cxx11/
    :members:
 
 Debugging