diff --git a/lib/index.js b/lib/index.js
index 6dab133..bb2041b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -3,7 +3,7 @@ var util = require('util');
 var Client = require(__dirname+'/client');
 var defaults =  require(__dirname + '/defaults');
 var pool = require(__dirname + '/pool');
-var types = require(__dirname + '/types');
+var types = require(__dirname + '/types/');
 var Connection = require(__dirname + '/connection');
 
 var PG = function(clientConstructor) {
diff --git a/lib/native/index.js b/lib/native/index.js
index bc2b9c2..f26cd7d 100644
--- a/lib/native/index.js
+++ b/lib/native/index.js
@@ -18,7 +18,6 @@ try {
 }
 
 var Connection = binding.Connection;
-var types = require(__dirname + "/../types");
 var NativeQuery = require(__dirname + '/query');
 
 for(var k in EventEmitter.prototype) {
diff --git a/lib/native/query.js b/lib/native/query.js
index 2a35697..cc57d47 100644
--- a/lib/native/query.js
+++ b/lib/native/query.js
@@ -1,7 +1,7 @@
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 
-var types = require(__dirname + '/../types');
+var types = require(__dirname + '/../types/');
 var utils = require(__dirname + '/../utils');
 var Result = require(__dirname + '/../result');
 
diff --git a/lib/query.js b/lib/query.js
index 5a5445c..c228dfb 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -2,7 +2,7 @@ var EventEmitter = require('events').EventEmitter;
 var util = require('util');
 
 var Result = require(__dirname + '/result');
-var Types = require(__dirname + '/types');
+var Types = require(__dirname + '/types/');
 var utils = require(__dirname + '/utils');
 
 var Query = function(config, values, callback) {
diff --git a/lib/arrayParser.js b/lib/types/arrayParser.js
similarity index 100%
rename from lib/arrayParser.js
rename to lib/types/arrayParser.js
diff --git a/lib/binaryParsers.js b/lib/types/binaryParsers.js
similarity index 100%
rename from lib/binaryParsers.js
rename to lib/types/binaryParsers.js
diff --git a/lib/types.js b/lib/types/index.js
similarity index 88%
rename from lib/types.js
rename to lib/types/index.js
index 796f484..af7ef99 100644
--- a/lib/types.js
+++ b/lib/types/index.js
@@ -1,5 +1,5 @@
-var textParsers = require(__dirname + "/textParsers"),
-binaryParsers = require(__dirname + "/binaryParsers");
+var textParsers = require(__dirname + '/textParsers'),
+binaryParsers = require(__dirname + '/binaryParsers');
 
 var typeParsers = {
   text: {},
diff --git a/lib/textParsers.js b/lib/types/textParsers.js
similarity index 100%
rename from lib/textParsers.js
rename to lib/types/textParsers.js