diff --git a/dbal/cpp/include/dbal/client.hpp b/dbal/cpp/include/dbal/core/client.hpp
similarity index 100%
rename from dbal/cpp/include/dbal/client.hpp
rename to dbal/cpp/include/dbal/core/client.hpp
diff --git a/dbal/cpp/include/dbal/dbal.hpp b/dbal/cpp/include/dbal/core/dbal.hpp
similarity index 100%
rename from dbal/cpp/include/dbal/dbal.hpp
rename to dbal/cpp/include/dbal/core/dbal.hpp
diff --git a/dbal/cpp/include/dbal/errors.hpp b/dbal/cpp/include/dbal/core/errors.hpp
similarity index 100%
rename from dbal/cpp/include/dbal/errors.hpp
rename to dbal/cpp/include/dbal/core/errors.hpp
diff --git a/dbal/cpp/include/dbal/types.hpp b/dbal/cpp/include/dbal/core/types.hpp
similarity index 100%
rename from dbal/cpp/include/dbal/types.hpp
rename to dbal/cpp/include/dbal/core/types.hpp
diff --git a/dbal/cpp/include/dbal/blob_storage.hpp b/dbal/cpp/include/dbal/storage/blob_storage.hpp
similarity index 100%
rename from dbal/cpp/include/dbal/blob_storage.hpp
rename to dbal/cpp/include/dbal/storage/blob_storage.hpp
diff --git a/dbal/cpp/include/dbal/kv_store.hpp b/dbal/cpp/include/dbal/storage/kv_store.hpp
similarity index 100%
rename from dbal/cpp/include/dbal/kv_store.hpp
rename to dbal/cpp/include/dbal/storage/kv_store.hpp
diff --git a/dbal/cpp/include/dbal/tenant_context.hpp b/dbal/cpp/include/dbal/storage/tenant_context.hpp
similarity index 100%
rename from dbal/cpp/include/dbal/tenant_context.hpp
rename to dbal/cpp/include/dbal/storage/tenant_context.hpp