diff --git a/Dockerfile b/Dockerfile
index 10d4696..c6d0ffa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /opt/obsAPI
 ADD package.json package-lock.json /opt/obsAPI/
 RUN npm ci
 
-ADD _helpers _middleware accounts config models public routes app.js /opt/obsAPI/
+ADD src /opt/obsAPI/src/
 
 EXPOSE 8080
 ENV PORT=8080
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ceaa263..75c0c48 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,16 +16,7 @@ services:
       context: .
       dockerfile: ./Dockerfile
     volumes:
-      - ./_helpers:/opt/obsAPI/_helpers
-      - ./_middleware:/opt/obsAPI/_middleware
-      - ./accounts:/opt/obsAPI/accounts
-      - ./config:/opt/obsAPI/config
-      - ./data:/opt/obsAPI/data
-      - ./models:/opt/obsAPI/models
-      - ./logic:/opt/obsAPI/logic
-      - ./public:/opt/obsAPI/public
-      - ./routes:/opt/obsAPI/routes
-      - ./app.js:/opt/obsAPI/app.js
+      - ./src:/opt/obsAPI/src
     environment:
       - PORT=3000
       - MONGODB_URL=mongodb://mongo/obsTest
diff --git a/package.json b/package.json
index 751718f..4b97229 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
   "main": "app.js",
   "scripts": {
     "mongo:start": "docker run --name realworld-mongo -p 27017:27017 mongo & sleep 5",
-    "start": "node ./app.js",
-    "dev": "nodemon ./app.js",
+    "start": "node src/",
+    "dev": "nodemon src/",
     "mongo:stop": "docker stop realworld-mongo && docker rm realworld-mongo",
     "autoformat": "eslint --fix .",
     "lint": "eslint .",
diff --git a/_helpers/send-email.js b/src/_helpers/send-email.js
similarity index 100%
rename from _helpers/send-email.js
rename to src/_helpers/send-email.js
diff --git a/_helpers/wrapRoute.js b/src/_helpers/wrapRoute.js
similarity index 100%
rename from _helpers/wrapRoute.js
rename to src/_helpers/wrapRoute.js
diff --git a/_middleware/error-handler.js b/src/_middleware/error-handler.js
similarity index 100%
rename from _middleware/error-handler.js
rename to src/_middleware/error-handler.js
diff --git a/_middleware/validate-request.js b/src/_middleware/validate-request.js
similarity index 100%
rename from _middleware/validate-request.js
rename to src/_middleware/validate-request.js
diff --git a/accounts/account.service.js b/src/accounts/account.service.js
similarity index 100%
rename from accounts/account.service.js
rename to src/accounts/account.service.js
diff --git a/accounts/accounts.controller.js b/src/accounts/accounts.controller.js
similarity index 100%
rename from accounts/accounts.controller.js
rename to src/accounts/accounts.controller.js
diff --git a/config/email.js b/src/config/email.js
similarity index 100%
rename from config/email.js
rename to src/config/email.js
diff --git a/config/index.js b/src/config/index.js
similarity index 100%
rename from config/index.js
rename to src/config/index.js
diff --git a/config/passport.js b/src/config/passport.js
similarity index 100%
rename from config/passport.js
rename to src/config/passport.js
diff --git a/app.js b/src/index.js
similarity index 100%
rename from app.js
rename to src/index.js
diff --git a/logic/_tracks_testdata.js b/src/logic/_tracks_testdata.js
similarity index 100%
rename from logic/_tracks_testdata.js
rename to src/logic/_tracks_testdata.js
diff --git a/logic/tracks.js b/src/logic/tracks.js
similarity index 100%
rename from logic/tracks.js
rename to src/logic/tracks.js
diff --git a/logic/tracks.test.js b/src/logic/tracks.test.js
similarity index 100%
rename from logic/tracks.test.js
rename to src/logic/tracks.test.js
diff --git a/models/Comment.js b/src/models/Comment.js
similarity index 100%
rename from models/Comment.js
rename to src/models/Comment.js
diff --git a/models/Track.js b/src/models/Track.js
similarity index 100%
rename from models/Track.js
rename to src/models/Track.js
diff --git a/models/TrackData.js b/src/models/TrackData.js
similarity index 100%
rename from models/TrackData.js
rename to src/models/TrackData.js
diff --git a/models/User.js b/src/models/User.js
similarity index 100%
rename from models/User.js
rename to src/models/User.js
diff --git a/public/.keep b/src/public/.keep
similarity index 100%
rename from public/.keep
rename to src/public/.keep
diff --git a/routes/api/index.js b/src/routes/api/index.js
similarity index 100%
rename from routes/api/index.js
rename to src/routes/api/index.js
diff --git a/routes/api/profiles.js b/src/routes/api/profiles.js
similarity index 100%
rename from routes/api/profiles.js
rename to src/routes/api/profiles.js
diff --git a/routes/api/tags.js b/src/routes/api/tags.js
similarity index 100%
rename from routes/api/tags.js
rename to src/routes/api/tags.js
diff --git a/routes/api/tracks.js b/src/routes/api/tracks.js
similarity index 100%
rename from routes/api/tracks.js
rename to src/routes/api/tracks.js
diff --git a/routes/api/users.js b/src/routes/api/users.js
similarity index 100%
rename from routes/api/users.js
rename to src/routes/api/users.js
diff --git a/routes/auth.js b/src/routes/auth.js
similarity index 100%
rename from routes/auth.js
rename to src/routes/auth.js
diff --git a/routes/index.js b/src/routes/index.js
similarity index 100%
rename from routes/index.js
rename to src/routes/index.js