diff --git a/server/app.js b/server/app.js
index e963d2111..5a034f743 100644
--- a/server/app.js
+++ b/server/app.js
@@ -15,7 +15,7 @@ const playbackRouter = require('./routes/playbackRouter.js');
 const port = process.env.PORT || config.server.port;
 
 // Global Objects
-const Timer = require('./timer.js');
+const Timer = require('./classes/Timer.js');
 // TODO: this should be replaced by some sort of calculation
 let durationForNow = 5400;
 global.timer = new Timer();
diff --git a/server/classes/EventTimer.js b/server/classes/EventTimer.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/server/timer.js b/server/classes/Timer.js
similarity index 99%
rename from server/timer.js
rename to server/classes/Timer.js
index d247e04d5..c1246d270 100644
--- a/server/timer.js
+++ b/server/classes/Timer.js
@@ -116,4 +116,5 @@ class Timer {
   }
 }
 
+
 module.exports = Timer;