diff --git a/frontends/nextjs/src/lib/db/functions/app-config/get-app-config.ts b/frontends/nextjs/src/lib/db/functions/app-config/get-app-config.ts
index 1cfc01c1f..9f521d84a 100644
--- a/frontends/nextjs/src/lib/db/functions/app-config/get-app-config.ts
+++ b/frontends/nextjs/src/lib/db/functions/app-config/get-app-config.ts
@@ -4,7 +4,7 @@
  */
 
 import type { AppConfiguration } from '@/lib/types/level-types'
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 /**
  * Get the application configuration
diff --git a/frontends/nextjs/src/lib/db/functions/app-config/set-app-config.ts b/frontends/nextjs/src/lib/db/functions/app-config/set-app-config.ts
index 88cf9289e..258eee878 100644
--- a/frontends/nextjs/src/lib/db/functions/app-config/set-app-config.ts
+++ b/frontends/nextjs/src/lib/db/functions/app-config/set-app-config.ts
@@ -4,7 +4,7 @@
  */
 
 import type { AppConfiguration } from '@/lib/types/level-types'
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 /**
  * Set the application configuration
diff --git a/frontends/nextjs/src/lib/db/functions/comments/crud/add-comment.ts b/frontends/nextjs/src/lib/db/functions/comments/crud/add-comment.ts
index c90b3a1f1..2917b4b88 100644
--- a/frontends/nextjs/src/lib/db/functions/comments/crud/add-comment.ts
+++ b/frontends/nextjs/src/lib/db/functions/comments/crud/add-comment.ts
@@ -4,7 +4,7 @@
  */
 
 import type { Comment } from '@/lib/types/level-types'
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 /**
  * Add a new comment
diff --git a/frontends/nextjs/src/lib/db/functions/comments/crud/delete-comment.ts b/frontends/nextjs/src/lib/db/functions/comments/crud/delete-comment.ts
index d764baa45..d46c052a8 100644
--- a/frontends/nextjs/src/lib/db/functions/comments/crud/delete-comment.ts
+++ b/frontends/nextjs/src/lib/db/functions/comments/crud/delete-comment.ts
@@ -3,7 +3,7 @@
  * Deletes a comment from database
  */
 
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 /**
  * Delete a comment
diff --git a/frontends/nextjs/src/lib/db/functions/comments/crud/get-comments.ts b/frontends/nextjs/src/lib/db/functions/comments/crud/get-comments.ts
index 43c11d73e..3acf58bd3 100644
--- a/frontends/nextjs/src/lib/db/functions/comments/crud/get-comments.ts
+++ b/frontends/nextjs/src/lib/db/functions/comments/crud/get-comments.ts
@@ -4,7 +4,7 @@
  */
 
 import type { Comment } from '@/lib/types/level-types'
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 /**
  * Get all comments
diff --git a/frontends/nextjs/src/lib/db/functions/comments/crud/set-comments.ts b/frontends/nextjs/src/lib/db/functions/comments/crud/set-comments.ts
index 2ebcf9ced..49a4a60bd 100644
--- a/frontends/nextjs/src/lib/db/functions/comments/crud/set-comments.ts
+++ b/frontends/nextjs/src/lib/db/functions/comments/crud/set-comments.ts
@@ -4,7 +4,7 @@
  */
 
 import type { Comment } from '@/lib/types/level-types'
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 /**
  * Set all comments (replaces existing)
diff --git a/frontends/nextjs/src/lib/db/functions/comments/crud/update-comment.ts b/frontends/nextjs/src/lib/db/functions/comments/crud/update-comment.ts
index 72d64e7f1..05f09c86f 100644
--- a/frontends/nextjs/src/lib/db/functions/comments/crud/update-comment.ts
+++ b/frontends/nextjs/src/lib/db/functions/comments/crud/update-comment.ts
@@ -4,7 +4,7 @@
  */
 
 import type { Comment } from '@/lib/types/level-types'
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 type CommentUpdateData = {
   content?: string
diff --git a/frontends/nextjs/src/lib/db/functions/comments/index.ts b/frontends/nextjs/src/lib/db/functions/comments/index.ts
index 7d631415d..571b67d9d 100644
--- a/frontends/nextjs/src/lib/db/functions/comments/index.ts
+++ b/frontends/nextjs/src/lib/db/functions/comments/index.ts
@@ -3,8 +3,8 @@
  * Exports all comment functions
  */
 
-export { addComment } from './add-comment'
-export { deleteComment } from './delete-comment'
-export { getComments } from './get-comments'
-export { setComments } from './set-comments'
-export { updateComment } from './update-comment'
+export { addComment } from './crud/add-comment'
+export { deleteComment } from './crud/delete-comment'
+export { getComments } from './crud/get-comments'
+export { setComments } from './crud/set-comments'
+export { updateComment } from './crud/update-comment'
diff --git a/frontends/nextjs/src/lib/db/functions/components/crud/add-component-node.ts b/frontends/nextjs/src/lib/db/functions/components/crud/add-component-node.ts
index 042ebf23f..a66158f65 100644
--- a/frontends/nextjs/src/lib/db/functions/components/crud/add-component-node.ts
+++ b/frontends/nextjs/src/lib/db/functions/components/crud/add-component-node.ts
@@ -3,8 +3,8 @@
  * Adds a new component node to hierarchy
  */
 
-import { prisma } from '../../prisma'
-import type { ComponentNode } from './types'
+import { prisma } from '@/lib/config/prisma'
+import type { ComponentNode } from '../hierarchy/types'
 
 /**
  * Add a component node
diff --git a/frontends/nextjs/src/lib/db/functions/components/crud/delete-component-node.ts b/frontends/nextjs/src/lib/db/functions/components/crud/delete-component-node.ts
index 886fe3ca5..06873d063 100644
--- a/frontends/nextjs/src/lib/db/functions/components/crud/delete-component-node.ts
+++ b/frontends/nextjs/src/lib/db/functions/components/crud/delete-component-node.ts
@@ -3,7 +3,7 @@
  * Deletes a component node from hierarchy
  */
 
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 
 /**
  * Delete a component node
diff --git a/frontends/nextjs/src/lib/db/functions/components/crud/update-component-node.ts b/frontends/nextjs/src/lib/db/functions/components/crud/update-component-node.ts
index 00e3e0217..a1807787a 100644
--- a/frontends/nextjs/src/lib/db/functions/components/crud/update-component-node.ts
+++ b/frontends/nextjs/src/lib/db/functions/components/crud/update-component-node.ts
@@ -3,8 +3,8 @@
  * Updates an existing component node
  */
 
-import { prisma } from '../../prisma'
-import type { ComponentNode } from './types'
+import { prisma } from '@/lib/config/prisma'
+import type { ComponentNode } from '../hierarchy/types'
 
 /**
  * Update a component node
diff --git a/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-configs.ts b/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-configs.ts
index 97014ecd9..0afdcd7c5 100644
--- a/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-configs.ts
+++ b/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-configs.ts
@@ -3,7 +3,7 @@
  * Retrieves component configurations from database
  */
 
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 import type { ComponentConfig } from './types'
 
 /**
diff --git a/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-hierarchy.ts b/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-hierarchy.ts
index ec2f72534..6e6cbcc37 100644
--- a/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-hierarchy.ts
+++ b/frontends/nextjs/src/lib/db/functions/components/hierarchy/get-component-hierarchy.ts
@@ -3,7 +3,7 @@
  * Retrieves component hierarchy from database
  */
 
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 import type { ComponentNode } from './types'
 
 /**
diff --git a/frontends/nextjs/src/lib/db/functions/components/hierarchy/set-component-hierarchy.ts b/frontends/nextjs/src/lib/db/functions/components/hierarchy/set-component-hierarchy.ts
index 57e6aefd8..d047ab9de 100644
--- a/frontends/nextjs/src/lib/db/functions/components/hierarchy/set-component-hierarchy.ts
+++ b/frontends/nextjs/src/lib/db/functions/components/hierarchy/set-component-hierarchy.ts
@@ -3,7 +3,7 @@
  * Replaces all component hierarchy in database
  */
 
-import { prisma } from '../../prisma'
+import { prisma } from '@/lib/config/prisma'
 import type { ComponentNode } from './types'
 
 /**
diff --git a/frontends/nextjs/src/lib/db/packages/data/set-package-data.ts b/frontends/nextjs/src/lib/db/packages/data/set-package-data.ts
index d5337bee1..bb2dad942 100644
--- a/frontends/nextjs/src/lib/db/packages/data/set-package-data.ts
+++ b/frontends/nextjs/src/lib/db/packages/data/set-package-data.ts
@@ -1,5 +1,5 @@
 import { getAdapter } from '../../core/dbal-client'
-import { type PackageSeedData } from '../../packages/core/package-types'
+import { type PackageSeedData } from '@/lib/package-types'
 
 /**
  * Set package data (upsert)
diff --git a/frontends/nextjs/src/lib/dbal/core/client/index.ts b/frontends/nextjs/src/lib/dbal/core/client/index.ts
index 9bab9fd97..2098e86ea 100644
--- a/frontends/nextjs/src/lib/dbal/core/client/index.ts
+++ b/frontends/nextjs/src/lib/dbal/core/client/index.ts
@@ -1,6 +1,7 @@
 // DBAL (Database Abstraction Layer) exports
 // export { createDBALClient } from './dbal-client' // Not yet implemented
 export { DBALClient } from './dbal-client'
-export { dbal, DBALIntegration } from './dbal-integration'
+export { dbal } from './dbal-integration'
+export type { DBALIntegration } from './dbal-integration'
 export { DBALClient as DBALRealClient } from '@/dbal'
 export type { DBALConfig } from '@/dbal/runtime/config'