diff --git a/ndn-cpp/Name.h b/ndn-cpp/c/Name.h
similarity index 100%
rename from ndn-cpp/Name.h
rename to ndn-cpp/c/Name.h
diff --git a/ndn-cpp/encoding/BinaryXML.h b/ndn-cpp/c/encoding/BinaryXML.h
similarity index 100%
rename from ndn-cpp/encoding/BinaryXML.h
rename to ndn-cpp/c/encoding/BinaryXML.h
diff --git a/ndn-cpp/encoding/BinaryXMLDecoder.c b/ndn-cpp/c/encoding/BinaryXMLDecoder.c
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLDecoder.c
rename to ndn-cpp/c/encoding/BinaryXMLDecoder.c
diff --git a/ndn-cpp/encoding/BinaryXMLDecoder.h b/ndn-cpp/c/encoding/BinaryXMLDecoder.h
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLDecoder.h
rename to ndn-cpp/c/encoding/BinaryXMLDecoder.h
diff --git a/ndn-cpp/encoding/BinaryXMLEncoder.c b/ndn-cpp/c/encoding/BinaryXMLEncoder.c
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLEncoder.c
rename to ndn-cpp/c/encoding/BinaryXMLEncoder.c
diff --git a/ndn-cpp/encoding/BinaryXMLEncoder.h b/ndn-cpp/c/encoding/BinaryXMLEncoder.h
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLEncoder.h
rename to ndn-cpp/c/encoding/BinaryXMLEncoder.h
diff --git a/ndn-cpp/encoding/BinaryXMLName.c b/ndn-cpp/c/encoding/BinaryXMLName.c
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLName.c
rename to ndn-cpp/c/encoding/BinaryXMLName.c
diff --git a/ndn-cpp/encoding/BinaryXMLName.h b/ndn-cpp/c/encoding/BinaryXMLName.h
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLName.h
rename to ndn-cpp/c/encoding/BinaryXMLName.h
diff --git a/ndn-cpp/encoding/BinaryXMLStructureDecoder.c b/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLStructureDecoder.c
rename to ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c
diff --git a/ndn-cpp/encoding/BinaryXMLStructureDecoder.h b/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h
similarity index 100%
rename from ndn-cpp/encoding/BinaryXMLStructureDecoder.h
rename to ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h
diff --git a/ndn-cpp/util/DynamicUCharArray.c b/ndn-cpp/c/util/DynamicUCharArray.c
similarity index 100%
rename from ndn-cpp/util/DynamicUCharArray.c
rename to ndn-cpp/c/util/DynamicUCharArray.c
diff --git a/ndn-cpp/util/DynamicUCharArray.h b/ndn-cpp/c/util/DynamicUCharArray.h
similarity index 100%
rename from ndn-cpp/util/DynamicUCharArray.h
rename to ndn-cpp/c/util/DynamicUCharArray.h
diff --git a/ndn-cpp/util/ndn_memory.c b/ndn-cpp/c/util/ndn_memory.c
similarity index 100%
rename from ndn-cpp/util/ndn_memory.c
rename to ndn-cpp/c/util/ndn_memory.c
diff --git a/ndn-cpp/util/ndn_memory.h b/ndn-cpp/c/util/ndn_memory.h
similarity index 97%
rename from ndn-cpp/util/ndn_memory.h
rename to ndn-cpp/c/util/ndn_memory.h
index 07bd24c..9051a02 100644
--- a/ndn-cpp/util/ndn_memory.h
+++ b/ndn-cpp/c/util/ndn_memory.h
@@ -11,7 +11,7 @@
 #ifndef NDN_MEMORY_H
 #define	NDN_MEMORY_H
 
-#include "../../config.h"
+#include "../../../config.h"
 
 #ifdef	__cplusplus
 extern "C" {
diff --git a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp b/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
index e771522..b453794 100644
--- a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
+++ b/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <stdexcept>
-#include "BinaryXMLName.h"
+#include "../c/encoding/BinaryXMLName.h"
 #include "../Name.hpp"
 #include "BinaryXMLWireFormat.hpp"