diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36b033a..436ba24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,18 +56,9 @@ option(MSVC_STHREADED_RT "MSVC: Build with single-threaded static runtime libs (
 ###
 set(header_directory "include/yaml-cpp/")
 
-file(GLOB common_sources "src/[a-zA-Z]*.cpp")
-file(GLOB old_api_sources "src/old-api/[a-zA-Z]*.cpp")
-
-file(GLOB common_public_headers "include/yaml-cpp/[a-zA-Z]*.h")
-file(GLOB old_api_public_headers "include/yaml-cpp/old-api/[a-zA-Z]*.h")
-
-file(GLOB common_private_headers "src/[a-zA-Z]*.h")
-file(GLOB old_api_private_headers "src/old-api/[a-zA-Z]*.h")
-
-list(APPEND sources ${common_sources} ${old_api_sources})
-list(APPEND public_headers ${common_public_headers} ${old_api_public_headers})
-list(APPEND private_headers ${common_private_headers} ${old_api_private_headers})
+file(GLOB sources "src/[a-zA-Z]*.cpp")
+file(GLOB public_headers "include/yaml-cpp/[a-zA-Z]*.h")
+file(GLOB private_headers "src/[a-zA-Z]*.h")
 
 if(YAML_CPP_BUILD_CONTRIB)
 	file(GLOB contrib_sources "src/contrib/[a-zA-Z]*.cpp")
diff --git a/include/yaml-cpp/old-api/aliasmanager.h b/include/yaml-cpp/aliasmanager.h
similarity index 100%
rename from include/yaml-cpp/old-api/aliasmanager.h
rename to include/yaml-cpp/aliasmanager.h
diff --git a/include/yaml-cpp/old-api/conversion.h b/include/yaml-cpp/conversion.h
similarity index 100%
rename from include/yaml-cpp/old-api/conversion.h
rename to include/yaml-cpp/conversion.h
diff --git a/include/yaml-cpp/old-api/iterator.h b/include/yaml-cpp/iterator.h
similarity index 100%
rename from include/yaml-cpp/old-api/iterator.h
rename to include/yaml-cpp/iterator.h
diff --git a/include/yaml-cpp/old-api/ltnode.h b/include/yaml-cpp/ltnode.h
similarity index 100%
rename from include/yaml-cpp/old-api/ltnode.h
rename to include/yaml-cpp/ltnode.h
diff --git a/include/yaml-cpp/old-api/node.h b/include/yaml-cpp/node.h
similarity index 94%
rename from include/yaml-cpp/old-api/node.h
rename to include/yaml-cpp/node.h
index 607d9f0..e78190e 100644
--- a/include/yaml-cpp/old-api/node.h
+++ b/include/yaml-cpp/node.h
@@ -10,9 +10,9 @@
 #include "yaml-cpp/exceptions.h"
 #include "yaml-cpp/mark.h"
 #include "yaml-cpp/noncopyable.h"
-#include "yaml-cpp/old-api/conversion.h"
-#include "yaml-cpp/old-api/iterator.h"
-#include "yaml-cpp/old-api/ltnode.h"
+#include "yaml-cpp/conversion.h"
+#include "yaml-cpp/iterator.h"
+#include "yaml-cpp/ltnode.h"
 #include <iostream>
 #include <map>
 #include <memory>
@@ -129,7 +129,7 @@ namespace YAML
 	};
 }
 
-#include "yaml-cpp/old-api/nodeimpl.h"
-#include "yaml-cpp/old-api/nodereadimpl.h"
+#include "yaml-cpp/nodeimpl.h"
+#include "yaml-cpp/nodereadimpl.h"
 
 #endif // NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
diff --git a/include/yaml-cpp/old-api/nodeimpl.h b/include/yaml-cpp/nodeimpl.h
similarity index 98%
rename from include/yaml-cpp/old-api/nodeimpl.h
rename to include/yaml-cpp/nodeimpl.h
index 7534e04..5ca7ddb 100644
--- a/include/yaml-cpp/old-api/nodeimpl.h
+++ b/include/yaml-cpp/nodeimpl.h
@@ -6,7 +6,7 @@
 #endif
 
 
-#include "yaml-cpp/old-api/nodeutil.h"
+#include "yaml-cpp/nodeutil.h"
 #include <cassert>
 
 namespace YAML
diff --git a/include/yaml-cpp/old-api/nodereadimpl.h b/include/yaml-cpp/nodereadimpl.h
similarity index 100%
rename from include/yaml-cpp/old-api/nodereadimpl.h
rename to include/yaml-cpp/nodereadimpl.h
diff --git a/include/yaml-cpp/old-api/nodeutil.h b/include/yaml-cpp/nodeutil.h
similarity index 100%
rename from include/yaml-cpp/old-api/nodeutil.h
rename to include/yaml-cpp/nodeutil.h
diff --git a/include/yaml-cpp/old-api/stlnode.h b/include/yaml-cpp/stlnode.h
similarity index 100%
rename from include/yaml-cpp/old-api/stlnode.h
rename to include/yaml-cpp/stlnode.h
diff --git a/include/yaml-cpp/yaml.h.cmake b/include/yaml-cpp/yaml.h.cmake
deleted file mode 100644
index 1c93755..0000000
--- a/include/yaml-cpp/yaml.h.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-#define YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
-
-#if defined(_MSC_VER) || (defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4)) // GCC supports "pragma once" correctly since 3.4
-#pragma once
-#endif
-
-#undef YAML_CPP_OLD_API
-@API_DEFINE@
-
-#include "yaml-cpp/parser.h"
-#include "yaml-cpp/emitter.h"
-#include "yaml-cpp/stlemitter.h"
-#include "yaml-cpp/exceptions.h"
-
-#ifdef YAML_CPP_OLD_API
-
-#include "yaml-cpp/old-api/node.h"
-#include "yaml-cpp/old-api/stlnode.h"
-#include "yaml-cpp/old-api/iterator.h"
-
-#else
-
-#include "yaml-cpp/node/node.h"
-#include "yaml-cpp/node/impl.h"
-#include "yaml-cpp/node/convert.h"
-#include "yaml-cpp/node/iterator.h"
-#include "yaml-cpp/node/detail/impl.h"
-#include "yaml-cpp/node/parse.h"
-#include "yaml-cpp/node/emit.h"
-
-#endif // YAML_CPP_OLD_API
-
-#endif // YAML_H_62B23520_7C8E_11DE_8A39_0800200C9A66
diff --git a/src/old-api/aliasmanager.cpp b/src/aliasmanager.cpp
similarity index 87%
rename from src/old-api/aliasmanager.cpp
rename to src/aliasmanager.cpp
index f400612..ed4d3b5 100644
--- a/src/old-api/aliasmanager.cpp
+++ b/src/aliasmanager.cpp
@@ -1,5 +1,5 @@
-#include "yaml-cpp/old-api/aliasmanager.h"
-#include "yaml-cpp/old-api/node.h"
+#include "yaml-cpp/aliasmanager.h"
+#include "yaml-cpp/node.h"
 #include <cassert>
 #include <sstream>
 
diff --git a/src/old-api/conversion.cpp b/src/conversion.cpp
similarity index 97%
rename from src/old-api/conversion.cpp
rename to src/conversion.cpp
index 0c67dfd..f81e1a0 100644
--- a/src/old-api/conversion.cpp
+++ b/src/conversion.cpp
@@ -1,4 +1,4 @@
-#include "yaml-cpp/old-api/conversion.h"
+#include "yaml-cpp/conversion.h"
 #include <algorithm>
 
 ////////////////////////////////////////////////////////////////
diff --git a/src/old-api/iterator.cpp b/src/iterator.cpp
similarity index 98%
rename from src/old-api/iterator.cpp
rename to src/iterator.cpp
index c2a3337..f4159e3 100644
--- a/src/old-api/iterator.cpp
+++ b/src/iterator.cpp
@@ -1,4 +1,4 @@
-#include "yaml-cpp/old-api/node.h"
+#include "yaml-cpp/node.h"
 #include "yaml-cpp/exceptions.h"
 #include "iterpriv.h"
 
diff --git a/src/old-api/iterpriv.h b/src/iterpriv.h
similarity index 96%
rename from src/old-api/iterpriv.h
rename to src/iterpriv.h
index a1b07bc..c511e8a 100644
--- a/src/old-api/iterpriv.h
+++ b/src/iterpriv.h
@@ -6,7 +6,7 @@
 #endif
 
 
-#include "yaml-cpp/old-api/ltnode.h"
+#include "yaml-cpp/ltnode.h"
 #include <vector>
 #include <map>
 
diff --git a/src/old-api/node.cpp b/src/node.cpp
similarity index 97%
rename from src/old-api/node.cpp
rename to src/node.cpp
index c7be61a..360b4ad 100644
--- a/src/old-api/node.cpp
+++ b/src/node.cpp
@@ -1,11 +1,11 @@
-#include "yaml-cpp/old-api/node.h"
-#include "yaml-cpp/old-api/aliasmanager.h"
+#include "yaml-cpp/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 "iterpriv.h"
+#include "nodebuilder.h"
+#include "nodeownership.h"
 #include "scanner.h"
 #include "tag.h"
 #include "token.h"
diff --git a/src/old-api/nodebuilder.cpp b/src/nodebuilder.cpp
similarity index 97%
rename from src/old-api/nodebuilder.cpp
rename to src/nodebuilder.cpp
index f863d7c..13a7032 100644
--- a/src/old-api/nodebuilder.cpp
+++ b/src/nodebuilder.cpp
@@ -1,6 +1,6 @@
-#include "old-api/nodebuilder.h"
+#include "nodebuilder.h"
 #include "yaml-cpp/mark.h"
-#include "yaml-cpp/old-api/node.h"
+#include "yaml-cpp/node.h"
 #include <cassert>
 
 namespace YAML
diff --git a/src/old-api/nodebuilder.h b/src/nodebuilder.h
similarity index 100%
rename from src/old-api/nodebuilder.h
rename to src/nodebuilder.h
diff --git a/src/old-api/nodeownership.cpp b/src/nodeownership.cpp
similarity index 87%
rename from src/old-api/nodeownership.cpp
rename to src/nodeownership.cpp
index 44bb818..118edbc 100644
--- a/src/old-api/nodeownership.cpp
+++ b/src/nodeownership.cpp
@@ -1,5 +1,5 @@
-#include "old-api/nodeownership.h"
-#include "yaml-cpp/old-api/node.h"
+#include "nodeownership.h"
+#include "yaml-cpp/node.h"
 
 namespace YAML
 {
diff --git a/src/old-api/nodeownership.h b/src/nodeownership.h
similarity index 100%
rename from src/old-api/nodeownership.h
rename to src/nodeownership.h
diff --git a/src/null.cpp b/src/null.cpp
index b71c3bb..08fa9aa 100644
--- a/src/null.cpp
+++ b/src/null.cpp
@@ -1,5 +1,5 @@
 #include "yaml-cpp/null.h"
-#include "yaml-cpp/old-api/node.h"
+#include "yaml-cpp/node.h"
 
 namespace YAML
 {
diff --git a/src/parser.cpp b/src/parser.cpp
index a3fd3d6..b836823 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1,9 +1,9 @@
 #include "yaml-cpp/parser.h"
 #include "yaml-cpp/eventhandler.h"
 #include "yaml-cpp/exceptions.h"
-#include "yaml-cpp/old-api/node.h"
-#include "old-api/nodebuilder.h"
+#include "yaml-cpp/node.h"
 #include "directives.h"
+#include "nodebuilder.h"
 #include "scanner.h"
 #include "singledocparser.h"
 #include "tag.h"