diff --git a/index.js b/index.js
index 7f10d5a2..50a64117 100644
--- a/index.js
+++ b/index.js
@@ -2,8 +2,8 @@ var fs = require('fs');
 var path = require('path');
 
 exports.Schema = require('./lib/schema').Schema;
-exports.AbstractClass = require('./lib/abstract-class').AbstractClass;
-exports.Validatable = require('./lib/validatable').Validatable;
+exports.AbstractClass = require('./lib/model.js').AbstractClass;
+exports.Validatable = require('./lib/validations.js').Validatable;
 
 var baseSQL = './lib/sql';
 
diff --git a/lib/abstract-class.js b/lib/model.js
similarity index 100%
rename from lib/abstract-class.js
rename to lib/model.js
diff --git a/lib/schema.js b/lib/schema.js
index 681d873f..b12bdc33 100644
--- a/lib/schema.js
+++ b/lib/schema.js
@@ -1,7 +1,7 @@
 /**
  * Module dependencies
  */
-var AbstractClass = require('./abstract-class').AbstractClass;
+var AbstractClass = require('./model.js').AbstractClass;
 var util = require('util');
 var path = require('path');
 var fs = require('fs');