diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 0a5a9e1..ec5c6b6 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -42,7 +42,8 @@ module.exports = (grunt) ->
 			'bower_components/ngDialog/js/ngDialog.js'
 			'bower_components/marked/lib/marked.js'
 			'scripts/app.js'
-			'scripts/controllers.js'
+			'scripts/controllers/app.js'
+			'scripts/controllers/comparison.js'
 			'scripts/services/fetch.js'
 			'scripts/services/filter.js'
 			'scripts/services/load.js'
diff --git a/source/scripts/app.js.coffee b/source/scripts/app.js.coffee
index c3ca98a..595b9ce 100644
--- a/source/scripts/app.js.coffee
+++ b/source/scripts/app.js.coffee
@@ -1,4 +1,4 @@
-angular.module('sideBySide', ['sideBySide.controllers', 'ngDialog', 'ngSanitize', 'duScroll'])
+angular.module('sideBySide', ['ngDialog', 'ngSanitize', 'duScroll'])
 	.config [ '$locationProvider', ($locationProvider) ->
 		$locationProvider.html5Mode true
 	]
diff --git a/source/scripts/controllers/app.js.coffee b/source/scripts/controllers/app.js.coffee
new file mode 100644
index 0000000..ffa264f
--- /dev/null
+++ b/source/scripts/controllers/app.js.coffee
@@ -0,0 +1,15 @@
+angular.module("sideBySide").controller "AppController",
+['$scope', 'ngDialog', 'poems'
+($scope, ngDialog, poems) ->
+	$scope.title = =>
+		sbs = 'Side By Side viewer'
+		if poems.config.title
+			poems.config.title + ' – ' + sbs
+		else
+			sbs
+
+	$scope.showPage = (page) ->
+		ngDialog.open {
+			template: 'partials/' + page + '.html'
+		}
+]
diff --git a/source/scripts/controllers.js.coffee b/source/scripts/controllers/comparison.js.coffee
similarity index 78%
rename from source/scripts/controllers.js.coffee
rename to source/scripts/controllers/comparison.js.coffee
index 30e7ba4..4b01c6d 100644
--- a/source/scripts/controllers.js.coffee
+++ b/source/scripts/controllers/comparison.js.coffee
@@ -1,20 +1,4 @@
-angular.module("sideBySide.controllers", [])
-.controller "AppController",
-['$scope', 'ngDialog', 'poems'
-($scope, ngDialog, poems) ->
-	$scope.title = =>
-		sbs = 'Side By Side viewer'
-		if poems.config.title
-			poems.config.title + ' – ' + sbs
-		else
-			sbs
-
-	$scope.showPage = (page) ->
-		ngDialog.open {
-			template: 'partials/' + page + '.html'
-		}
-]
-.controller "ComparisonController",
+angular.module("sideBySide").controller "ComparisonController",
 ['$document', '$rootScope', '$scope', 'filter', 'load', 'poems', 'route', 'transformer'
 ($document, $rootScope, $scope, filter, load, poems, route, transformer) ->
 	min = 1