diff --git a/apps/ngrx-notification/.eslintrc.json b/apps/ngrx/notification/.eslintrc.json
similarity index 94%
rename from apps/ngrx-notification/.eslintrc.json
rename to apps/ngrx/notification/.eslintrc.json
index 7eef2ce..8ebcbfd 100644
--- a/apps/ngrx-notification/.eslintrc.json
+++ b/apps/ngrx/notification/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
diff --git a/apps/ngrx-notification/README.md b/apps/ngrx/notification/README.md
similarity index 100%
rename from apps/ngrx-notification/README.md
rename to apps/ngrx/notification/README.md
diff --git a/apps/ngrx-notification/project.json b/apps/ngrx/notification/project.json
similarity index 70%
rename from apps/ngrx-notification/project.json
rename to apps/ngrx/notification/project.json
index 1f15df7..4814be0 100644
--- a/apps/ngrx-notification/project.json
+++ b/apps/ngrx/notification/project.json
@@ -1,25 +1,25 @@
 {
   "name": "ngrx-notification",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/ngrx-notification/src",
+  "sourceRoot": "apps/ngrx/notification/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/ngrx-notification",
-        "index": "apps/ngrx-notification/src/index.html",
-        "main": "apps/ngrx-notification/src/main.ts",
-        "polyfills": "apps/ngrx-notification/src/polyfills.ts",
-        "tsConfig": "apps/ngrx-notification/tsconfig.app.json",
+        "outputPath": "dist/apps/ngrx/notification",
+        "index": "apps/ngrx/notification/src/index.html",
+        "main": "apps/ngrx/notification/src/main.ts",
+        "polyfills": "apps/ngrx/notification/src/polyfills.ts",
+        "tsConfig": "apps/ngrx/notification/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
         "assets": [
-          "apps/ngrx-notification/src/favicon.ico",
-          "apps/ngrx-notification/src/assets"
+          "apps/ngrx/notification/src/favicon.ico",
+          "apps/ngrx/notification/src/assets"
         ],
-        "styles": ["apps/ngrx-notification/src/styles.scss"],
+        "styles": ["apps/ngrx/notification/src/styles.scss"],
         "scripts": [],
         "allowedCommonJsDependencies": ["seedrandom"]
       },
@@ -39,8 +39,8 @@
           ],
           "fileReplacements": [
             {
-              "replace": "apps/ngrx-notification/src/environments/environment.ts",
-              "with": "apps/ngrx-notification/src/environments/environment.prod.ts"
+              "replace": "apps/ngrx/notification/src/environments/environment.ts",
+              "with": "apps/ngrx/notification/src/environments/environment.prod.ts"
             }
           ],
           "outputHashing": "all"
@@ -78,8 +78,8 @@
       "executor": "@nx/linter:eslint",
       "options": {
         "lintFilePatterns": [
-          "apps/ngrx-notification/**/*.ts",
-          "apps/ngrx-notification/**/*.html"
+          "apps/ngrx/notification/**/*.ts",
+          "apps/ngrx/notification/**/*.html"
         ]
       }
     }
diff --git a/apps/ngrx-notification/src/app/app.actions.ts b/apps/ngrx/notification/src/app/app.actions.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/app.actions.ts
rename to apps/ngrx/notification/src/app/app.actions.ts
diff --git a/apps/ngrx-notification/src/app/app.component.ts b/apps/ngrx/notification/src/app/app.component.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/app.component.ts
rename to apps/ngrx/notification/src/app/app.component.ts
diff --git a/apps/ngrx-notification/src/app/app.config.ts b/apps/ngrx/notification/src/app/app.config.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/app.config.ts
rename to apps/ngrx/notification/src/app/app.config.ts
diff --git a/apps/ngrx-notification/src/app/data-access/http.service.ts b/apps/ngrx/notification/src/app/data-access/http.service.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/data-access/http.service.ts
rename to apps/ngrx/notification/src/app/data-access/http.service.ts
diff --git a/apps/ngrx-notification/src/app/data-access/notification.service.ts b/apps/ngrx/notification/src/app/data-access/notification.service.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/data-access/notification.service.ts
rename to apps/ngrx/notification/src/app/data-access/notification.service.ts
diff --git a/apps/ngrx-notification/src/app/routes.ts b/apps/ngrx/notification/src/app/routes.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/routes.ts
rename to apps/ngrx/notification/src/app/routes.ts
diff --git a/apps/ngrx-notification/src/app/school/school.component.ts b/apps/ngrx/notification/src/app/school/school.component.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/school/school.component.ts
rename to apps/ngrx/notification/src/app/school/school.component.ts
diff --git a/apps/ngrx-notification/src/app/school/school.store.ts b/apps/ngrx/notification/src/app/school/school.store.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/school/school.store.ts
rename to apps/ngrx/notification/src/app/school/school.store.ts
diff --git a/apps/ngrx-notification/src/app/student/store/student.actions.ts b/apps/ngrx/notification/src/app/student/store/student.actions.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/student/store/student.actions.ts
rename to apps/ngrx/notification/src/app/student/store/student.actions.ts
diff --git a/apps/ngrx-notification/src/app/student/store/student.effects.ts b/apps/ngrx/notification/src/app/student/store/student.effects.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/student/store/student.effects.ts
rename to apps/ngrx/notification/src/app/student/store/student.effects.ts
diff --git a/apps/ngrx-notification/src/app/student/store/student.reducer.ts b/apps/ngrx/notification/src/app/student/store/student.reducer.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/student/store/student.reducer.ts
rename to apps/ngrx/notification/src/app/student/store/student.reducer.ts
diff --git a/apps/ngrx-notification/src/app/student/store/student.selectors.ts b/apps/ngrx/notification/src/app/student/store/student.selectors.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/student/store/student.selectors.ts
rename to apps/ngrx/notification/src/app/student/store/student.selectors.ts
diff --git a/apps/ngrx-notification/src/app/student/student.component.ts b/apps/ngrx/notification/src/app/student/student.component.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/student/student.component.ts
rename to apps/ngrx/notification/src/app/student/student.component.ts
diff --git a/apps/ngrx-notification/src/app/teacher/store/teacher.actions.ts b/apps/ngrx/notification/src/app/teacher/store/teacher.actions.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/teacher/store/teacher.actions.ts
rename to apps/ngrx/notification/src/app/teacher/store/teacher.actions.ts
diff --git a/apps/ngrx-notification/src/app/teacher/store/teacher.effects.ts b/apps/ngrx/notification/src/app/teacher/store/teacher.effects.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/teacher/store/teacher.effects.ts
rename to apps/ngrx/notification/src/app/teacher/store/teacher.effects.ts
diff --git a/apps/ngrx-notification/src/app/teacher/store/teacher.reducer.ts b/apps/ngrx/notification/src/app/teacher/store/teacher.reducer.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/teacher/store/teacher.reducer.ts
rename to apps/ngrx/notification/src/app/teacher/store/teacher.reducer.ts
diff --git a/apps/ngrx-notification/src/app/teacher/store/teacher.selectors.ts b/apps/ngrx/notification/src/app/teacher/store/teacher.selectors.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/teacher/store/teacher.selectors.ts
rename to apps/ngrx/notification/src/app/teacher/store/teacher.selectors.ts
diff --git a/apps/ngrx-notification/src/app/teacher/teacher.component.ts b/apps/ngrx/notification/src/app/teacher/teacher.component.ts
similarity index 100%
rename from apps/ngrx-notification/src/app/teacher/teacher.component.ts
rename to apps/ngrx/notification/src/app/teacher/teacher.component.ts
diff --git a/apps/ngrx-notification/src/assets/.gitkeep b/apps/ngrx/notification/src/assets/.gitkeep
similarity index 100%
rename from apps/ngrx-notification/src/assets/.gitkeep
rename to apps/ngrx/notification/src/assets/.gitkeep
diff --git a/apps/ngrx-notification/src/environments/environment.prod.ts b/apps/ngrx/notification/src/environments/environment.prod.ts
similarity index 100%
rename from apps/ngrx-notification/src/environments/environment.prod.ts
rename to apps/ngrx/notification/src/environments/environment.prod.ts
diff --git a/apps/ngrx-notification/src/environments/environment.ts b/apps/ngrx/notification/src/environments/environment.ts
similarity index 100%
rename from apps/ngrx-notification/src/environments/environment.ts
rename to apps/ngrx/notification/src/environments/environment.ts
diff --git a/apps/ngrx-notification/src/favicon.ico b/apps/ngrx/notification/src/favicon.ico
similarity index 100%
rename from apps/ngrx-notification/src/favicon.ico
rename to apps/ngrx/notification/src/favicon.ico
diff --git a/apps/ngrx-notification/src/index.html b/apps/ngrx/notification/src/index.html
similarity index 100%
rename from apps/ngrx-notification/src/index.html
rename to apps/ngrx/notification/src/index.html
diff --git a/apps/ngrx-notification/src/main.ts b/apps/ngrx/notification/src/main.ts
similarity index 100%
rename from apps/ngrx-notification/src/main.ts
rename to apps/ngrx/notification/src/main.ts
diff --git a/apps/ngrx-notification/src/polyfills.ts b/apps/ngrx/notification/src/polyfills.ts
similarity index 100%
rename from apps/ngrx-notification/src/polyfills.ts
rename to apps/ngrx/notification/src/polyfills.ts
diff --git a/apps/ngrx-notification/src/styles.scss b/apps/ngrx/notification/src/styles.scss
similarity index 100%
rename from apps/ngrx-notification/src/styles.scss
rename to apps/ngrx/notification/src/styles.scss
diff --git a/apps/ngrx-notification/tsconfig.app.json b/apps/ngrx/notification/tsconfig.app.json
similarity index 88%
rename from apps/ngrx-notification/tsconfig.app.json
rename to apps/ngrx/notification/tsconfig.app.json
index ed3ec6e..7a4dbc4 100644
--- a/apps/ngrx-notification/tsconfig.app.json
+++ b/apps/ngrx/notification/tsconfig.app.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "types": [],
     "target": "ES2022",
     "useDefineForClassFields": false
diff --git a/apps/ngrx-notification/tsconfig.editor.json b/apps/ngrx/notification/tsconfig.editor.json
similarity index 58%
rename from apps/ngrx-notification/tsconfig.editor.json
rename to apps/ngrx/notification/tsconfig.editor.json
index d6ff20e..3d4f1db 100644
--- a/apps/ngrx-notification/tsconfig.editor.json
+++ b/apps/ngrx/notification/tsconfig.editor.json
@@ -2,9 +2,9 @@
   "extends": "./tsconfig.json",
   "include": [
     "**/*.ts",
-    "../../libs/ngrx-notification/backend/src/lib/fake-backend.service.ts"
+    "../../../libs/ngrx-notification/backend/src/lib/fake-backend.service.ts"
   ],
   "compilerOptions": {
     "types": []
   }
-}
\ No newline at end of file
+}
diff --git a/apps/ngrx-notification/tsconfig.json b/apps/ngrx/notification/tsconfig.json
similarity index 93%
rename from apps/ngrx-notification/tsconfig.json
rename to apps/ngrx/notification/tsconfig.json
index 0b7a078..b2dbbf2 100644
--- a/apps/ngrx-notification/tsconfig.json
+++ b/apps/ngrx/notification/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "files": [],
   "include": [],
   "references": [