diff --git a/include/yaml-cpp/value/convert.h b/include/yaml-cpp/node/convert.h
similarity index 100%
rename from include/yaml-cpp/value/convert.h
rename to include/yaml-cpp/node/convert.h
diff --git a/include/yaml-cpp/value/detail/impl.h b/include/yaml-cpp/node/detail/impl.h
similarity index 100%
rename from include/yaml-cpp/value/detail/impl.h
rename to include/yaml-cpp/node/detail/impl.h
diff --git a/include/yaml-cpp/value/detail/iterator.h b/include/yaml-cpp/node/detail/iterator.h
similarity index 100%
rename from include/yaml-cpp/value/detail/iterator.h
rename to include/yaml-cpp/node/detail/iterator.h
diff --git a/include/yaml-cpp/value/detail/iterator_fwd.h b/include/yaml-cpp/node/detail/iterator_fwd.h
similarity index 100%
rename from include/yaml-cpp/value/detail/iterator_fwd.h
rename to include/yaml-cpp/node/detail/iterator_fwd.h
diff --git a/include/yaml-cpp/value/detail/memory.h b/include/yaml-cpp/node/detail/memory.h
similarity index 100%
rename from include/yaml-cpp/value/detail/memory.h
rename to include/yaml-cpp/node/detail/memory.h
diff --git a/include/yaml-cpp/value/detail/node.h b/include/yaml-cpp/node/detail/node.h
similarity index 100%
rename from include/yaml-cpp/value/detail/node.h
rename to include/yaml-cpp/node/detail/node.h
diff --git a/include/yaml-cpp/value/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h
similarity index 100%
rename from include/yaml-cpp/value/detail/node_data.h
rename to include/yaml-cpp/node/detail/node_data.h
diff --git a/include/yaml-cpp/value/detail/node_iterator.h b/include/yaml-cpp/node/detail/node_iterator.h
similarity index 100%
rename from include/yaml-cpp/value/detail/node_iterator.h
rename to include/yaml-cpp/node/detail/node_iterator.h
diff --git a/include/yaml-cpp/value/detail/node_ref.h b/include/yaml-cpp/node/detail/node_ref.h
similarity index 100%
rename from include/yaml-cpp/value/detail/node_ref.h
rename to include/yaml-cpp/node/detail/node_ref.h
diff --git a/include/yaml-cpp/value/emit.h b/include/yaml-cpp/node/emit.h
similarity index 100%
rename from include/yaml-cpp/value/emit.h
rename to include/yaml-cpp/node/emit.h
diff --git a/include/yaml-cpp/value/impl.h b/include/yaml-cpp/node/impl.h
similarity index 100%
rename from include/yaml-cpp/value/impl.h
rename to include/yaml-cpp/node/impl.h
diff --git a/include/yaml-cpp/value/iterator.h b/include/yaml-cpp/node/iterator.h
similarity index 100%
rename from include/yaml-cpp/value/iterator.h
rename to include/yaml-cpp/node/iterator.h
diff --git a/include/yaml-cpp/value/parse.h b/include/yaml-cpp/node/parse.h
similarity index 100%
rename from include/yaml-cpp/value/parse.h
rename to include/yaml-cpp/node/parse.h
diff --git a/include/yaml-cpp/value/ptr.h b/include/yaml-cpp/node/ptr.h
similarity index 100%
rename from include/yaml-cpp/value/ptr.h
rename to include/yaml-cpp/node/ptr.h
diff --git a/include/yaml-cpp/value/type.h b/include/yaml-cpp/node/type.h
similarity index 100%
rename from include/yaml-cpp/value/type.h
rename to include/yaml-cpp/node/type.h
diff --git a/include/yaml-cpp/value/value.h b/include/yaml-cpp/node/value.h
similarity index 100%
rename from include/yaml-cpp/value/value.h
rename to include/yaml-cpp/node/value.h
diff --git a/include/yaml-cpp/aliasmanager.h b/include/yaml-cpp/old-api/aliasmanager.h
similarity index 100%
rename from include/yaml-cpp/aliasmanager.h
rename to include/yaml-cpp/old-api/aliasmanager.h
diff --git a/include/yaml-cpp/conversion.h b/include/yaml-cpp/old-api/conversion.h
similarity index 100%
rename from include/yaml-cpp/conversion.h
rename to include/yaml-cpp/old-api/conversion.h
diff --git a/include/yaml-cpp/iterator.h b/include/yaml-cpp/old-api/iterator.h
similarity index 100%
rename from include/yaml-cpp/iterator.h
rename to include/yaml-cpp/old-api/iterator.h
diff --git a/include/yaml-cpp/ltnode.h b/include/yaml-cpp/old-api/ltnode.h
similarity index 100%
rename from include/yaml-cpp/ltnode.h
rename to include/yaml-cpp/old-api/ltnode.h
diff --git a/include/yaml-cpp/node.h b/include/yaml-cpp/old-api/node.h
similarity index 100%
rename from include/yaml-cpp/node.h
rename to include/yaml-cpp/old-api/node.h
diff --git a/include/yaml-cpp/nodeimpl.h b/include/yaml-cpp/old-api/nodeimpl.h
similarity index 100%
rename from include/yaml-cpp/nodeimpl.h
rename to include/yaml-cpp/old-api/nodeimpl.h
diff --git a/include/yaml-cpp/nodereadimpl.h b/include/yaml-cpp/old-api/nodereadimpl.h
similarity index 100%
rename from include/yaml-cpp/nodereadimpl.h
rename to include/yaml-cpp/old-api/nodereadimpl.h
diff --git a/include/yaml-cpp/nodeutil.h b/include/yaml-cpp/old-api/nodeutil.h
similarity index 100%
rename from include/yaml-cpp/nodeutil.h
rename to include/yaml-cpp/old-api/nodeutil.h
diff --git a/include/yaml-cpp/stlnode.h b/include/yaml-cpp/old-api/stlnode.h
similarity index 100%
rename from include/yaml-cpp/stlnode.h
rename to include/yaml-cpp/old-api/stlnode.h
diff --git a/src/value/convert.cpp b/src/node/convert.cpp
similarity index 100%
rename from src/value/convert.cpp
rename to src/node/convert.cpp
diff --git a/src/value/detail/memory.cpp b/src/node/detail/memory.cpp
similarity index 100%
rename from src/value/detail/memory.cpp
rename to src/node/detail/memory.cpp
diff --git a/src/value/detail/node_data.cpp b/src/node/detail/node_data.cpp
similarity index 100%
rename from src/value/detail/node_data.cpp
rename to src/node/detail/node_data.cpp
diff --git a/src/value/emit.cpp b/src/node/emit.cpp
similarity index 100%
rename from src/value/emit.cpp
rename to src/node/emit.cpp
diff --git a/src/value/parse.cpp b/src/node/parse.cpp
similarity index 100%
rename from src/value/parse.cpp
rename to src/node/parse.cpp
diff --git a/src/value/valuebuilder.cpp b/src/node/valuebuilder.cpp
similarity index 100%
rename from src/value/valuebuilder.cpp
rename to src/node/valuebuilder.cpp
diff --git a/src/value/valuebuilder.h b/src/node/valuebuilder.h
similarity index 100%
rename from src/value/valuebuilder.h
rename to src/node/valuebuilder.h
diff --git a/src/value/valueevents.cpp b/src/node/valueevents.cpp
similarity index 100%
rename from src/value/valueevents.cpp
rename to src/node/valueevents.cpp
diff --git a/src/value/valueevents.h b/src/node/valueevents.h
similarity index 100%
rename from src/value/valueevents.h
rename to src/node/valueevents.h
diff --git a/src/aliasmanager.cpp b/src/old-api/aliasmanager.cpp
similarity index 100%
rename from src/aliasmanager.cpp
rename to src/old-api/aliasmanager.cpp
diff --git a/src/node.cpp b/src/old-api/node.cpp
similarity index 100%
rename from src/node.cpp
rename to src/old-api/node.cpp
diff --git a/src/nodebuilder.cpp b/src/old-api/nodebuilder.cpp
similarity index 100%
rename from src/nodebuilder.cpp
rename to src/old-api/nodebuilder.cpp
diff --git a/src/nodebuilder.h b/src/old-api/nodebuilder.h
similarity index 100%
rename from src/nodebuilder.h
rename to src/old-api/nodebuilder.h
diff --git a/src/nodeownership.cpp b/src/old-api/nodeownership.cpp
similarity index 100%
rename from src/nodeownership.cpp
rename to src/old-api/nodeownership.cpp
diff --git a/src/nodeownership.h b/src/old-api/nodeownership.h
similarity index 100%
rename from src/nodeownership.h
rename to src/old-api/nodeownership.h