diff --git a/app/client/app.js b/app/client/app.js
index f64e76e..bb90224 100755
--- a/app/client/app.js
+++ b/app/client/app.js
@@ -2,79 +2,8 @@
 var app = angular.module('chat', []);
 
 
+// register factories
+require('./services').register(app);
 
-/**
- * FACTORIES
- */
-
-// socket service
-app.factory('socket', function() {
-  var socket = io(window.location.host);
-  return socket;
-});
-
-
-// buffer service
-app.factory('buffer', function() {
-  return {
-    append: function(string) {
-      $('#buffer').append(string + '<br>\n');
-    },
-    error: function(error) {
-      $('#buffer').append('<span style="color:#D62D18;">' + error.errorMessage + '</span><br>')
-    }
-  }
-});
-
-
-
-
-
-/**
- * CONTROLLERS
- */
-
-// connect controller
-app.controller('connectController', function($scope, socket) {
-
-  // connect handler
-  $scope.connect = function() {
-    $('#connectModal').modal('hide')
-
-    if (socket.connected) {
-
-      socket.emit('server:connect', {
-        username: $scope.username,
-        password: $scope.password,
-        hostname: $scope.ip,
-        port: $scope.port || 25565
-      }, function(response) {
-
-      });
-
-    } else {
-      alert('Server unreachable, please try again later...');
-    }
-  }
-
-});
-
-
-// buffer controller
-app.controller('bufferController', function($scope, socket, buffer) {
-
-  // initial console buffer
-  buffer.append('<br>');
-  buffer.append('Welcome to AlexKvazos\'s Minecraft Chat App');
-  buffer.append('&gt; Press connect to connect to a Minecraft server and start chatting!');
-  buffer.append('<br>');
-  buffer.append('<i>Note: This application only works with 1.8 Minecraft servers.</i>');
-  buffer.append('---');
-  buffer.append('<br>');
-
-  // buffer errors when received
-  socket.on('bot:error', function(error) {
-    buffer.error(error);
-  });
-
-});
+// register controllers
+require('./controllers').register(app);
diff --git a/app/client/controllers/bufferController.js b/app/client/controllers/bufferController.js
new file mode 100644
index 0000000..27e1968
--- /dev/null
+++ b/app/client/controllers/bufferController.js
@@ -0,0 +1,21 @@
+/**
+ * Buffer Controller
+ */
+
+module.exports = function($scope, socket, buffer) {
+
+   // initial console buffer
+  buffer.append('<br>');
+  buffer.append('Welcome to AlexKvazos\'s Minecraft Chat App');
+  buffer.append('&gt; Press connect to connect to a Minecraft server and start chatting!');
+  buffer.append('<br>');
+  buffer.append('<i>Note: This application only works with 1.8 Minecraft servers.</i>');
+  buffer.append('---');
+  buffer.append('<br>');
+
+  // buffer errors when received
+  socket.on('bot:error', function(error) {
+    buffer.error(error);
+  });
+
+};
diff --git a/app/client/controllers/connectController.js b/app/client/controllers/connectController.js
new file mode 100644
index 0000000..291ad7f
--- /dev/null
+++ b/app/client/controllers/connectController.js
@@ -0,0 +1,27 @@
+/**
+ * Connect Controller
+ */
+
+module.exports = function($scope, socket) {
+
+  // connect handler
+  $scope.connect = function() {
+    $('#connectModal').modal('hide')
+
+    if (socket.connected) {
+
+      socket.emit('server:connect', {
+        username: $scope.username,
+        password: $scope.password,
+        hostname: $scope.ip,
+        port: $scope.port || 25565
+      }, function(response) {
+
+      });
+
+    } else {
+      alert('Server unreachable, please try again later...');
+    }
+  }
+
+};
diff --git a/app/client/controllers/index.js b/app/client/controllers/index.js
new file mode 100644
index 0000000..48b958f
--- /dev/null
+++ b/app/client/controllers/index.js
@@ -0,0 +1,10 @@
+/**
+ * Controllers
+ */
+
+exports.register = function(app) {
+
+  app.controller('connectController', require('./connectController'));
+  app.controller('bufferController',  require('./bufferController'));
+
+};
diff --git a/app/client/services/buffer.js b/app/client/services/buffer.js
new file mode 100644
index 0000000..a77d4ce
--- /dev/null
+++ b/app/client/services/buffer.js
@@ -0,0 +1,16 @@
+/**
+ * Buffer Service
+ */
+
+module.exports = function() {
+
+  return {
+    append: function(string) {
+      $('#buffer').append(string + '<br>\n');
+    },
+    error: function(error) {
+      $('#buffer').append('<span style="color:#D62D18;">' + error.errorMessage + '</span><br>')
+    }
+  }
+
+};
diff --git a/app/client/services/index.js b/app/client/services/index.js
new file mode 100644
index 0000000..afaead3
--- /dev/null
+++ b/app/client/services/index.js
@@ -0,0 +1,13 @@
+/**
+ * Services
+ */
+
+exports.register = function(app) {
+
+  // socket factory
+  app.factory('socket', require('./socket'));
+
+  // buffer factory
+  app.factory('buffer', require('./buffer'));
+
+};
diff --git a/app/client/services/socket.js b/app/client/services/socket.js
new file mode 100644
index 0000000..8b2173e
--- /dev/null
+++ b/app/client/services/socket.js
@@ -0,0 +1,10 @@
+/**
+ * Socket Service
+ */
+
+module.exports = function() {
+
+  var socket = io(window.location.host);
+  return socket;
+
+};