diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8094aaa..e05e33f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,7 @@ if(VERBOSE)
 endif()
 
 include_directories(${YAML_CPP_SOURCE_DIR}/include)
+include_directories(${YAML_CPP_SOURCE_DIR}/src)
 
 
 ###
diff --git a/include/yaml-cpp/old-api/node.h b/include/yaml-cpp/old-api/node.h
index 2c0a686..6c07315 100644
--- a/include/yaml-cpp/old-api/node.h
+++ b/include/yaml-cpp/old-api/node.h
@@ -9,10 +9,10 @@
 #include "yaml-cpp/conversion.h"
 #include "yaml-cpp/dll.h"
 #include "yaml-cpp/exceptions.h"
-#include "yaml-cpp/iterator.h"
-#include "yaml-cpp/ltnode.h"
 #include "yaml-cpp/mark.h"
 #include "yaml-cpp/noncopyable.h"
+#include "yaml-cpp/old-api/iterator.h"
+#include "yaml-cpp/old-api/ltnode.h"
 #include <iostream>
 #include <map>
 #include <memory>
diff --git a/src/null.cpp b/src/null.cpp
index 9e03af0..240de33 100644
--- a/src/null.cpp
+++ b/src/null.cpp
@@ -1,7 +1,7 @@
 #include "yaml-cpp/null.h"
 
 #if YAML_CPP_OLD_API
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 #endif
 
 namespace YAML
diff --git a/src/old-api/aliasmanager.cpp b/src/old-api/aliasmanager.cpp
index ed4d3b5..f400612 100644
--- a/src/old-api/aliasmanager.cpp
+++ b/src/old-api/aliasmanager.cpp
@@ -1,5 +1,5 @@
-#include "yaml-cpp/aliasmanager.h"
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/aliasmanager.h"
+#include "yaml-cpp/old-api/node.h"
 #include <cassert>
 #include <sstream>
 
diff --git a/src/iterator.cpp b/src/old-api/iterator.cpp
similarity index 98%
rename from src/iterator.cpp
rename to src/old-api/iterator.cpp
index f4159e3..c2a3337 100644
--- a/src/iterator.cpp
+++ b/src/old-api/iterator.cpp
@@ -1,4 +1,4 @@
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 #include "yaml-cpp/exceptions.h"
 #include "iterpriv.h"
 
diff --git a/src/iterpriv.h b/src/old-api/iterpriv.h
similarity index 100%
rename from src/iterpriv.h
rename to src/old-api/iterpriv.h
diff --git a/src/old-api/node.cpp b/src/old-api/node.cpp
index c9a8000..8f7ad36 100644
--- a/src/old-api/node.cpp
+++ b/src/old-api/node.cpp
@@ -1,14 +1,14 @@
-#include "yaml-cpp/node.h"
-#include "iterpriv.h"
-#include "nodebuilder.h"
-#include "nodeownership.h"
-#include "scanner.h"
-#include "tag.h"
-#include "token.h"
+#include "yaml-cpp/old-api/node.h"
 #include "yaml-cpp/aliasmanager.h"
 #include "yaml-cpp/emitfromevents.h"
 #include "yaml-cpp/emitter.h"
 #include "yaml-cpp/eventhandler.h"
+#include "old-api/iterpriv.h"
+#include "old-api/nodebuilder.h"
+#include "old-api/nodeownership.h"
+#include "scanner.h"
+#include "tag.h"
+#include "token.h"
 #include <cassert>
 #include <stdexcept>
 
diff --git a/src/old-api/nodebuilder.cpp b/src/old-api/nodebuilder.cpp
index 13a7032..f863d7c 100644
--- a/src/old-api/nodebuilder.cpp
+++ b/src/old-api/nodebuilder.cpp
@@ -1,6 +1,6 @@
-#include "nodebuilder.h"
+#include "old-api/nodebuilder.h"
 #include "yaml-cpp/mark.h"
-#include "yaml-cpp/node.h"
+#include "yaml-cpp/old-api/node.h"
 #include <cassert>
 
 namespace YAML
diff --git a/src/old-api/nodeownership.cpp b/src/old-api/nodeownership.cpp
index 118edbc..44bb818 100644
--- a/src/old-api/nodeownership.cpp
+++ b/src/old-api/nodeownership.cpp
@@ -1,5 +1,5 @@
-#include "nodeownership.h"
-#include "yaml-cpp/node.h"
+#include "old-api/nodeownership.h"
+#include "yaml-cpp/old-api/node.h"
 
 namespace YAML
 {
diff --git a/src/parser.cpp b/src/parser.cpp
index 83ca9e4..c131b14 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1,8 +1,7 @@
 #include "yaml-cpp/parser.h"
-#include "directives.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/exceptions.h"
-#include "yaml-cpp/node.h"
+#include "directives.h"
 #include "scanner.h"
 #include "singledocparser.h"
 #include "tag.h"
@@ -11,6 +10,7 @@
 #include <cstdio>
 
 #if YAML_CPP_OLD_API
+#include "yaml-cpp/old-api/node.h"
 #include "old-api/nodebuilder.h"
 #endif
 
diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
index 792dcfc..22339f0 100644
--- a/util/CMakeLists.txt
+++ b/util/CMakeLists.txt
@@ -1,5 +1,2 @@
 add_executable(parse parse.cpp)
 target_link_libraries(parse yaml-cpp)
-
-add_executable(value value.cpp)
-target_link_libraries(value yaml-cpp)
diff --git a/util/value.cpp b/util/value.cpp
deleted file mode 100644
index 4a84d85..0000000
--- a/util/value.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "yaml-cpp/yaml.h"
-#include <map>
-
-int main()
-{
-	YAML::Node node = YAML::Parse("{foo: bar, monkey: value}");
-	std::cout << node << "\n";
-	
-	return 0;
-}