diff --git a/cpp/src/db.h b/cpp/src/db/db.h
similarity index 100%
rename from cpp/src/db.h
rename to cpp/src/db/db.h
diff --git a/cpp/src/db_impl.cpp b/cpp/src/db/db_impl.cpp
similarity index 100%
rename from cpp/src/db_impl.cpp
rename to cpp/src/db/db_impl.cpp
diff --git a/cpp/src/db_impl.h b/cpp/src/db/db_impl.h
similarity index 100%
rename from cpp/src/db_impl.h
rename to cpp/src/db/db_impl.h
diff --git a/cpp/src/db_meta.cpp b/cpp/src/db/db_meta.cpp
similarity index 100%
rename from cpp/src/db_meta.cpp
rename to cpp/src/db/db_meta.cpp
diff --git a/cpp/src/db_meta.h b/cpp/src/db/db_meta.h
similarity index 100%
rename from cpp/src/db_meta.h
rename to cpp/src/db/db_meta.h
diff --git a/cpp/src/db_meta_impl.cpp b/cpp/src/db/db_meta_impl.cpp
similarity index 100%
rename from cpp/src/db_meta_impl.cpp
rename to cpp/src/db/db_meta_impl.cpp
diff --git a/cpp/src/db_meta_impl.h b/cpp/src/db/db_meta_impl.h
similarity index 100%
rename from cpp/src/db_meta_impl.h
rename to cpp/src/db/db_meta_impl.h
diff --git a/cpp/src/env.cpp b/cpp/src/db/env.cpp
similarity index 100%
rename from cpp/src/env.cpp
rename to cpp/src/db/env.cpp
diff --git a/cpp/src/env.h b/cpp/src/db/env.h
similarity index 100%
rename from cpp/src/env.h
rename to cpp/src/db/env.h
diff --git a/cpp/src/options.h b/cpp/src/db/options.h
similarity index 100%
rename from cpp/src/options.h
rename to cpp/src/db/options.h
diff --git a/cpp/src/status.cpp b/cpp/src/db/status.cpp
similarity index 100%
rename from cpp/src/status.cpp
rename to cpp/src/db/status.cpp
diff --git a/cpp/src/status.h b/cpp/src/db/status.h
similarity index 100%
rename from cpp/src/status.h
rename to cpp/src/db/status.h