YSTEMandChess · Pratibha24vk · Dec 23, 2025 · Oct 28, 2025 · Nov 3, 2025 · Nov 3, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,13 +70,17 @@ jobs:
 
       - name: Create environment file
         run: |
-          mkdir -p src/environments
-          cat <<EOF > src/environments/environment.js
+          mkdir -p src/core/environments
+          cat <<EOF > src/core/environments/environment.ts
           export const environment = {
             production: false,
             agora: {
               appId: '${{ secrets.APP_ID }}',
             },
+            email: {
+              user: '${{ secrets.EMAIL_USER || '' }}',
+              pass: '${{ secrets.EMAIL_PASS || '' }}'
+            },
             urls: {
               middlewareURL: '${{ secrets.MIDDLEWARE_URL }}',
               chessClientURL: '${{ secrets.CHESS_CLIENT_URL }}',

diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,8 @@ react-ystemandchess/environment.prod.ts
 react-ystemandchess/environment.ts
 environment.php
 .env
-environment.*
+environment.*.local
+environment.secret.*
 create_envs.sh
 create_env.sh
 create_dev_envs.sh

diff --git a/README.md b/README.md
@@ -128,15 +128,16 @@ Each service runs independently and requires its own terminal window. Start the
 
 Handles user authentication, database operations, and coordinates other services.
 
-
 ```bash
 cd middlewareNode
 npm install    # Install backend dependencies  
-npm start      # Start the API server
+npm start      # Start the API server (runs from src/server.js)
 ```
 
 The server typically runs on port 8000. You should see "MongoDB Connected..." when it starts successfully.
 
+> **Note**: After modularization, the entry point is now `src/server.js`
+
 **If you intend to test the mentor and student login pages, you may use the following usernames and passwords respectively:**
 
 mentor 123123123
@@ -166,11 +167,13 @@ Manages chess game logic, validates moves, and handles real-time gameplay:
 ```bash
 cd chessServer
 npm install
-npm start
+npm start      # Starts from src/index.js
 ```
 
 Defaults to port 3000 (or the next available port if taken).
 
+> **Note**: After modularization, the entry point is now `src/index.js`
+
 ---
 
 #### Chess Engine Server
@@ -180,11 +183,13 @@ Integrates Stockfish for AI opponents and move analysis:
 ```bash
 cd stockfishServer
 npm install
-npm start
+npm start      # Starts from src/index.js
 ```
 
 This service usually runs on port 8080.
 
+> **Note**: After modularization, the entry point is now `src/index.js`
+
 ---
 
 #### Chess Client (Testing Interface)
@@ -198,8 +203,9 @@ Run the http server on port 80 using: `npx http-server -p 80` to ensure that the
 You can use the **Live Server extension in VS Code** to open the HTML files for local testing of the chess board:
 
 * **Board only:** Right-click `index.html` → "Open with Live Server"
-* **Board with controls:** Right-click `parent.html` → "Open with Live Server"
-* **Mentor/Student interaction:** Right-click `both.html` → "Open with Live Server"
+* **Archived files:** `archive/parent.html` and `archive/both.html` contain legacy testing interfaces
+
+> **Note**: Old HTML test files have been moved to `archive/` directory after modularization
 
 ---
 
@@ -231,4 +237,30 @@ git checkout -b my-branch-name
 
 ---
 
-You’re all set! Happy coding and thank you for contributing to educational equity! 🎯♟️
+## Project Structure
+
+This project has been recently modularized for better organization and maintainability. Key structural changes:
+
+- **All Node.js services** now have their code in a `src/` directory
+- **React app** uses a feature-based architecture with:
+  - `components/` - Reusable UI components
+  - `features/` - Feature modules (auth, lessons, student, mentor, etc.)
+  - `core/` - Core infrastructure (services, types, utils)
+  - `assets/` - Static assets and images
+- **Configuration files** are organized in the `config/` directory
+- **Kubernetes deployments** are in the `yaml/` directory
+
+---
+
+## Docker Deployment
+
+To run all services using Docker:
+
+```bash
+cd config
+docker-compose up
+```
+
+---
+
+You're all set! Happy coding and thank you for contributing to educational equity! 🎯♟️
diff --git a/chessClient/both.html → chessClient/archive/both.html b/chessClient/both.html → chessClient/archive/both.html
diff --git a/chessClient/parent.html → chessClient/archive/parent.html b/chessClient/parent.html → chessClient/archive/parent.html
diff --git a/chessClient/rapid_render.json → chessClient/archive/rapid_render.json b/chessClient/rapid_render.json → chessClient/archive/rapid_render.json
diff --git a/chessClient/CHANGELOG.md → chessClient/docs/CHANGELOG.md b/chessClient/CHANGELOG.md → chessClient/docs/CHANGELOG.md
diff --git a/chessClient/LICENSE.md → chessClient/docs/LICENSE.md b/chessClient/LICENSE.md → chessClient/docs/LICENSE.md
diff --git a/chessClient/README_MOBILE_RESPONSIVE.md → chessClient/docs/README_MOBILE_RESPONSIVE.md b/chessClient/README_MOBILE_RESPONSIVE.md → chessClient/docs/README_MOBILE_RESPONSIVE.md
diff --git a/chessServer/package.json b/chessServer/package.json
@@ -2,9 +2,9 @@
   "name": "chess-server",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
-    "start": "nodemon index.js",
+    "start": "nodemon src/index.js",
     "test": "jest --detectOpenHandles --forceExit"
   },
   "keywords": [],

diff --git a/chessServer/index old 2.js → chessServer/src/archive/index old 2.js b/chessServer/index old 2.js → chessServer/src/archive/index old 2.js
diff --git a/chessServer/index old.js → chessServer/src/archive/index old.js b/chessServer/index old.js → chessServer/src/archive/index old.js
diff --git a/chessServer/index.js → chessServer/src/index.js b/chessServer/index.js → chessServer/src/index.js
diff --git a/chessServer/managers/EventHandlers.js → chessServer/src/managers/EventHandlers.js b/chessServer/managers/EventHandlers.js → chessServer/src/managers/EventHandlers.js
diff --git a/chessServer/managers/GameManager.js → chessServer/src/managers/GameManager.js b/chessServer/managers/GameManager.js → chessServer/src/managers/GameManager.js
diff --git a/chessServer/__tests__/GameManager.test.js → chessServer/src/tests/GameManager.test.js b/chessServer/__tests__/GameManager.test.js → chessServer/src/tests/GameManager.test.js
diff --git a/chessServer/__tests__/index.test.js → chessServer/src/tests/index.test.js b/chessServer/__tests__/index.test.js → chessServer/src/tests/index.test.js
diff --git a/chessServer/server.test.js → chessServer/src/tests/server.test.js b/chessServer/server.test.js → chessServer/src/tests/server.test.js
diff --git a/docker-compose.yml → config/docker-compose.yml b/docker-compose.yml → config/docker-compose.yml
diff --git a/create_travis_envs.sh b/create_travis_envs.sh
@@ -4,8 +4,8 @@ printf "Creating environment files and variables\n\n"
 
 #Creating environment files and variables for react-ystemandchess
 printf "Creating environment files for react-ystemandchess\n"
-cd react-ystemandchess/src && mkdir environments
-cd environments
+cd react-ystemandchess/src && mkdir -p core/environments
+cd core/environments
 
 #Creating and adding environment.js file and variables
 touch environment.js
@@ -14,6 +14,10 @@ printf "    production: false,\n" >> environment.js
 printf "      agora: {\n" >> environment.js
 printf "     appId: ' ',\n" >> environment.js
 printf "    },\n" >> environment.js
+printf "    email: {\n" >> environment.js
+printf "      user: '',\n" >> environment.js
+printf "      pass: ''\n" >> environment.js
+printf "    },\n" >> environment.js
 printf "    urls: {\n" >> environment.js
 printf "      middlewareURL: 'http://127.0.0.1:8000',\n" >> environment.js
 printf "      chessClientURL: 'http://localhost',\n" >> environment.js
@@ -29,6 +33,10 @@ printf "    production: false,\n" >> environment.prod.js
 printf "      agora: {\n" >> environment.prod.js
 printf "     appId: ' ',\n" >> environment.prod.js
 printf "    },\n" >> environment.prod.js
+printf "    email: {\n" >> environment.prod.js
+printf "      user: '',\n" >> environment.prod.js
+printf "      pass: ''\n" >> environment.prod.js
+printf "    },\n" >> environment.prod.js
 printf "    urls: {\n" >> environment.prod.js
 printf "      middlewareURL: 'http://127.0.0.1:8000',\n" >> environment.prod.js
 printf "      chessClientURL: 'http://localhost',\n" >> environment.prod.js

diff --git a/mission-image.png → documentation/mission-image.png b/mission-image.png → documentation/mission-image.png
diff --git a/middleware/php.ini → middleware/src/config/php.ini b/middleware/php.ini → middleware/src/config/php.ini
diff --git a/middleware/awsGen.php → middleware/src/endpoints/awsGen.php b/middleware/awsGen.php → middleware/src/endpoints/awsGen.php
diff --git a/middleware/delete.php → middleware/src/endpoints/delete.php b/middleware/delete.php → middleware/src/endpoints/delete.php
diff --git a/middleware/endMeeting.php → middleware/src/endpoints/endMeeting.php b/middleware/endMeeting.php → middleware/src/endpoints/endMeeting.php
diff --git a/middleware/endSearch.php → middleware/src/endpoints/endSearch.php b/middleware/endSearch.php → middleware/src/endpoints/endSearch.php
diff --git a/middleware/genLink.php → middleware/src/endpoints/genLink.php b/middleware/genLink.php → middleware/src/endpoints/genLink.php
diff --git a/middleware/getCompletedLesson.php → ...ware/src/endpoints/getCompletedLesson.php b/middleware/getCompletedLesson.php → ...ware/src/endpoints/getCompletedLesson.php
diff --git a/middleware/getInfo.php → middleware/src/endpoints/getInfo.php b/middleware/getInfo.php → middleware/src/endpoints/getInfo.php
diff --git a/middleware/getLesson.php → middleware/src/endpoints/getLesson.php b/middleware/getLesson.php → middleware/src/endpoints/getLesson.php
diff --git a/middleware/getRecordings.php → middleware/src/endpoints/getRecordings.php b/middleware/getRecordings.php → middleware/src/endpoints/getRecordings.php
diff --git a/middleware/getTotalPieceLesson.php → ...are/src/endpoints/getTotalPieceLesson.php b/middleware/getTotalPieceLesson.php → ...are/src/endpoints/getTotalPieceLesson.php
diff --git a/middleware/index.php → middleware/src/endpoints/index.php b/middleware/index.php → middleware/src/endpoints/index.php
diff --git a/middleware/isInMeeting.php → middleware/src/endpoints/isInMeeting.php b/middleware/isInMeeting.php → middleware/src/endpoints/isInMeeting.php
diff --git a/middleware/newGame.php → middleware/src/endpoints/newGame.php b/middleware/newGame.php → middleware/src/endpoints/newGame.php
diff --git a/middleware/pairUp.php → middleware/src/endpoints/pairUp.php b/middleware/pairUp.php → middleware/src/endpoints/pairUp.php
diff --git a/middleware/record.php → middleware/src/endpoints/record.php b/middleware/record.php → middleware/src/endpoints/record.php
diff --git a/middleware/studentInfo.php → middleware/src/endpoints/studentInfo.php b/middleware/studentInfo.php → middleware/src/endpoints/studentInfo.php
diff --git a/middleware/updateLessonCompletion.php → .../src/endpoints/updateLessonCompletion.php b/middleware/updateLessonCompletion.php → .../src/endpoints/updateLessonCompletion.php
diff --git a/middleware/verify.php → middleware/src/endpoints/verify.php b/middleware/verify.php → middleware/src/endpoints/verify.php
diff --git a/middleware/verifyNoEcho.php → middleware/src/endpoints/verifyNoEcho.php b/middleware/verifyNoEcho.php → middleware/src/endpoints/verifyNoEcho.php
diff --git a/middleware/testQueries.txt → middleware/src/testQueries.txt b/middleware/testQueries.txt → middleware/src/testQueries.txt
diff --git a/middlewareNode/package-lock.json b/middlewareNode/package-lock.json
diff --git a/middlewareNode/package.json b/middlewareNode/package.json
@@ -2,7 +2,7 @@
   "name": "middleware",
   "version": "1.0.0",
   "description": "API for Y STEM And Chess Inc",
-  "main": "server.js",
+  "main": "src/server.js",
   "dependencies": {
     "aws-sdk": "^2.889.0",
     "axios": "^0.21.1",
@@ -22,7 +22,7 @@
     "uuid": "^8.3.2"
   },
   "scripts": {
-    "start": "nodemon server.js"
+    "start": "nodemon src/server.js"
   },
   "author": "",
   "license": "ISC",

diff --git a/middlewareNode/badges/catalog.js → middlewareNode/src/badges/catalog.js b/middlewareNode/badges/catalog.js → middlewareNode/src/badges/catalog.js
diff --git a/middlewareNode/badges/service.js → middlewareNode/src/badges/service.js b/middlewareNode/badges/service.js → middlewareNode/src/badges/service.js
diff --git a/middlewareNode/src/config/custom-environment-variables.json b/middlewareNode/src/config/custom-environment-variables.json
@@ -0,0 +1,32 @@
+{
+  "mongoURI": "MONGO_URI",
+  "jwtSecret": "JWT_SECRET",
+  "indexKey": "INDEX_KEY",
+
+  "corsOptions": { "origin": "CORS_ORIGIN" },
+
+  "email": {
+    "user": "EMAIL_USER",
+    "pass": "EMAIL_PASS"
+  },
+
+  "user": "EMAIL_USER",
+  "senderEmail": "SENDER_EMAIL",
+
+  "clientId": "GOOGLE_CLIENT_ID",
+  "clientSecret": "GOOGLE_CLIENT_SECRET",
+  "redirectUri": "GOOGLE_REDIRECT_URI",
+  "refreshToken": "GOOGLE_REFRESH_TOKEN",
+
+  "basepath": "BASEPATH",
+
+  "awsAccessKey": "AWS_ACCESS_KEY_ID",
+  "awsSecretKey": "AWS_SECRET_ACCESS_KEY",
+
+  "appID": "AGORA_APP_ID",
+  "uid": "AGORA_UID",
+  "customerId": "AGORA_CUSTOMER_ID",
+  "customerCertificate": "AGORA_CUSTOMER_CERT",
+
+  "server": { "port": "PORT" }
+}
diff --git a/middlewareNode/config/db.js → middlewareNode/src/config/db.js b/middlewareNode/config/db.js → middlewareNode/src/config/db.js
diff --git a/middlewareNode/config/passport.js → middlewareNode/src/config/passport.js b/middlewareNode/config/passport.js → middlewareNode/src/config/passport.js
diff --git a/middlewareNode/controllers/meetings.js → middlewareNode/src/controllers/meetings.js b/middlewareNode/controllers/meetings.js → middlewareNode/src/controllers/meetings.js
diff --git a/middlewareNode/models/UserBadges.js → middlewareNode/src/models/UserBadges.js b/middlewareNode/models/UserBadges.js → middlewareNode/src/models/UserBadges.js
diff --git a/middlewareNode/models/activities.js → middlewareNode/src/models/activities.js b/middlewareNode/models/activities.js → middlewareNode/src/models/activities.js
diff --git a/middlewareNode/models/categorys.js → middlewareNode/src/models/categorys.js b/middlewareNode/models/categorys.js → middlewareNode/src/models/categorys.js
diff --git a/middlewareNode/models/guest.js → middlewareNode/src/models/guest.js b/middlewareNode/models/guest.js → middlewareNode/src/models/guest.js
diff --git a/middlewareNode/models/meetings.js → middlewareNode/src/models/meetings.js b/middlewareNode/models/meetings.js → middlewareNode/src/models/meetings.js
diff --git a/middlewareNode/models/moves.js → middlewareNode/src/models/moves.js b/middlewareNode/models/moves.js → middlewareNode/src/models/moves.js
diff --git a/middlewareNode/models/puzzles.js → middlewareNode/src/models/puzzles.js b/middlewareNode/models/puzzles.js → middlewareNode/src/models/puzzles.js
diff --git a/middlewareNode/models/timeTracking.js → middlewareNode/src/models/timeTracking.js b/middlewareNode/models/timeTracking.js → middlewareNode/src/models/timeTracking.js
diff --git a/middlewareNode/models/undoPermission.js → middlewareNode/src/models/undoPermission.js b/middlewareNode/models/undoPermission.js → middlewareNode/src/models/undoPermission.js
diff --git a/middlewareNode/models/users.js → middlewareNode/src/models/users.js b/middlewareNode/models/users.js → middlewareNode/src/models/users.js
diff --git a/middlewareNode/models/waiting.js → middlewareNode/src/models/waiting.js b/middlewareNode/models/waiting.js → middlewareNode/src/models/waiting.js
diff --git a/middlewareNode/routes/activities.js → middlewareNode/src/routes/activities.js b/middlewareNode/routes/activities.js → middlewareNode/src/routes/activities.js
diff --git a/middlewareNode/routes/auth.js → middlewareNode/src/routes/auth.js b/middlewareNode/routes/auth.js → middlewareNode/src/routes/auth.js
diff --git a/middlewareNode/routes/badges.js → middlewareNode/src/routes/badges.js b/middlewareNode/routes/badges.js → middlewareNode/src/routes/badges.js
diff --git a/middlewareNode/routes/categorys.js → middlewareNode/src/routes/categorys.js b/middlewareNode/routes/categorys.js → middlewareNode/src/routes/categorys.js