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

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

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

include/yaml-cpp/yaml.h.cmake

@@ -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