diff --git a/client/.env b/.env
similarity index 100%
rename from client/.env
rename to .env
diff --git a/.gitignore b/.gitignore
index 06e6c00..28f1ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-client/node_modules
+node_modules
 .DS_Store
\ No newline at end of file
diff --git a/client/docker-compose.yaml b/docker-compose.yaml
similarity index 86%
rename from client/docker-compose.yaml
rename to docker-compose.yaml
index 93278bb..f9e23a8 100644
--- a/client/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -31,8 +31,8 @@ services:
     ports:
       - '3000:3000'
     volumes:
-      - ../client:/home/node/app  # Mount Client directory
-      - ../client/node_modules:/home/node/app/node_modules  # Mount node_modules directory
+      - .:/home/node/app  # Mount Client directory
+      - ./node_modules:/home/node/app/node_modules  # Mount node_modules directory
     command: 'npm run start'
 volumes:
   group-project:
\ No newline at end of file
diff --git a/client/src/index.js b/index.js
similarity index 92%
rename from client/src/index.js
rename to index.js
index 00ff3d5..0d95387 100644
--- a/client/src/index.js
+++ b/index.js
@@ -21,8 +21,8 @@ const moment = require('moment'); // To extract current time data
 // create `ExpressHandlebars` instance and configure the layouts and partials dir.
 const hbs = handlebars.create({
   extname: 'hbs',
-  layoutsDir: __dirname + '/views/layouts',
-  partialsDir: __dirname + '/views/partials',
+  layoutsDir: __dirname + '/client/src/views/layouts',
+  partialsDir: __dirname + '/client/src/views/partials',
 });
 
 // database configuration
@@ -53,7 +53,7 @@ db.connect()
 // Register `hbs` as our view engine using its bound `engine()` function.
 app.engine('hbs', hbs.engine);
 app.set('view engine', 'hbs');
-app.set('views', path.join(__dirname, 'views'));
+app.set('views', path.join(__dirname, '/client/src/views'));
 app.use(bodyParser.json()); // specify the usage of JSON for parsing request body.
 
 // initialize session variables
@@ -88,26 +88,26 @@ app.use(async function(req, res, next) {
 });
 
 // Serve static files from the 'public' directory
-app.use(express.static(path.join(__dirname, 'assets')));
+app.use(express.static(path.join(__dirname, '/client/src/assets')));
 
 // *****************************************************
 // <!-- Section 4 : Middleware -->
 // *****************************************************
 
 // Middleware to automatically update live scoreboard
-const fetchMatchesData = require('./assets/middleware/navigation-bar/current-match-information');
+const fetchMatchesData = require('./client/src/assets/middleware/navigation-bar/current-match-information');
 app.use(fetchMatchesData);
 
 //Middleware to automatically update in-game time abbreviations
 
-const convert_time = require('./assets/middleware/navigation-bar/convert-time');
+const convert_time = require('./client/src/assets/middleware/navigation-bar/convert-time');
 app.use(convert_time);
 
 
 // Leagues Page Middleware
 
-const fetchLeaguesData = require('./assets/middleware/leagues-page/get-current-league-information');
-const fetchLeagueScorerData = require('./assets/middleware/leagues-page/get-current-league-top-scorers');
+const fetchLeaguesData = require('./client/src/assets/middleware/leagues-page/get-current-league-information');
+const fetchLeagueScorerData = require('./client/src/assets/middleware/leagues-page/get-current-league-top-scorers');
 
 app.get('/league/:leagueID', [fetchLeaguesData, fetchLeagueScorerData], (req, res) => {
     // Render the Handlebars view with league data
@@ -120,7 +120,7 @@ app.get('/league/:leagueID', [fetchLeaguesData, fetchLeagueScorerData], (req, re
 
 // Clubs Page Middleware
 
-const fetchClubsData = require('./assets/middleware/clubs-page/get-current-club-information');
+const fetchClubsData = require('./client/src/assets/middleware/clubs-page/get-current-club-information');
 
 app.get('/club/:clubID', [fetchClubsData], (req, res) => {
     // Render the Handlebars view with league data
@@ -264,7 +264,7 @@ app.get('/logout', (req, res) => {
 *************************/
 
 // Import and call generateLeagueRoutes function
-const generateLeagueRoutes = require('./assets/routes/league-pages/generate-league-routes');
+const generateLeagueRoutes = require('./client/src/assets/routes/league-pages/generate-league-routes');
 generateLeagueRoutes(app);
 
 /************************ 
@@ -272,7 +272,7 @@ generateLeagueRoutes(app);
 *************************/
 
 // Import and call generateLeagueRoutes function
-const generateClubRoutes = require('./assets/routes/club-pages/generate-club-routes');
+const generateClubRoutes = require('./client/src/assets/routes/club-pages/generate-club-routes');
 generateClubRoutes(app);
 
 /************************ 
diff --git a/client/src/init_data/create.sql b/init_data/create.sql
similarity index 100%
rename from client/src/init_data/create.sql
rename to init_data/create.sql
diff --git a/client/package-lock.json b/package-lock.json
similarity index 100%
rename from client/package-lock.json
rename to package-lock.json
diff --git a/client/package.json b/package.json
similarity index 96%
rename from client/package.json
rename to package.json
index d0f034f..d0109d8 100644
--- a/client/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "scorespot",
-    "main": "src/index.js",
+    "main": "index.js",
     "dependencies": {
         "axios": "^1.1.3",
         "bcrypt": "^5.1.0",