diff --git a/lib/cloudevent.js b/lib/cloudevent.js
index 318b5ac..2419b2a 100644
--- a/lib/cloudevent.js
+++ b/lib/cloudevent.js
@@ -1,10 +1,10 @@
-var Spec_0_1      = require('./spec_0_1.js');
-var Spec_0_2      = require('./spec_0_2.js');
-var JSONFormatter = require('./jsonformatter.js');
+var Spec_0_1          = require('./spec_0_1.js');
+var Spec_0_2          = require('./spec_0_2.js');
+var JSONFormatter_0_1 = require('./format/json_0_1.js');
 
 function Cloudevent(_spec, _formatter){
   this.spec      = (_spec) ? new _spec(Cloudevent) : new Spec_0_1(Cloudevent);
-  this.formatter = (_formatter) ? _formatter : new JSONFormatter();
+  this.formatter = (_formatter) ? _formatter : new JSONFormatter_0_1();
 }
 
 Cloudevent.prototype.format = function(){