diff --git a/lib/index.js b/lib/index.js
index eb384e5..3c952fb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,95 +1,3 @@
-var ee2 = require('eventemitter2').EventEmitter2;
-var net = require('net');
-var util = require('util');
-
-var kestrel = function( options ){
-    this._settings = {
-	//port: 22133,
-	//host: '127.0.0.1'
-    }
-
-    if( options instanceof Object ){
-	for( var key in options ){
-	    if( this._settings[key] != undefined ){
-		this._settings[key] = options[key];
-	    }
-	}
-    }
-
-    ee2.call(this);
-}
-util.inherits(kestrel,ee2);
-
-kestrel.prototype.connect = function(){
-    //open connections to kestrel server(s)
-}
-
-kestrel.prototype.close = function(){
-    //close any open connections
-}
-
-
-kestrel.prototype.set = function( queue, value, lifetime ){
-    if( lifetime == undefined || lieftime == null ){
-	lifetime = 0;
-    }
-
-    var command = "SET " + queue + " 0 " + lifetime + " ";
-    command += value.length + "\r\n" + value + "\r\n";
-
-
-    //send SET command
-}
-
-kestrel.prototype.get = function(queue, timeout){
-    var command = "GET " + queue;
-    
-    timeout = parseInt(timeout);
-    if( timeout > 0 ){
-	command += "/t="+timeout;
-    }
-	
-    //send GET command
-}
-
-kestrel.prototype.delete = function(queue){
-    //delete given queue
-}
-
-kestrel.prototype.flush = function(queue){
-    //flush given queue
-}
-
-kestrel.prototype.flushAll = function(){
-    //flush all queues
-}
-
-kestrel.prototype.version = function(){
-    //get version of server
-}
-
-kestrel.prototype.shutdown = function(){
-    //shutdown server
-}
-
-kestrel.prototype.reload = function(){
-    //reload the server
-}
-
-kestrel.prototype.stats = function(){
-    //get server stats
-}
-
-kestrel.prototype.dumpStats = function(){
-    //dump server stats
-}
-
-kestrel.prototype.monitor = function(queue, seconds, maxItems){
-    //monitor the given queue
-}
-
-kestrel.prototype.confirm = function(queue, count){
-    //confirm received items
-}
-
-module.exports = kestrel;
\ No newline at end of file
+module.exports.kestrelClient = require('./kestrelClient.js');
+module.exports.kestrelProducer = require('./kestrelProducer.js');
+module.exports.kestrelConsumer = require('./kestrelConsumer.js');
\ No newline at end of file
diff --git a/lib/kestrelClient.js b/lib/kestrelClient.js
new file mode 100644
index 0000000..eb384e5
--- /dev/null
+++ b/lib/kestrelClient.js
@@ -0,0 +1,95 @@
+var ee2 = require('eventemitter2').EventEmitter2;
+var net = require('net');
+var util = require('util');
+
+var kestrel = function( options ){
+    this._settings = {
+	//port: 22133,
+	//host: '127.0.0.1'
+    }
+
+    if( options instanceof Object ){
+	for( var key in options ){
+	    if( this._settings[key] != undefined ){
+		this._settings[key] = options[key];
+	    }
+	}
+    }
+
+    ee2.call(this);
+}
+util.inherits(kestrel,ee2);
+
+kestrel.prototype.connect = function(){
+    //open connections to kestrel server(s)
+}
+
+kestrel.prototype.close = function(){
+    //close any open connections
+}
+
+
+kestrel.prototype.set = function( queue, value, lifetime ){
+    if( lifetime == undefined || lieftime == null ){
+	lifetime = 0;
+    }
+
+    var command = "SET " + queue + " 0 " + lifetime + " ";
+    command += value.length + "\r\n" + value + "\r\n";
+
+
+    //send SET command
+}
+
+kestrel.prototype.get = function(queue, timeout){
+    var command = "GET " + queue;
+    
+    timeout = parseInt(timeout);
+    if( timeout > 0 ){
+	command += "/t="+timeout;
+    }
+	
+    //send GET command
+}
+
+kestrel.prototype.delete = function(queue){
+    //delete given queue
+}
+
+kestrel.prototype.flush = function(queue){
+    //flush given queue
+}
+
+kestrel.prototype.flushAll = function(){
+    //flush all queues
+}
+
+kestrel.prototype.version = function(){
+    //get version of server
+}
+
+kestrel.prototype.shutdown = function(){
+    //shutdown server
+}
+
+kestrel.prototype.reload = function(){
+    //reload the server
+}
+
+kestrel.prototype.stats = function(){
+    //get server stats
+}
+
+kestrel.prototype.dumpStats = function(){
+    //dump server stats
+}
+
+kestrel.prototype.monitor = function(queue, seconds, maxItems){
+    //monitor the given queue
+}
+
+kestrel.prototype.confirm = function(queue, count){
+    //confirm received items
+}
+
+module.exports = kestrel;
\ No newline at end of file
diff --git a/lib/kestrelConsumer.js b/lib/kestrelConsumer.js
new file mode 100644
index 0000000..53feab8
--- /dev/null
+++ b/lib/kestrelConsumer.js
@@ -0,0 +1 @@
+var kestrel = require('./kestrelClient.js');
\ No newline at end of file
diff --git a/lib/kestrelProducer.js b/lib/kestrelProducer.js
new file mode 100644
index 0000000..53feab8
--- /dev/null
+++ b/lib/kestrelProducer.js
@@ -0,0 +1 @@
+var kestrel = require('./kestrelClient.js');
\ No newline at end of file