diff --git a/docker-compose.yml b/docker-compose.yml
index 849e3f9..9b43816 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,10 +2,11 @@ version: "3.8"
 services:
   auth_server:
     build:
-      context: .
+      context: ./src
+      dockerfile: Dockerfile
     env_file: ./.env
     volumes: 
-      - .:/ffs/
+      - ./src:/ffs/
       - /ffs/node_modules
     ports:
       - "3000:3000"
@@ -13,10 +14,11 @@ services:
 
   task_runner_1:
     build:
-      context: .
+      context: ./src
+      dockerfile: Dockerfile
     env_file: ./.env
     volumes: 
-      - .:/ffs/
+      - ./src:/ffs/
       - /ffs/node_modules
     network_mode: host
     command: "node taskRunner.js lathe"
\ No newline at end of file
diff --git a/Dockerfile b/src/Dockerfile
similarity index 58%
rename from Dockerfile
rename to src/Dockerfile
index b76e794..3eb3686 100644
--- a/Dockerfile
+++ b/src/Dockerfile
@@ -1,5 +1,5 @@
 FROM node:16
 WORKDIR /ffs/
-COPY package.json .
+COPY package.json ./
 RUN npm install
-COPY . .
\ No newline at end of file
+COPY . ./
\ No newline at end of file
diff --git a/config.js b/src/config.js
similarity index 91%
rename from config.js
rename to src/config.js
index aad2b35..d1b9c01 100644
--- a/config.js
+++ b/src/config.js
@@ -2,7 +2,10 @@
  * Configures constants used in the other parts of this app
  */
 
-require('dotenv').config();
+const dotenv = require('dotenv');
+
+dotenv.config({path: '../.env'});
+
 const ForgeAuthClient = require('forge-apis').AuthClientThreeLegged;
 
 const scopes = ['bucket:create', 'bucket:read', 'data:read', 'data:create', 'data:write'];
diff --git a/downloader.js b/src/downloader.js
similarity index 100%
rename from downloader.js
rename to src/downloader.js
diff --git a/package-lock.json b/src/package-lock.json
similarity index 100%
rename from package-lock.json
rename to src/package-lock.json
diff --git a/package.json b/src/package.json
similarity index 100%
rename from package.json
rename to src/package.json
diff --git a/server.js b/src/server.js
similarity index 98%
rename from server.js
rename to src/server.js
index 48d5d4c..fdaeb58 100644
--- a/server.js
+++ b/src/server.js
@@ -112,7 +112,7 @@ const createServer = () => {
  * Used internally to refresh tokens automatically
  */
 const refresh = () => {
-  config.authClient.refreshToken(credentials, scopes)
+  config.authClient.refreshToken(credentials, config.scopes)
     .then(creds => {
       credentials = creds;
       console.log(
diff --git a/taskRunner.js b/src/taskRunner.js
similarity index 100%
rename from taskRunner.js
rename to src/taskRunner.js
diff --git a/watcher.js b/src/watcher.js
similarity index 100%
rename from watcher.js
rename to src/watcher.js