diff --git a/example/server.js b/example/server.js
index 1a8b5bf6..9d674c8d 100644
--- a/example/server.js
+++ b/example/server.js
@@ -1,7 +1,7 @@
 var http = require('http'), 
 		url = require('url'),
 		fs = require('fs'),
-		io = require('../lib/socket.io'),
+		io = require('../socket.io'),
 		sys = require('sys'),
 		
 send404 = function(res){
diff --git a/lib/socket.io/client.js b/lib/client.js
similarity index 100%
rename from lib/socket.io/client.js
rename to lib/client.js
diff --git a/lib/socket.io/listener.js b/lib/listener.js
similarity index 100%
rename from lib/socket.io/listener.js
rename to lib/listener.js
diff --git a/lib/socket.io/transports/flashsocket.js b/lib/transports/flashsocket.js
similarity index 100%
rename from lib/socket.io/transports/flashsocket.js
rename to lib/transports/flashsocket.js
diff --git a/lib/socket.io/transports/htmlfile.js b/lib/transports/htmlfile.js
similarity index 100%
rename from lib/socket.io/transports/htmlfile.js
rename to lib/transports/htmlfile.js
diff --git a/lib/socket.io/transports/websocket.js b/lib/transports/websocket.js
similarity index 100%
rename from lib/socket.io/transports/websocket.js
rename to lib/transports/websocket.js
diff --git a/lib/socket.io/transports/xhr-multipart.js b/lib/transports/xhr-multipart.js
similarity index 100%
rename from lib/socket.io/transports/xhr-multipart.js
rename to lib/transports/xhr-multipart.js
diff --git a/lib/socket.io/transports/xhr-polling.js b/lib/transports/xhr-polling.js
similarity index 100%
rename from lib/socket.io/transports/xhr-polling.js
rename to lib/transports/xhr-polling.js
diff --git a/lib/socket.io/utils.js b/lib/utils.js
similarity index 100%
rename from lib/socket.io/utils.js
rename to lib/utils.js
diff --git a/lib/socket.io.js b/socket.io.js
similarity index 63%
rename from lib/socket.io.js
rename to socket.io.js
index ec0b9bf0..2c046ace 100644
--- a/lib/socket.io.js
+++ b/socket.io.js
@@ -1,4 +1,4 @@
-var Listener = require('./socket.io/listener');
+var Listener = require('./lib/listener');
 
 this.listen = function(server, options){
 	return new Listener(server, options);