diff --git a/less/main.less b/assets/less/main.less
similarity index 100%
rename from less/main.less
rename to assets/less/main.less
diff --git a/static/robots.txt b/assets/static/robots.txt
similarity index 100%
rename from static/robots.txt
rename to assets/static/robots.txt
diff --git a/src/.eslintrc b/client/.eslintrc
similarity index 100%
rename from src/.eslintrc
rename to client/.eslintrc
diff --git a/src/app.js b/client/app.js
similarity index 100%
rename from src/app.js
rename to client/app.js
diff --git a/src/components/Timer/index.js b/client/components/Timer/index.js
similarity index 100%
rename from src/components/Timer/index.js
rename to client/components/Timer/index.js
diff --git a/src/components/Timer/template.marko b/client/components/Timer/template.marko
similarity index 100%
rename from src/components/Timer/template.marko
rename to client/components/Timer/template.marko
diff --git a/src/error.marko b/client/error.marko
similarity index 100%
rename from src/error.marko
rename to client/error.marko
diff --git a/src/marko.json b/client/marko.json
similarity index 100%
rename from src/marko.json
rename to client/marko.json
diff --git a/src/master.marko b/client/master.marko
similarity index 100%
rename from src/master.marko
rename to client/master.marko
diff --git a/src/process.js b/client/process.js
similarity index 100%
rename from src/process.js
rename to client/process.js
diff --git a/src/routes.js b/client/routes.js
similarity index 100%
rename from src/routes.js
rename to client/routes.js
diff --git a/src/util/split-time.js b/client/util/split-time.js
similarity index 100%
rename from src/util/split-time.js
rename to client/util/split-time.js
diff --git a/src/util/time-filter.js b/client/util/time-filter.js
similarity index 100%
rename from src/util/time-filter.js
rename to client/util/time-filter.js
diff --git a/src/util/two-digits.js b/client/util/two-digits.js
similarity index 100%
rename from src/util/two-digits.js
rename to client/util/two-digits.js
diff --git a/server/config/mongo.js b/server/config/mongo.js
index a82ae5c..747a25b 100644
--- a/server/config/mongo.js
+++ b/server/config/mongo.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const defaults = {
-  uri: 'mongodb://pomodoro-supreme:lets-work-our-asses-off-poop-poop@mongo.thecodebureau.com/pomodoro'
+  uri: 'mongodb://pomodoro-supreme:lets-work-our-asses-off-poop-poop@mongo.bitmill.co/pomodoro'
 }
 
 module.exports = Object.assign(defaults, {
diff --git a/server/services/pomodoros/middleware.js b/server/services/pomodoros/middleware.js
index a96bc43..0d04b0e 100644
--- a/server/services/pomodoros/middleware.js
+++ b/server/services/pomodoros/middleware.js
@@ -7,7 +7,11 @@ const formatQuery = require('warepot/format-query')
 const Pomodoro = require('./model')
 
 function create(req, res, next) {
-  Pomodoro.create(Object.assign(req.body, { user: req.user && req.user.id || '57b04f50a1eaaf354f3b96a6' }), (err, pomodoro) => {
+  Pomodoro.create(Object.assign(req.body, {
+    user: req.user && req.user.id || '57b04f50a1eaaf354f3b96a6',
+    ip: req.ip,
+    userAgent: req.headers['user-agent']
+  }), (err, pomodoro) => {
     res.locals.pomodoro = pomodoro
 
     next(err)
diff --git a/server/services/pomodoros/model.js b/server/services/pomodoros/model.js
index ad992f4..e7a9339 100644
--- a/server/services/pomodoros/model.js
+++ b/server/services/pomodoros/model.js
@@ -17,7 +17,15 @@ const PomodoroSchema = new mongoose.Schema({
     type: mongoose.Schema.Types.ObjectId,
     ref: 'User',
     required: true
-  }
+  },
+  ip: {
+    type: String,
+    required: true
+  },
+  userAgent: {
+    type: String,
+    required: true
+  },
 })
 
 module.exports = mongoose.model('Pomodoro', PomodoroSchema)