diff --git a/app.js b/src/app.js
similarity index 100%
rename from app.js
rename to src/app.js
diff --git a/server.js b/src/server.js
similarity index 87%
rename from server.js
rename to src/server.js
index 65130ee..851fcc2 100644
--- a/server.js
+++ b/src/server.js
@@ -1,6 +1,6 @@
 import express from 'express';
 import path from 'path';
-import routes from './src/routes.js';
+import routes from './routes.js';
 
 const app = express();
 app.use(express.json());
diff --git a/test/calendar.test.js b/test/calendar.test.js
index 2b6303e..ba38d1d 100644
--- a/test/calendar.test.js
+++ b/test/calendar.test.js
@@ -10,7 +10,7 @@ const EXPECTED_OUTPUTS_DIR = path.join(__dirname, 'expected_outputs');
 let server;
 process.chdir(__dirname)
 console.log(process.cwd());
-const app = require('../server').default;
+const app = require('../src/server').default;
 
 describe('Calendar Merging API', () => {
     beforeAll(async () => {