--- a/client/annotviz/app/js/main.js	Mon Jan 19 16:44:59 2015 +0100
+++ b/client/annotviz/app/js/main.js	Tue Jan 20 11:57:44 2015 +0100
@@ -7,8 +7,16 @@
 
 'use strict';
 
-var doubleroll = require('./doubleroll.js');
+var doubleroll = require('./doubleroll');
+var annotroll = require('./annotsroll');
+var wswrapper = require('./wswrapper');
+var logger = require('./logger');
+
+var _ = require('lodash');
 
-module.exports = {
-    DoubleRoll: doubleroll.DoubleRoll
-};
+module.exports = _({})
+    .extend(doubleroll)
+    .extend(annotroll)
+    .extend(wswrapper)
+    .extend(logger)
+    .value();