diff --git a/Makefile.am b/Makefile.am
index e5984bd..ac0b7b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
-SUBDIRS = \
-	doc \
-	src \
-	src/h5_core \
-	test \
+SUBDIRS =		\
+	doc		\
+	src/C		\
+	src/h5core	\
+	test		\
 	tools
 
 MAINTAINERCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index cecf213..d843742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -573,9 +573,8 @@ AC_SUBST(TOOLS_HDFLIB)
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
-	src/Makefile
-	src/bindings/Makefile
-	src/h5_core/Makefile
+	src/C/Makefile
+	src/h5core/Makefile
 	test/Makefile
 	test/H5Part/Makefile
 	test/H5Block/Makefile
@@ -610,4 +609,4 @@ AC_MSG_RESULT([MPIINC =             $MPIINC])
 AC_MSG_RESULT([MPIROOT =            $MPIROOT])
 AC_MSG_RESULT([HDF5ROOT =           $HDF5ROOT])
 AC_MSG_RESULT([LDFLAGS =            $LDFLAGS])
-AC_MSG_RESULT([ ])
\ No newline at end of file
+AC_MSG_RESULT([ ])