diff --git a/src/server/api/dataQuery/getDashboardItems.ts b/src/server/api/cycleData/dashboard/getDashboardItems.ts
similarity index 78%
rename from src/server/api/dataQuery/getDashboardItems.ts
rename to src/server/api/cycleData/dashboard/getDashboardItems.ts
index 1234e46107..dd4864745b 100644
--- a/src/server/api/dataQuery/getDashboardItems.ts
+++ b/src/server/api/cycleData/dashboard/getDashboardItems.ts
@@ -3,7 +3,7 @@ import { Response } from 'express'
 import { CycleRequest } from 'meta/api/request'
 
 import { AssessmentController } from 'server/controller/assessment'
-import { DataQueryController } from 'server/controller/dataQuery'
+import { DashboardController } from 'server/controller/cycleData/dashboard'
 import Requests from 'server/utils/requests'
 
 type Query = { query: string; limit: string }
@@ -14,7 +14,7 @@ export const getDashboardItems = async (req: CycleRequest<Query>, res: Response)
 
     const { assessment, cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleName })
 
-    const result = await DataQueryController.getMany({ assessment, cycle })
+    const result = await DashboardController.getManyItems({ assessment, cycle })
     Requests.send(res, result)
   } catch (e) {
     Requests.sendErr(res, e)
diff --git a/src/server/api/dataQuery/index.ts b/src/server/api/cycleData/dashboard/index.ts
similarity index 100%
rename from src/server/api/dataQuery/index.ts
rename to src/server/api/cycleData/dashboard/index.ts
diff --git a/src/server/controller/cycleData/dashboard/index.ts b/src/server/controller/cycleData/dashboard/index.ts
new file mode 100644
index 0000000000..d6a66827f0
--- /dev/null
+++ b/src/server/controller/cycleData/dashboard/index.ts
@@ -0,0 +1,5 @@
+import { NodeExtRepository } from 'server/repository/assessmentCycle/nodeExt'
+
+export const DashboardController = {
+  getManyItems: NodeExtRepository.getManyDashboardItems,
+}
diff --git a/src/server/controller/dataQuery/index.ts b/src/server/controller/dataQuery/index.ts
deleted file mode 100644
index aff50ffe89..0000000000
--- a/src/server/controller/dataQuery/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { DataQueryRepository } from 'server/repository/dataQuery'
-
-export const DataQueryController = {
-  getMany: DataQueryRepository.getMany,
-}
diff --git a/src/server/repository/dataQuery/getMany.ts b/src/server/repository/assessmentCycle/nodeExt/getManyDashboardItems.ts
similarity index 89%
rename from src/server/repository/dataQuery/getMany.ts
rename to src/server/repository/assessmentCycle/nodeExt/getManyDashboardItems.ts
index 7b1276546e..b3ed34cf33 100644
--- a/src/server/repository/dataQuery/getMany.ts
+++ b/src/server/repository/assessmentCycle/nodeExt/getManyDashboardItems.ts
@@ -6,7 +6,7 @@ import { BaseProtocol, DB, Schemas } from 'server/db'
 
 type Props = { assessment: Assessment; cycle: Cycle }
 
-export const getMany = async (
+export const getManyDashboardItems = async (
   props: Props,
   client: BaseProtocol = DB
 ): Promise<Array<DashboardItem<DashboardItemType>>> => {
@@ -14,6 +14,6 @@ export const getMany = async (
   const schemaCycle = Schemas.getNameCycle(assessment, cycle)
 
   return client.many<DashboardItem<DashboardItemType>>(`select value from ${schemaCycle}.node_ext where type = $1`, [
-    NodeExtType.dataQuery,
+    NodeExtType.dashboard,
   ])
 }
diff --git a/src/server/repository/assessmentCycle/nodeExt/index.ts b/src/server/repository/assessmentCycle/nodeExt/index.ts
index e7c6e9c3ad..8cf55d9a84 100644
--- a/src/server/repository/assessmentCycle/nodeExt/index.ts
+++ b/src/server/repository/assessmentCycle/nodeExt/index.ts
@@ -1,9 +1,11 @@
 import { getManyContacts } from './getManyContacts'
+import { getManyDashboardItems } from './getManyDashboardItems'
 import { removeContact } from './removeContact'
 import { upsert } from './upsert'
 
 export const NodeExtRepository = {
   getManyContacts,
+  getManyDashboardItems,
   removeContact,
   upsert,
 }
diff --git a/src/server/repository/dataQuery/index.ts b/src/server/repository/dataQuery/index.ts
deleted file mode 100644
index e0a521d324..0000000000
--- a/src/server/repository/dataQuery/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { getMany } from 'server/repository/dataQuery/getMany'
-
-export const DataQueryRepository = {
-  getMany,
-}