diff --git a/dashboard/assets/scss/main.scss b/dashboard/assets/scss/main.scss
index a3abc31..bbdfd57 100644
--- a/dashboard/assets/scss/main.scss
+++ b/dashboard/assets/scss/main.scss
@@ -1,10 +1,11 @@
+@use './utilities.scss';
+@use './colors.scss';
+
 @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;0,1000;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900;1,1000&display=swap');
 @import url('https://fonts.cdnfonts.com/css/brockmann');
 @import url('https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap');
 
 @import '../font-awesome/css/all.css';
-@import './utilities.scss';
-@import './colors.scss';
 
 @import url('https://fonts.cdnfonts.com/css/geometric-sans-serif-v1');
 @import url('https://fonts.googleapis.com/css2?family=Manrope:wght@200..800&display=swap');
diff --git a/dashboard/components/ProjectSelector.vue b/dashboard/components/ProjectSelector.vue
index 54beacc..141dfaf 100644
--- a/dashboard/components/ProjectSelector.vue
+++ b/dashboard/components/ProjectSelector.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 
-import type { TProject } from '@schema/ProjectSchema';
+import type { TProject } from '@schema/project/ProjectSchema';
 
 const { user } = useLoggedUser()
 
diff --git a/dashboard/composables/useProject.ts b/dashboard/composables/useProject.ts
index 24e75bc..03fc3b9 100644
--- a/dashboard/composables/useProject.ts
+++ b/dashboard/composables/useProject.ts
@@ -1,7 +1,7 @@
 
 
-import type { TProject } from "@schema/ProjectSchema";
-import { ProjectSnapshotModel } from "@schema/ProjectSnapshot";
+import type { TProject } from "@schema/project/ProjectSchema";
+import { ProjectSnapshotModel } from "@schema/project/ProjectSnapshot";
 
 const { token } = useAccessToken();
 
diff --git a/dashboard/composables/useSnapshot.ts b/dashboard/composables/useSnapshot.ts
index 6adc1f2..b92c193 100644
--- a/dashboard/composables/useSnapshot.ts
+++ b/dashboard/composables/useSnapshot.ts
@@ -1,4 +1,4 @@
-import type { TProjectSnapshot } from "@schema/ProjectSnapshot";
+import type { TProjectSnapshot } from "@schema/project/ProjectSnapshot";
 
 import fns from 'date-fns';
 
diff --git a/dashboard/nuxt.config.ts b/dashboard/nuxt.config.ts
index 7523ded..b7dc7a5 100644
--- a/dashboard/nuxt.config.ts
+++ b/dashboard/nuxt.config.ts
@@ -15,21 +15,26 @@ export default defineNuxtConfig({
       autoprefixer: {},
     }
   },
+
   colorMode: {
     preference: 'dark',
   },
+
   devtools: {
     enabled: false
   },
+
   pages: true,
   ssr: false,
   css: ['~/assets/scss/main.scss'],
+
   alias: {
     '@schema': fileURLToPath(new URL('../shared/schema', import.meta.url)),
     '@services': fileURLToPath(new URL('../shared/services', import.meta.url)),
     '@data': fileURLToPath(new URL('../shared/data', import.meta.url)),
     '@functions': fileURLToPath(new URL('../shared/functions', import.meta.url)),
   },
+
   runtimeConfig: {
     MONGO_CONNECTION_STRING: process.env.MONGO_CONNECTION_STRING,
     REDIS_URL: process.env.REDIS_URL,
@@ -57,17 +62,23 @@ export default defineNuxtConfig({
     }
 
   },
+
   nitro: {
     plugins: ['~/server/init.ts']
   },
+
   plugins: [
     { src: '~/plugins/chartjs.ts', mode: 'client' }
   ],
+
   ...gooleSignInConfig,
   modules: ['@nuxt/ui', 'nuxt-vue3-google-signin'],
+
   devServer: {
     host: '0.0.0.0',
   },
+
   components: true,
-  extends: ['../lyx-ui']
-})
+  extends: ['../lyx-ui'],
+  compatibilityDate: '2024-11-16'
+})
\ No newline at end of file
diff --git a/dashboard/package.json b/dashboard/package.json
index da32f7e..fd1ad84 100644
--- a/dashboard/package.json
+++ b/dashboard/package.json
@@ -22,7 +22,6 @@
     "googleapis": "^144.0.0",
     "highlight.js": "^11.10.0",
     "jsonwebtoken": "^9.0.2",
-    "mongoose": "^8.3.2",
     "nuxt": "^3.11.2",
     "nuxt-vue3-google-signin": "^0.0.11",
     "openai": "^4.61.0",
diff --git a/dashboard/server/LIVE_DEMO_DATA.ts b/dashboard/server/LIVE_DEMO_DATA.ts
index 29197b4..74dfd65 100644
--- a/dashboard/server/LIVE_DEMO_DATA.ts
+++ b/dashboard/server/LIVE_DEMO_DATA.ts
@@ -1,5 +1,5 @@
 import { AuthContext } from "./middleware/01-authorization";
-import { ProjectModel } from "~/../shared/schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { LITLYX_PROJECT_ID } from '@data/LITLYX'
 import { hasAccessToProject } from "./utils/hasAccessToProject";
 
diff --git a/dashboard/server/api/admin/counts.ts b/dashboard/server/api/admin/counts.ts
index def3b13..36ad5ea 100644
--- a/dashboard/server/api/admin/counts.ts
+++ b/dashboard/server/api/admin/counts.ts
@@ -1,4 +1,4 @@
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { UserModel } from "@schema/UserSchema";
 
 
diff --git a/dashboard/server/api/admin/details.ts b/dashboard/server/api/admin/details.ts
index a1ef0c3..b42e8d2 100644
--- a/dashboard/server/api/admin/details.ts
+++ b/dashboard/server/api/admin/details.ts
@@ -1,6 +1,6 @@
-import { ProjectModel } from "@schema/ProjectSchema";
-import { ProjectCountModel } from "@schema/ProjectsCounts";
-import { ProjectLimitModel } from "@schema/ProjectsLimits";
+import { ProjectModel } from "@schema/project/ProjectSchema";
+import { ProjectCountModel } from "@schema/project/ProjectsCounts";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 import { UserModel } from "@schema/UserSchema";
 import StripeService from '~/server/services/StripeService';
 
diff --git a/dashboard/server/api/admin/reset_count.ts b/dashboard/server/api/admin/reset_count.ts
index bcf375c..f19ccf8 100644
--- a/dashboard/server/api/admin/reset_count.ts
+++ b/dashboard/server/api/admin/reset_count.ts
@@ -1,5 +1,5 @@
 
-import { ProjectCountModel } from "@schema/ProjectsCounts";
+import { ProjectCountModel } from "@schema/project/ProjectsCounts";
 import { EventModel } from "@schema/metrics/EventSchema";
 import { SessionModel } from "@schema/metrics/SessionSchema";
 import { VisitModel } from "@schema/metrics/VisitSchema";
diff --git a/dashboard/server/api/ai/chats_remaining.ts b/dashboard/server/api/ai/chats_remaining.ts
index 97fb3e8..9cbcd33 100644
--- a/dashboard/server/api/ai/chats_remaining.ts
+++ b/dashboard/server/api/ai/chats_remaining.ts
@@ -1,4 +1,4 @@
-import { ProjectLimitModel } from "@schema/ProjectsLimits";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 
 export async function getAiChatRemainings(project_id: string) {
     const limits = await ProjectLimitModel.findOne({ project_id })
diff --git a/dashboard/server/api/keys/create.post.ts b/dashboard/server/api/keys/create.post.ts
index 47e0a43..0d41f73 100644
--- a/dashboard/server/api/keys/create.post.ts
+++ b/dashboard/server/api/keys/create.post.ts
@@ -1,7 +1,7 @@
 
 import { getUserProjectFromId } from "~/server/LIVE_DEMO_DATA";
 import { ApiSettingsModel, TApiSettings } from "@schema/ApiSettingsSchema";
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 
 import crypto from 'crypto';
 
diff --git a/dashboard/server/api/live_demo/index.ts b/dashboard/server/api/live_demo/index.ts
index 38ac4b3..bec5336 100644
--- a/dashboard/server/api/live_demo/index.ts
+++ b/dashboard/server/api/live_demo/index.ts
@@ -1,4 +1,4 @@
-import { ProjectModel, TProject } from "@schema/ProjectSchema";
+import { ProjectModel, TProject } from "@schema/project/ProjectSchema";
 
 export default defineEventHandler(async event => {
     const liveDemoProject = await ProjectModel.findById('6643cd08a1854e3b81722ab5');
diff --git a/dashboard/server/api/metrics/[project_id]/counts.ts b/dashboard/server/api/metrics/[project_id]/counts.ts
index e6fc642..a36cafa 100644
--- a/dashboard/server/api/metrics/[project_id]/counts.ts
+++ b/dashboard/server/api/metrics/[project_id]/counts.ts
@@ -1,5 +1,5 @@
 import { getUserProjectFromId } from "~/server/LIVE_DEMO_DATA";
-import { ProjectCountModel } from "@schema/ProjectsCounts";
+import { ProjectCountModel } from "@schema/project/ProjectsCounts";
 import { SessionModel } from "@schema/metrics/SessionSchema";
 import { COUNTS_EXPIRE_TIME, COUNTS_SESSIONS_EXPIRE_TIME, Redis } from "~/server/services/CacheService";
 import { EventModel } from "@schema/metrics/EventSchema";
diff --git a/dashboard/server/api/metrics/[project_id]/events_pie.ts b/dashboard/server/api/metrics/[project_id]/events_pie.ts
index ba67f8d..b13bee2 100644
--- a/dashboard/server/api/metrics/[project_id]/events_pie.ts
+++ b/dashboard/server/api/metrics/[project_id]/events_pie.ts
@@ -1,6 +1,6 @@
 
 import { EventModel } from "@schema/metrics/EventSchema";
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { Redis, TIMELINE_EXPIRE_TIME } from "~/server/services/CacheService";
 
 export type EventsPie = {
diff --git a/dashboard/server/api/metrics/[project_id]/query.ts b/dashboard/server/api/metrics/[project_id]/query.ts
index 597d3a8..d39ba4f 100644
--- a/dashboard/server/api/metrics/[project_id]/query.ts
+++ b/dashboard/server/api/metrics/[project_id]/query.ts
@@ -1,6 +1,6 @@
 import { EventModel } from "@schema/metrics/EventSchema";
 import { VisitModel } from "@schema/metrics/VisitSchema";
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 
 export default defineEventHandler(async event => {
 
diff --git a/dashboard/server/api/metrics/[project_id]/timeline/generic.ts b/dashboard/server/api/metrics/[project_id]/timeline/generic.ts
index 4e579d3..3a60ce3 100644
--- a/dashboard/server/api/metrics/[project_id]/timeline/generic.ts
+++ b/dashboard/server/api/metrics/[project_id]/timeline/generic.ts
@@ -1,5 +1,5 @@
 import { AggregateOptions, Model, Types } from "mongoose";
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 
 
 export type MetricsTimeline = {
diff --git a/dashboard/server/api/pay/valid_codes.ts b/dashboard/server/api/pay/valid_codes.ts
index 77348b7..9f24663 100644
--- a/dashboard/server/api/pay/valid_codes.ts
+++ b/dashboard/server/api/pay/valid_codes.ts
@@ -1,4 +1,4 @@
-import { AppsumoCodeTryModel } from "@schema/AppsumoCodeTrySchema";
+import { AppsumoCodeTryModel } from "@schema/appsumo/AppsumoCodeTrySchema";
 
 export default defineEventHandler(async event => {
 
diff --git a/dashboard/server/api/pay/webhook.post.ts b/dashboard/server/api/pay/webhook.post.ts
index 426057d..682cabe 100644
--- a/dashboard/server/api/pay/webhook.post.ts
+++ b/dashboard/server/api/pay/webhook.post.ts
@@ -1,9 +1,9 @@
 
 import StripeService from '~/server/services/StripeService';
 import type Event from 'stripe';
-import { ProjectModel } from '@schema/ProjectSchema';
+import { ProjectModel } from '@schema/project/ProjectSchema';
 import { PREMIUM_DATA, PREMIUM_PLAN, getPlanFromId, getPlanFromPrice, getPlanFromTag } from '@data/PREMIUM';
-import { ProjectLimitModel } from '@schema/ProjectsLimits';
+import { ProjectLimitModel } from '@schema/project/ProjectsLimits';
 import EmailService from '@services/EmailService'
 import { UserModel } from '@schema/UserSchema';
 
diff --git a/dashboard/server/api/project/create.post.ts b/dashboard/server/api/project/create.post.ts
index cb421c1..59adafa 100644
--- a/dashboard/server/api/project/create.post.ts
+++ b/dashboard/server/api/project/create.post.ts
@@ -1,6 +1,6 @@
-import { ProjectModel, TProject } from "@schema/ProjectSchema";
-import { ProjectCountModel } from "@schema/ProjectsCounts";
-import { ProjectLimitModel } from "@schema/ProjectsLimits";
+import { ProjectModel, TProject } from "@schema/project/ProjectSchema";
+import { ProjectCountModel } from "@schema/project/ProjectsCounts";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 import { UserSettingsModel } from "@schema/UserSettings";
 import StripeService from '~/server/services/StripeService';
 
diff --git a/dashboard/server/api/project/delete.delete.ts b/dashboard/server/api/project/delete.delete.ts
index 4ee9f3a..4307580 100644
--- a/dashboard/server/api/project/delete.delete.ts
+++ b/dashboard/server/api/project/delete.delete.ts
@@ -1,6 +1,6 @@
-import { ProjectModel } from "@schema/ProjectSchema";
-import { ProjectCountModel } from "@schema/ProjectsCounts";
-import { ProjectLimitModel } from "@schema/ProjectsLimits";
+import { ProjectModel } from "@schema/project/ProjectSchema";
+import { ProjectCountModel } from "@schema/project/ProjectsCounts";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 import { SessionModel } from "@schema/metrics/SessionSchema";
 import { LimitNotifyModel } from "@schema/broker/LimitNotifySchema";
 import StripeService from '~/server/services/StripeService';
diff --git a/dashboard/server/api/project/generate_pdf.ts b/dashboard/server/api/project/generate_pdf.ts
index 9c979dc..bcf1ddc 100644
--- a/dashboard/server/api/project/generate_pdf.ts
+++ b/dashboard/server/api/project/generate_pdf.ts
@@ -3,7 +3,7 @@ import pdfkit from 'pdfkit';
 
 import { PassThrough } from 'node:stream';
 
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { VisitModel } from '@schema/metrics/VisitSchema';
 import { EventModel } from '@schema/metrics/EventSchema';
 
diff --git a/dashboard/server/api/project/limits_info.ts b/dashboard/server/api/project/limits_info.ts
index 38e9d3e..b3b2578 100644
--- a/dashboard/server/api/project/limits_info.ts
+++ b/dashboard/server/api/project/limits_info.ts
@@ -1,5 +1,5 @@
 
-import { ProjectLimitModel } from "@schema/ProjectsLimits";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 import { MAX_LOG_LIMIT_PERCENT } from '@data/broker/Limits';
 
 export default defineEventHandler(async event => {
diff --git a/dashboard/server/api/project/list.ts b/dashboard/server/api/project/list.ts
index 5c0d152..c161f6a 100644
--- a/dashboard/server/api/project/list.ts
+++ b/dashboard/server/api/project/list.ts
@@ -1,4 +1,4 @@
-import { ProjectModel, TProject } from "@schema/ProjectSchema";
+import { ProjectModel, TProject } from "@schema/project/ProjectSchema";
 
 export default defineEventHandler(async event => {
 
diff --git a/dashboard/server/api/project/list_guest.ts b/dashboard/server/api/project/list_guest.ts
index e6f6fd7..791baa7 100644
--- a/dashboard/server/api/project/list_guest.ts
+++ b/dashboard/server/api/project/list_guest.ts
@@ -1,4 +1,4 @@
-import { ProjectModel, TProject } from "@schema/ProjectSchema";
+import { ProjectModel, TProject } from "@schema/project/ProjectSchema";
 import { TTeamMember, TeamMemberModel } from "@schema/TeamMemberSchema";
 
 export default defineEventHandler(async event => {
diff --git a/dashboard/server/api/project/members/list.ts b/dashboard/server/api/project/members/list.ts
index a5a937d..a61b116 100644
--- a/dashboard/server/api/project/members/list.ts
+++ b/dashboard/server/api/project/members/list.ts
@@ -1,4 +1,4 @@
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { TeamMemberModel } from "@schema/TeamMemberSchema";
 import { UserModel } from "@schema/UserSchema";
 
diff --git a/dashboard/server/api/project/plan.ts b/dashboard/server/api/project/plan.ts
index 4544d51..8e01fd1 100644
--- a/dashboard/server/api/project/plan.ts
+++ b/dashboard/server/api/project/plan.ts
@@ -1,4 +1,4 @@
-import { ProjectLimitModel } from "@schema/ProjectsLimits";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 import StripeService from '~/server/services/StripeService';
 
 export default defineEventHandler(async event => {
diff --git a/dashboard/server/api/project/snapshots.ts b/dashboard/server/api/project/snapshots.ts
index 97d1841..f03d679 100644
--- a/dashboard/server/api/project/snapshots.ts
+++ b/dashboard/server/api/project/snapshots.ts
@@ -1,5 +1,5 @@
 
-import { ProjectSnapshotModel, TProjectSnapshot } from "@schema/ProjectSnapshot";
+import { ProjectSnapshotModel, TProjectSnapshot } from "@schema/project/ProjectSnapshot";
 
 export default defineEventHandler(async event => {
 
diff --git a/dashboard/server/api/snapshot/create.post.ts b/dashboard/server/api/snapshot/create.post.ts
index fc0b9d9..d15d481 100644
--- a/dashboard/server/api/snapshot/create.post.ts
+++ b/dashboard/server/api/snapshot/create.post.ts
@@ -1,5 +1,5 @@
-import { ProjectModel } from "@schema/ProjectSchema";
-import { ProjectSnapshotModel } from "@schema/ProjectSnapshot";
+import { ProjectModel } from "@schema/project/ProjectSchema";
+import { ProjectSnapshotModel } from "@schema/project/ProjectSnapshot";
 
 
 export default defineEventHandler(async event => {
diff --git a/dashboard/server/api/snapshot/delete.delete.ts b/dashboard/server/api/snapshot/delete.delete.ts
index 5c04dd6..ce28d66 100644
--- a/dashboard/server/api/snapshot/delete.delete.ts
+++ b/dashboard/server/api/snapshot/delete.delete.ts
@@ -1,5 +1,5 @@
-import { ProjectModel } from "@schema/ProjectSchema";
-import { ProjectSnapshotModel } from "@schema/ProjectSnapshot";
+import { ProjectModel } from "@schema/project/ProjectSchema";
+import { ProjectSnapshotModel } from "@schema/project/ProjectSnapshot";
 
 
 export default defineEventHandler(async event => {
diff --git a/dashboard/server/api/user/delete_account.delete.ts b/dashboard/server/api/user/delete_account.delete.ts
index ead7655..61cf10e 100644
--- a/dashboard/server/api/user/delete_account.delete.ts
+++ b/dashboard/server/api/user/delete_account.delete.ts
@@ -1,7 +1,7 @@
 
-import { ProjectModel } from "@schema/ProjectSchema";
-import { ProjectCountModel } from "@schema/ProjectsCounts";
-import { ProjectLimitModel } from "@schema/ProjectsLimits";
+import { ProjectModel } from "@schema/project/ProjectSchema";
+import { ProjectCountModel } from "@schema/project/ProjectsCounts";
+import { ProjectLimitModel } from "@schema/project/ProjectsLimits";
 import { UserSettingsModel } from "@schema/UserSettings";
 import { AiChatModel } from "@schema/ai/AiChatSchema";
 import { LimitNotifyModel } from "@schema/broker/LimitNotifySchema";
diff --git a/dashboard/server/api/user/is_first_time.ts b/dashboard/server/api/user/is_first_time.ts
index ce18adf..24c47f4 100644
--- a/dashboard/server/api/user/is_first_time.ts
+++ b/dashboard/server/api/user/is_first_time.ts
@@ -1,4 +1,4 @@
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { AuthContext } from "~/server/middleware/01-authorization";
 
 export default defineEventHandler(async event => {
diff --git a/dashboard/server/services/AiService.ts b/dashboard/server/services/AiService.ts
index 93155b6..14dcef4 100644
--- a/dashboard/server/services/AiService.ts
+++ b/dashboard/server/services/AiService.ts
@@ -2,8 +2,8 @@
 
 import OpenAI from "openai";
 import { AiChatModel } from '@schema/ai/AiChatSchema';
-import { ProjectCountModel } from '@schema/ProjectsCounts';
-import { ProjectLimitModel } from '@schema/ProjectsLimits';
+import { ProjectCountModel } from '@schema/project/ProjectsCounts';
+import { ProjectLimitModel } from '@schema/project/ProjectsLimits';
 
 import { AiEventsInstance } from '../ai/functions/AI_Events';
 import { AiVisitsInstance } from '../ai/functions/AI_Visits';
diff --git a/dashboard/server/services/AppsumoService.ts b/dashboard/server/services/AppsumoService.ts
index 1e7d686..9b3540c 100644
--- a/dashboard/server/services/AppsumoService.ts
+++ b/dashboard/server/services/AppsumoService.ts
@@ -1,7 +1,7 @@
 
 
 import { AppsumoCodeModel } from '@schema/AppsumoCodeSchema';
-import { AppsumoCodeTryModel } from '@schema/AppsumoCodeTrySchema';
+import { AppsumoCodeTryModel } from '@schema/appsumo/AppsumoCodeTrySchema';
 
 
 export async function canTryAppsumoCode(project_id: string) {
diff --git a/dashboard/server/utils/getRequestData.ts b/dashboard/server/utils/getRequestData.ts
index 4c88edd..5add1cc 100644
--- a/dashboard/server/utils/getRequestData.ts
+++ b/dashboard/server/utils/getRequestData.ts
@@ -2,7 +2,7 @@ import type { AuthContext } from "../middleware/01-authorization";
 import type { EventHandlerRequest, H3Event } from 'h3'
 import { allowedModels, TModelName } from "../services/DataService";
 import { LITLYX_PROJECT_ID } from "@data/LITLYX";
-import { ProjectModel, TProject } from "@schema/ProjectSchema";
+import { ProjectModel, TProject } from "@schema/project/ProjectSchema";
 import { Model, Types } from "mongoose";
 import { TeamMemberModel } from "@schema/TeamMemberSchema";
 import { Slice } from "@services/DateService";
diff --git a/dashboard/server/utils/hasAccessToProject.ts b/dashboard/server/utils/hasAccessToProject.ts
index 1009e26..6681b7b 100644
--- a/dashboard/server/utils/hasAccessToProject.ts
+++ b/dashboard/server/utils/hasAccessToProject.ts
@@ -1,4 +1,4 @@
-import { ProjectModel, TProject } from "@schema/ProjectSchema";
+import { ProjectModel, TProject } from "@schema/project/ProjectSchema";
 import { TeamMemberModel } from "@schema/TeamMemberSchema";
 
 export async function hasAccessToProject(user_id: string, project_id: string, project?: TProject) {
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index eededbe..1bd23c3 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,5 +1,5 @@
 packages:
-  # - "dashboard"
+  - "dashboard"
   - "producer"
   - "consumer"
   - "security"
diff --git a/producer/package.json b/producer/package.json
index 3a99ada..48e6317 100644
--- a/producer/package.json
+++ b/producer/package.json
@@ -1,27 +1,23 @@
 {
 	"dependencies": {
 		"cors": "^2.8.5",
-		"express": "^4.19.2",
-		"ioredis": "^5.4.1",
-		"redis": "^4.6.14",
-		"remove": "^0.1.5"
+		"express": "^4.19.2"
 	},
 	"devDependencies": {
 		"@types/cors": "^2.8.17",
 		"@types/express": "^4.17.21",
 		"@types/node": "^20.14.2",
-		"glob": "^10.4.1",
 		"ts-node": "^10.9.2",
 		"typescript": "^5.4.5"
 	},
-	"name": "litlyx-producer",
+	"name": "producer",
 	"version": "1.0.0",
 	"main": "dist/index.js",
 	"scripts": {
 		"dev": "node scripts/start_dev.js",
 		"compile": "tsc",
-		"build": "node ../scripts/build.js",
-		"build_all": "npm run compile && npm run build",
+		"build_project": "node ../scripts/build.js",
+		"build": "npm run compile && npm run build",
 		"docker-build": "docker build -t litlyx-producer -f Dockerfile ../",
 		"docker-inspect": "docker run -it litlyx-producer sh"
 	},
diff --git a/producer/tsconfig.json b/producer/tsconfig.json
index 1c19b62..2ec5c72 100644
--- a/producer/tsconfig.json
+++ b/producer/tsconfig.json
@@ -1,26 +1,10 @@
 {
+    "extends": "../tsconfig.json",
     "compilerOptions": {
         "module": "NodeNext",
         "target": "ESNext",
         "esModuleInterop": true,
-        "outDir": "dist",
-        "paths": {
-            "@schema/*": [
-                "../shared/schema/*"
-            ],
-            "@services/*": [
-                "../shared/services/*"
-            ],
-            "@data/*": [
-                "../shared/data/*"
-            ],
-            "@functions/*": [
-                "../shared/functions/*"
-            ],
-            "@utils/*": [
-                "../shared/utils/*"
-            ]
-        }
+        "outDir": "dist"
     },
     "include": [
         "src/**/*.ts"
diff --git a/security/package.json b/security/package.json
index d4d0884..3327843 100644
--- a/security/package.json
+++ b/security/package.json
@@ -1,9 +1,5 @@
 {
-  "dependencies": {
-    "@getbrevo/brevo": "^2.2.0",
-    "dayjs": "^1.11.13",
-    "mongoose": "^8.3.2"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@types/node": "^20.12.13",
     "ts-node": "^10.9.2",
@@ -15,11 +11,11 @@
   "scripts": {
     "dev": "node scripts/start_dev.js",
     "compile": "tsc",
-    "build": "node ../scripts/build.js",
-    "build_all": "npm run compile && npm run build"
+    "build_project": "node ../scripts/build.js",
+    "build": "npm run compile && npm run build"
   },
   "keywords": [],
   "author": "Emily",
   "license": "MIT",
-  "description": "."
+  "description": ""
 }
\ No newline at end of file
diff --git a/security/src/AnomalyService.ts b/security/src/AnomalyService.ts
index 439e432..1b16636 100644
--- a/security/src/AnomalyService.ts
+++ b/security/src/AnomalyService.ts
@@ -6,7 +6,7 @@ import { EventModel } from "@schema/metrics/EventSchema";
 import { VisitModel } from '@schema/metrics/VisitSchema'
 
 import * as url from 'url';
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { getAggregation } from "./Aggregations";
 
 type TAvgInput = { _id: string, count: number }
diff --git a/security/src/index.ts b/security/src/index.ts
index 38fefa4..d29d904 100644
--- a/security/src/index.ts
+++ b/security/src/index.ts
@@ -4,7 +4,7 @@ import { requireEnv } from '@utils/requireEnv'
 
 import EmailService from "@services/EmailService";
 
-import { ProjectModel } from "@schema/ProjectSchema";
+import { ProjectModel } from "@schema/project/ProjectSchema";
 import { UserModel } from "@schema/UserSchema";
 
 EmailService.init(requireEnv('BREVO_API_KEY'));