4 files changed, 14 insertions, 7 deletions
diff --git a/lib/output/base.js b/lib/output/base.js
index fede3da..ce0a9c6 100644
--- a/lib/output/base.js
+++ b/lib/output/base.js
@@ -150,4 +150,8 @@ Output.prototype.finish = function() {
 
 };
 
+Output.createMixin = function(def) {
+
+};
+
 module.exports = Output;
diff --git a/lib/output/conrefs.js b/lib/output/conrefs.js
index 98230d9..c91885e 100644
--- a/lib/output/conrefs.js
+++ b/lib/output/conrefs.js
@@ -1,4 +1,3 @@
-var util = require('util');
 var path = require('path');
 
 var Output = require('./base');
@@ -10,11 +9,9 @@ var pathUtil = require('../utils/path');
 Middleware for output to resolve git conrefs
 */
 
-function ConrefsLoader() {
-    Output.apply(this, arguments);
+var ConrefsLoader = Output.createMixin(function() {
     this.git = new Git();
-}
-util.inherits(ConrefsLoader, Output);
+});
 
 // Read a template by its source URL
 ConrefsLoader.prototype.onGetTemplate = function(sourceURL) {
diff --git a/lib/output/json.js b/lib/output/json.js
index a77b45a..f146023 100644
--- a/lib/output/json.js
+++ b/lib/output/json.js
@@ -1,10 +1,13 @@
 var util = require('util');
+var FolderOutput = require('./folder');
 var ConrefsLoader = require('./conrefs');
 var gitbook = require('../gitbook');
 
 function JSONOutput() {
-    ConrefsLoader.apply(this, arguments);
+    FolderOutput.apply(this, arguments);
+    ConrefsLoader.apply(this);
 }
+util.inherits(JSONOutput, FolderOutput);
 util.inherits(JSONOutput, ConrefsLoader);
 
 JSONOutput.prototype.name = 'json';
diff --git a/lib/output/website/index.js b/lib/output/website/index.js
index 7322a57..fc9bc6b 100644
--- a/lib/output/website/index.js
+++ b/lib/output/website/index.js
@@ -1,11 +1,14 @@
 var util = require('util');
+var FolderOutput = require('../folder');
 var ConrefsLoader = require('../conrefs');
 
 var Theme = require('./theme');
 
 function WebsiteOutput() {
-    ConrefsLoader.apply(this, arguments);
+    FolderOutput.apply(this, arguments);
+    ConrefsLoader.apply(this);
 }
+util.inherits(WebsiteOutput, FolderOutput);
 util.inherits(WebsiteOutput, ConrefsLoader);
 
 WebsiteOutput.prototype.name = 'website';