diff --git a/apps/ngrx-1/.eslintrc.json b/apps/ngrx/effect-selector/.eslintrc.json
similarity index 94%
rename from apps/ngrx-1/.eslintrc.json
rename to apps/ngrx/effect-selector/.eslintrc.json
index 7eef2ce..8ebcbfd 100644
--- a/apps/ngrx-1/.eslintrc.json
+++ b/apps/ngrx/effect-selector/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
diff --git a/apps/ngrx-1/README.md b/apps/ngrx/effect-selector/README.md
similarity index 86%
rename from apps/ngrx-1/README.md
rename to apps/ngrx/effect-selector/README.md
index 0387acd..3f12862 100644
--- a/apps/ngrx-1/README.md
+++ b/apps/ngrx/effect-selector/README.md
@@ -5,7 +5,7 @@
 ### Run Application
 
 ```bash
-npx nx serve ngrx-1
+npx nx serve ngrx-effect-selector
 ```
 
 ### Documentation and Instruction
diff --git a/apps/ngrx-1/jest.config.ts b/apps/ngrx/effect-selector/jest.config.ts
similarity index 80%
rename from apps/ngrx-1/jest.config.ts
rename to apps/ngrx/effect-selector/jest.config.ts
index 10a9589..86ed38d 100644
--- a/apps/ngrx-1/jest.config.ts
+++ b/apps/ngrx/effect-selector/jest.config.ts
@@ -1,10 +1,10 @@
 /* eslint-disable */
 export default {
-  displayName: 'ngrx-1',
-  preset: '../../jest.preset.js',
+  displayName: 'ngrx-effect-selector',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
   globals: {},
-  coverageDirectory: '../../coverage/apps/ngrx-1',
+  coverageDirectory: '../../../coverage/apps/ngrx/effect-selector',
   transform: {
     '^.+\\.(ts|mjs|js|html)$': [
       'jest-preset-angular',
diff --git a/apps/ngrx-1/project.json b/apps/ngrx/effect-selector/project.json
similarity index 58%
rename from apps/ngrx-1/project.json
rename to apps/ngrx/effect-selector/project.json
index eeab3a5..c331f35 100644
--- a/apps/ngrx-1/project.json
+++ b/apps/ngrx/effect-selector/project.json
@@ -1,22 +1,25 @@
 {
-  "name": "ngrx-1",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "name": "ngrx-effect-selector",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
-  "sourceRoot": "apps/ngrx-1/src",
+  "sourceRoot": "apps/ngrx/effect-selector/src",
   "prefix": "app",
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/apps/ngrx-1",
-        "index": "apps/ngrx-1/src/index.html",
-        "main": "apps/ngrx-1/src/main.ts",
-        "polyfills": "apps/ngrx-1/src/polyfills.ts",
-        "tsConfig": "apps/ngrx-1/tsconfig.app.json",
+        "outputPath": "dist/apps/ngrx/effect-selector",
+        "index": "apps/ngrx/effect-selector/src/index.html",
+        "main": "apps/ngrx/effect-selector/src/main.ts",
+        "polyfills": "apps/ngrx/effect-selector/src/polyfills.ts",
+        "tsConfig": "apps/ngrx/effect-selector/tsconfig.app.json",
         "inlineStyleLanguage": "scss",
-        "assets": ["apps/ngrx-1/src/favicon.ico", "apps/ngrx-1/src/assets"],
-        "styles": ["apps/ngrx-1/src/styles.scss"],
+        "assets": [
+          "apps/ngrx/effect-selector/src/favicon.ico",
+          "apps/ngrx/effect-selector/src/assets"
+        ],
+        "styles": ["apps/ngrx/effect-selector/src/styles.scss"],
         "scripts": [],
         "allowedCommonJsDependencies": ["seedrandom"]
       },
@@ -36,8 +39,8 @@
           ],
           "fileReplacements": [
             {
-              "replace": "apps/ngrx-1/src/environments/environment.ts",
-              "with": "apps/ngrx-1/src/environments/environment.prod.ts"
+              "replace": "apps/ngrx/effect-selector/src/environments/environment.ts",
+              "with": "apps/ngrx/effect-selector/src/environments/environment.prod.ts"
             }
           ],
           "outputHashing": "all"
@@ -57,10 +60,10 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "ngrx-1:build:production"
+          "browserTarget": "ngrx-effect-selector:build:production"
         },
         "development": {
-          "browserTarget": "ngrx-1:build:development"
+          "browserTarget": "ngrx-effect-selector:build:development"
         }
       },
       "defaultConfiguration": "development"
@@ -68,20 +71,23 @@
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "ngrx-1:build"
+        "browserTarget": "ngrx-effect-selector:build"
       }
     },
     "lint": {
       "executor": "@nx/linter:eslint",
       "options": {
-        "lintFilePatterns": ["apps/ngrx-1/**/*.ts", "apps/ngrx-1/**/*.html"]
+        "lintFilePatterns": [
+          "apps/ngrx/effect-selector/**/*.ts",
+          "apps/ngrx/effect-selector/**/*.html"
+        ]
       }
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/ngrx-1/jest.config.ts",
+        "jestConfig": "apps/ngrx/effect-selector/jest.config.ts",
         "passWithNoTests": true
       }
     }
diff --git a/apps/ngrx-1/src/app/app.component.ts b/apps/ngrx/effect-selector/src/app/app.component.ts
similarity index 98%
rename from apps/ngrx-1/src/app/app.component.ts
rename to apps/ngrx/effect-selector/src/app/app.component.ts
index 924d078..0411abc 100644
--- a/apps/ngrx-1/src/app/app.component.ts
+++ b/apps/ngrx/effect-selector/src/app/app.component.ts
@@ -29,8 +29,7 @@ import { loadUsers } from './store/user/user.actions';
             *ngFor="
               let teacher of getAllTeachersForActivityType$(activity.type)
                 | async
-            "
-          >
+            ">
             {{ teacher.name }}
           </li>
         </ul>
diff --git a/apps/ngrx-1/src/app/app.config.ts b/apps/ngrx/effect-selector/src/app/app.config.ts
similarity index 100%
rename from apps/ngrx-1/src/app/app.config.ts
rename to apps/ngrx/effect-selector/src/app/app.config.ts
diff --git a/apps/ngrx-1/src/app/store/activity/activity.actions.ts b/apps/ngrx/effect-selector/src/app/store/activity/activity.actions.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/activity/activity.actions.ts
rename to apps/ngrx/effect-selector/src/app/store/activity/activity.actions.ts
diff --git a/apps/ngrx-1/src/app/store/activity/activity.effects.ts b/apps/ngrx/effect-selector/src/app/store/activity/activity.effects.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/activity/activity.effects.ts
rename to apps/ngrx/effect-selector/src/app/store/activity/activity.effects.ts
diff --git a/apps/ngrx-1/src/app/store/activity/activity.model.ts b/apps/ngrx/effect-selector/src/app/store/activity/activity.model.ts
similarity index 93%
rename from apps/ngrx-1/src/app/store/activity/activity.model.ts
rename to apps/ngrx/effect-selector/src/app/store/activity/activity.model.ts
index b90728c..75f1881 100644
--- a/apps/ngrx-1/src/app/store/activity/activity.model.ts
+++ b/apps/ngrx/effect-selector/src/app/store/activity/activity.model.ts
@@ -12,7 +12,7 @@ export const activityType = [
   'Maths',
   'Physics',
 ] as const;
-export type ActivityType = typeof activityType[number];
+export type ActivityType = (typeof activityType)[number];
 
 export interface Person {
   id: number;
diff --git a/apps/ngrx-1/src/app/store/activity/activity.reducer.ts b/apps/ngrx/effect-selector/src/app/store/activity/activity.reducer.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/activity/activity.reducer.ts
rename to apps/ngrx/effect-selector/src/app/store/activity/activity.reducer.ts
diff --git a/apps/ngrx-1/src/app/store/activity/activity.selectors.ts b/apps/ngrx/effect-selector/src/app/store/activity/activity.selectors.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/activity/activity.selectors.ts
rename to apps/ngrx/effect-selector/src/app/store/activity/activity.selectors.ts
diff --git a/apps/ngrx-1/src/app/store/activity/activity.service.ts b/apps/ngrx/effect-selector/src/app/store/activity/activity.service.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/activity/activity.service.ts
rename to apps/ngrx/effect-selector/src/app/store/activity/activity.service.ts
diff --git a/apps/ngrx-1/src/app/store/status/status.actions.ts b/apps/ngrx/effect-selector/src/app/store/status/status.actions.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/status/status.actions.ts
rename to apps/ngrx/effect-selector/src/app/store/status/status.actions.ts
diff --git a/apps/ngrx-1/src/app/store/status/status.effects.ts b/apps/ngrx/effect-selector/src/app/store/status/status.effects.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/status/status.effects.ts
rename to apps/ngrx/effect-selector/src/app/store/status/status.effects.ts
diff --git a/apps/ngrx-1/src/app/store/status/status.model.ts b/apps/ngrx/effect-selector/src/app/store/status/status.model.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/status/status.model.ts
rename to apps/ngrx/effect-selector/src/app/store/status/status.model.ts
diff --git a/apps/ngrx-1/src/app/store/status/status.reducer.ts b/apps/ngrx/effect-selector/src/app/store/status/status.reducer.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/status/status.reducer.ts
rename to apps/ngrx/effect-selector/src/app/store/status/status.reducer.ts
diff --git a/apps/ngrx-1/src/app/store/status/status.selectors.ts b/apps/ngrx/effect-selector/src/app/store/status/status.selectors.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/status/status.selectors.ts
rename to apps/ngrx/effect-selector/src/app/store/status/status.selectors.ts
diff --git a/apps/ngrx-1/src/app/store/user/user.actions.ts b/apps/ngrx/effect-selector/src/app/store/user/user.actions.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/user/user.actions.ts
rename to apps/ngrx/effect-selector/src/app/store/user/user.actions.ts
diff --git a/apps/ngrx-1/src/app/store/user/user.effects.ts b/apps/ngrx/effect-selector/src/app/store/user/user.effects.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/user/user.effects.ts
rename to apps/ngrx/effect-selector/src/app/store/user/user.effects.ts
diff --git a/apps/ngrx-1/src/app/store/user/user.model.ts b/apps/ngrx/effect-selector/src/app/store/user/user.model.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/user/user.model.ts
rename to apps/ngrx/effect-selector/src/app/store/user/user.model.ts
diff --git a/apps/ngrx-1/src/app/store/user/user.reducer.ts b/apps/ngrx/effect-selector/src/app/store/user/user.reducer.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/user/user.reducer.ts
rename to apps/ngrx/effect-selector/src/app/store/user/user.reducer.ts
diff --git a/apps/ngrx-1/src/app/store/user/user.selectors.ts b/apps/ngrx/effect-selector/src/app/store/user/user.selectors.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/user/user.selectors.ts
rename to apps/ngrx/effect-selector/src/app/store/user/user.selectors.ts
diff --git a/apps/ngrx-1/src/app/store/user/user.service.ts b/apps/ngrx/effect-selector/src/app/store/user/user.service.ts
similarity index 100%
rename from apps/ngrx-1/src/app/store/user/user.service.ts
rename to apps/ngrx/effect-selector/src/app/store/user/user.service.ts
diff --git a/apps/ngrx-1/src/assets/.gitkeep b/apps/ngrx/effect-selector/src/assets/.gitkeep
similarity index 100%
rename from apps/ngrx-1/src/assets/.gitkeep
rename to apps/ngrx/effect-selector/src/assets/.gitkeep
diff --git a/apps/ngrx-1/src/environments/environment.prod.ts b/apps/ngrx/effect-selector/src/environments/environment.prod.ts
similarity index 100%
rename from apps/ngrx-1/src/environments/environment.prod.ts
rename to apps/ngrx/effect-selector/src/environments/environment.prod.ts
diff --git a/apps/ngrx-1/src/environments/environment.ts b/apps/ngrx/effect-selector/src/environments/environment.ts
similarity index 100%
rename from apps/ngrx-1/src/environments/environment.ts
rename to apps/ngrx/effect-selector/src/environments/environment.ts
diff --git a/apps/ngrx-1/src/favicon.ico b/apps/ngrx/effect-selector/src/favicon.ico
similarity index 100%
rename from apps/ngrx-1/src/favicon.ico
rename to apps/ngrx/effect-selector/src/favicon.ico
diff --git a/apps/ngrx-1/src/index.html b/apps/ngrx/effect-selector/src/index.html
similarity index 100%
rename from apps/ngrx-1/src/index.html
rename to apps/ngrx/effect-selector/src/index.html
diff --git a/apps/ngrx-1/src/main.ts b/apps/ngrx/effect-selector/src/main.ts
similarity index 100%
rename from apps/ngrx-1/src/main.ts
rename to apps/ngrx/effect-selector/src/main.ts
diff --git a/apps/ngrx-1/src/polyfills.ts b/apps/ngrx/effect-selector/src/polyfills.ts
similarity index 100%
rename from apps/ngrx-1/src/polyfills.ts
rename to apps/ngrx/effect-selector/src/polyfills.ts
diff --git a/apps/ngrx-1/src/styles.scss b/apps/ngrx/effect-selector/src/styles.scss
similarity index 100%
rename from apps/ngrx-1/src/styles.scss
rename to apps/ngrx/effect-selector/src/styles.scss
diff --git a/apps/ngrx-1/src/test-setup.ts b/apps/ngrx/effect-selector/src/test-setup.ts
similarity index 100%
rename from apps/ngrx-1/src/test-setup.ts
rename to apps/ngrx/effect-selector/src/test-setup.ts
diff --git a/apps/ngrx-1/tsconfig.app.json b/apps/ngrx/effect-selector/tsconfig.app.json
similarity index 88%
rename from apps/ngrx-1/tsconfig.app.json
rename to apps/ngrx/effect-selector/tsconfig.app.json
index ed3ec6e..7a4dbc4 100644
--- a/apps/ngrx-1/tsconfig.app.json
+++ b/apps/ngrx/effect-selector/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-1/tsconfig.editor.json b/apps/ngrx/effect-selector/tsconfig.editor.json
similarity index 100%
rename from apps/ngrx-1/tsconfig.editor.json
rename to apps/ngrx/effect-selector/tsconfig.editor.json
diff --git a/apps/ngrx-1/tsconfig.json b/apps/ngrx/effect-selector/tsconfig.json
similarity index 93%
rename from apps/ngrx-1/tsconfig.json
rename to apps/ngrx/effect-selector/tsconfig.json
index c756d84..52eb4f7 100644
--- a/apps/ngrx-1/tsconfig.json
+++ b/apps/ngrx/effect-selector/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "files": [],
   "include": [],
   "references": [
diff --git a/apps/ngrx-1/tsconfig.spec.json b/apps/ngrx/effect-selector/tsconfig.spec.json
similarity index 85%
rename from apps/ngrx-1/tsconfig.spec.json
rename to apps/ngrx/effect-selector/tsconfig.spec.json
index c5db027..7aa46d8 100644
--- a/apps/ngrx-1/tsconfig.spec.json
+++ b/apps/ngrx/effect-selector/tsconfig.spec.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"]
   },
diff --git a/docs/src/content/docs/challenges/ngrx/2-effect-selector.md b/docs/src/content/docs/challenges/ngrx/2-effect-selector.md
index e6256ae..4efc647 100644
--- a/docs/src/content/docs/challenges/ngrx/2-effect-selector.md
+++ b/docs/src/content/docs/challenges/ngrx/2-effect-selector.md
@@ -3,7 +3,7 @@ title: 🟠 Effect vs Selector
 description: Challenge 2 is about learning the difference between effects and selectors in NgRx
 author: Thomas Laforge
 challengeNumber: 2
-command: ngrx-1
+command: ngrx-effect-selector
 blogLink: https://medium.com/@thomas.laforge/ngrx-effect-vs-reducer-vs-selector-58337ab59043
 sidebar:
   order: 113