diff --git a/.gitattributes b/.gitattributes
index f979aa0..bfab404 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -362,38 +362,38 @@ doc/tetrahedron_refinements/README -text
 doc/tetrahedron_refinements/text2vtk.py -text
 /license.txt -text
 /rules.make -text
-src/H5.c -text
-src/H5.h -text
-src/H5Block.c -text
-src/H5Block.h -text
-src/H5Fed.c -text
-src/H5Fed.h -text
-src/H5Fed_adjacency.c -text
-src/H5Fed_adjacency.h -text
-src/H5Fed_inquiry.c -text
-src/H5Fed_inquiry.h -text
-src/H5Fed_map.c -text
-src/H5Fed_map.h -text
-src/H5Fed_retrieve.c -text
-src/H5Fed_retrieve.h -text
-src/H5Fed_store.c -text
-src/H5Fed_store.h -text
-src/H5Fed_tags.c -text
-src/H5Fed_tags.h -text
-src/H5Part.c -text
-src/H5Part.h -text
-src/H5_inquiry.c -text
-src/H5_inquiry.h -text
+src/C++/H5Fed.cc -text
+src/C++/H5Fed.hh -text
+src/C++/Makefile.am -text
+src/C/H5.c -text
+src/C/H5.h -text
+src/C/H5Block.c -text
+src/C/H5Block.h -text
+src/C/H5Fed.c -text
+src/C/H5Fed.h -text
+src/C/H5Fed_adjacency.c -text
+src/C/H5Fed_adjacency.h -text
+src/C/H5Fed_inquiry.c -text
+src/C/H5Fed_inquiry.h -text
+src/C/H5Fed_map.c -text
+src/C/H5Fed_map.h -text
+src/C/H5Fed_retrieve.c -text
+src/C/H5Fed_retrieve.h -text
+src/C/H5Fed_store.c -text
+src/C/H5Fed_store.h -text
+src/C/H5Fed_tags.c -text
+src/C/H5Fed_tags.h -text
+src/C/H5Part.c -text
+src/C/H5Part.h -text
+src/C/H5_inquiry.c -text
+src/C/H5_inquiry.h -text
+src/Fortran/H5BlockF.c -text
+src/Fortran/H5BlockF90.inc -text
+src/Fortran/H5PartF.c -text
+src/Fortran/H5PartF90.inc -text
+src/Fortran/TestUnderscore.f -text
+src/Fortran/TestUnderscoreC.c -text
 src/Makefile.am -text
-src/bindings/C++/H5Fed.cc -text
-src/bindings/C++/H5Fed.hh -text
-src/bindings/C++/Makefile.am -text
-src/bindings/Fortran/H5BlockF.c -text
-src/bindings/Fortran/H5BlockF90.inc -text
-src/bindings/Fortran/H5PartF.c -text
-src/bindings/Fortran/H5PartF90.inc -text
-src/bindings/Fortran/TestUnderscore.f -text
-src/bindings/Fortran/TestUnderscoreC.c -text
 src/bindings/Makefile.am -text
 src/h5_core/Makefile.am -text
 src/h5_core/h5_attribs.c -text
diff --git a/src/bindings/C++/H5Fed.cc b/src/C++/H5Fed.cc
similarity index 100%
rename from src/bindings/C++/H5Fed.cc
rename to src/C++/H5Fed.cc
diff --git a/src/bindings/C++/H5Fed.hh b/src/C++/H5Fed.hh
similarity index 100%
rename from src/bindings/C++/H5Fed.hh
rename to src/C++/H5Fed.hh
diff --git a/src/bindings/C++/Makefile.am b/src/C++/Makefile.am
similarity index 100%
rename from src/bindings/C++/Makefile.am
rename to src/C++/Makefile.am
diff --git a/src/H5.c b/src/C/H5.c
similarity index 100%
rename from src/H5.c
rename to src/C/H5.c
diff --git a/src/H5.h b/src/C/H5.h
similarity index 100%
rename from src/H5.h
rename to src/C/H5.h
diff --git a/src/H5Block.c b/src/C/H5Block.c
similarity index 100%
rename from src/H5Block.c
rename to src/C/H5Block.c
diff --git a/src/H5Block.h b/src/C/H5Block.h
similarity index 100%
rename from src/H5Block.h
rename to src/C/H5Block.h
diff --git a/src/H5Fed.c b/src/C/H5Fed.c
similarity index 100%
rename from src/H5Fed.c
rename to src/C/H5Fed.c
diff --git a/src/H5Fed.h b/src/C/H5Fed.h
similarity index 100%
rename from src/H5Fed.h
rename to src/C/H5Fed.h
diff --git a/src/H5Fed_adjacency.c b/src/C/H5Fed_adjacency.c
similarity index 100%
rename from src/H5Fed_adjacency.c
rename to src/C/H5Fed_adjacency.c
diff --git a/src/H5Fed_adjacency.h b/src/C/H5Fed_adjacency.h
similarity index 100%
rename from src/H5Fed_adjacency.h
rename to src/C/H5Fed_adjacency.h
diff --git a/src/H5Fed_inquiry.c b/src/C/H5Fed_inquiry.c
similarity index 100%
rename from src/H5Fed_inquiry.c
rename to src/C/H5Fed_inquiry.c
diff --git a/src/H5Fed_inquiry.h b/src/C/H5Fed_inquiry.h
similarity index 100%
rename from src/H5Fed_inquiry.h
rename to src/C/H5Fed_inquiry.h
diff --git a/src/H5Fed_map.c b/src/C/H5Fed_map.c
similarity index 100%
rename from src/H5Fed_map.c
rename to src/C/H5Fed_map.c
diff --git a/src/H5Fed_map.h b/src/C/H5Fed_map.h
similarity index 100%
rename from src/H5Fed_map.h
rename to src/C/H5Fed_map.h
diff --git a/src/H5Fed_retrieve.c b/src/C/H5Fed_retrieve.c
similarity index 100%
rename from src/H5Fed_retrieve.c
rename to src/C/H5Fed_retrieve.c
diff --git a/src/H5Fed_retrieve.h b/src/C/H5Fed_retrieve.h
similarity index 100%
rename from src/H5Fed_retrieve.h
rename to src/C/H5Fed_retrieve.h
diff --git a/src/H5Fed_store.c b/src/C/H5Fed_store.c
similarity index 100%
rename from src/H5Fed_store.c
rename to src/C/H5Fed_store.c
diff --git a/src/H5Fed_store.h b/src/C/H5Fed_store.h
similarity index 100%
rename from src/H5Fed_store.h
rename to src/C/H5Fed_store.h
diff --git a/src/H5Fed_tags.c b/src/C/H5Fed_tags.c
similarity index 100%
rename from src/H5Fed_tags.c
rename to src/C/H5Fed_tags.c
diff --git a/src/H5Fed_tags.h b/src/C/H5Fed_tags.h
similarity index 100%
rename from src/H5Fed_tags.h
rename to src/C/H5Fed_tags.h
diff --git a/src/H5Part.c b/src/C/H5Part.c
similarity index 100%
rename from src/H5Part.c
rename to src/C/H5Part.c
diff --git a/src/H5Part.h b/src/C/H5Part.h
similarity index 100%
rename from src/H5Part.h
rename to src/C/H5Part.h
diff --git a/src/H5_inquiry.c b/src/C/H5_inquiry.c
similarity index 100%
rename from src/H5_inquiry.c
rename to src/C/H5_inquiry.c
diff --git a/src/H5_inquiry.h b/src/C/H5_inquiry.h
similarity index 100%
rename from src/H5_inquiry.h
rename to src/C/H5_inquiry.h
diff --git a/src/bindings/Fortran/H5BlockF.c b/src/Fortran/H5BlockF.c
similarity index 100%
rename from src/bindings/Fortran/H5BlockF.c
rename to src/Fortran/H5BlockF.c
diff --git a/src/bindings/Fortran/H5BlockF90.inc b/src/Fortran/H5BlockF90.inc
similarity index 100%
rename from src/bindings/Fortran/H5BlockF90.inc
rename to src/Fortran/H5BlockF90.inc
diff --git a/src/bindings/Fortran/H5PartF.c b/src/Fortran/H5PartF.c
similarity index 100%
rename from src/bindings/Fortran/H5PartF.c
rename to src/Fortran/H5PartF.c
diff --git a/src/bindings/Fortran/H5PartF90.inc b/src/Fortran/H5PartF90.inc
similarity index 100%
rename from src/bindings/Fortran/H5PartF90.inc
rename to src/Fortran/H5PartF90.inc
diff --git a/src/bindings/Fortran/TestUnderscore.f b/src/Fortran/TestUnderscore.f
similarity index 100%
rename from src/bindings/Fortran/TestUnderscore.f
rename to src/Fortran/TestUnderscore.f
diff --git a/src/bindings/Fortran/TestUnderscoreC.c b/src/Fortran/TestUnderscoreC.c
similarity index 100%
rename from src/bindings/Fortran/TestUnderscoreC.c
rename to src/Fortran/TestUnderscoreC.c