Put all the old-api stuff back in the main folder, for simplicity

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>
 

src/conversion.cpp

@@ -1,4 +1,4 @@
-#include "yaml-cpp/old-api/conversion.h"
+#include "yaml-cpp/conversion.h"
 #include <algorithm>
 
 ////////////////////////////////////////////////////////////////

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"
 

src/iterpriv.h

@@ -6,7 +6,7 @@
 #endif
 
 
-#include "yaml-cpp/old-api/ltnode.h"
+#include "yaml-cpp/ltnode.h"
 #include <vector>
 #include <map>
 

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"

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

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
 {

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
 {

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"