diff --git a/dbal/cpp/build-config/CMakeLists.txt b/dbal/cpp/build-config/CMakeLists.txt
index 74b49345f..13cf314c4 100644
--- a/dbal/cpp/build-config/CMakeLists.txt
+++ b/dbal/cpp/build-config/CMakeLists.txt
@@ -24,7 +24,6 @@ find_package(Drogon REQUIRED CONFIG)
 add_library(dbal_core STATIC
     ${DBAL_SRC_DIR}/client.cpp
     ${DBAL_SRC_DIR}/errors.cpp
-    ${DBAL_SRC_DIR}/capabilities.cpp
     ${DBAL_SRC_DIR}/query/ast.cpp
     ${DBAL_SRC_DIR}/query/builder.cpp
     ${DBAL_SRC_DIR}/query/normalize.cpp
diff --git a/frontends/nextjs/src/lib/db/packages/index.ts b/frontends/nextjs/src/lib/db/packages/index.ts
index 749f096fd..41b8180fc 100644
--- a/frontends/nextjs/src/lib/db/packages/index.ts
+++ b/frontends/nextjs/src/lib/db/packages/index.ts
@@ -1,8 +1,8 @@
-export { getInstalledPackages } from './get-installed-packages'
-export { setInstalledPackages } from './set-installed-packages'
-export { installPackage } from './install-package'
-export { uninstallPackage } from './uninstall-package'
-export { togglePackageEnabled } from './toggle-package-enabled'
-export { getPackageData } from './get-package-data'
-export { setPackageData } from './set-package-data'
-export { deletePackageData } from './delete-package-data'
+export { getInstalledPackages } from './install/getters/get-installed-packages'
+export { setInstalledPackages } from './install/getters/set-installed-packages'
+export { installPackage } from './install/crud/install-package'
+export { uninstallPackage } from './install/crud/uninstall-package'
+export { togglePackageEnabled } from './install/crud/actions/toggle-package-enabled'
+export { getPackageData } from './data/get/get-package-data'
+export { setPackageData } from './data/set-package-data'
+export { deletePackageData } from './data/delete-package-data'