diff --git a/lib/Ratchet/Application/ApplicationInterface.php b/src/Ratchet/Application/ApplicationInterface.php
similarity index 100%
rename from lib/Ratchet/Application/ApplicationInterface.php
rename to src/Ratchet/Application/ApplicationInterface.php
diff --git a/lib/Ratchet/Application/Client/App.php b/src/Ratchet/Application/Client/App.php
similarity index 100%
rename from lib/Ratchet/Application/Client/App.php
rename to src/Ratchet/Application/Client/App.php
diff --git a/lib/Ratchet/Application/ConfiguratorInterface.php b/src/Ratchet/Application/ConfiguratorInterface.php
similarity index 100%
rename from lib/Ratchet/Application/ConfiguratorInterface.php
rename to src/Ratchet/Application/ConfiguratorInterface.php
diff --git a/lib/Ratchet/Application/Server/App.php b/src/Ratchet/Application/Server/App.php
similarity index 100%
rename from lib/Ratchet/Application/Server/App.php
rename to src/Ratchet/Application/Server/App.php
diff --git a/lib/Ratchet/Application/WAMP/App.php b/src/Ratchet/Application/WAMP/App.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/App.php
rename to src/Ratchet/Application/WAMP/App.php
diff --git a/lib/Ratchet/Application/WAMP/Command/Action/CallError.php b/src/Ratchet/Application/WAMP/Command/Action/CallError.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/Command/Action/CallError.php
rename to src/Ratchet/Application/WAMP/Command/Action/CallError.php
diff --git a/lib/Ratchet/Application/WAMP/Command/Action/CallResult.php b/src/Ratchet/Application/WAMP/Command/Action/CallResult.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/Command/Action/CallResult.php
rename to src/Ratchet/Application/WAMP/Command/Action/CallResult.php
diff --git a/lib/Ratchet/Application/WAMP/Command/Action/Event.php b/src/Ratchet/Application/WAMP/Command/Action/Event.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/Command/Action/Event.php
rename to src/Ratchet/Application/WAMP/Command/Action/Event.php
diff --git a/lib/Ratchet/Application/WAMP/Command/Action/Prefix.php b/src/Ratchet/Application/WAMP/Command/Action/Prefix.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/Command/Action/Prefix.php
rename to src/Ratchet/Application/WAMP/Command/Action/Prefix.php
diff --git a/lib/Ratchet/Application/WAMP/Exception.php b/src/Ratchet/Application/WAMP/Exception.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/Exception.php
rename to src/Ratchet/Application/WAMP/Exception.php
diff --git a/lib/Ratchet/Application/WAMP/JSONException.php b/src/Ratchet/Application/WAMP/JSONException.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/JSONException.php
rename to src/Ratchet/Application/WAMP/JSONException.php
diff --git a/lib/Ratchet/Application/WAMP/ServerInterface.php b/src/Ratchet/Application/WAMP/ServerInterface.php
similarity index 100%
rename from lib/Ratchet/Application/WAMP/ServerInterface.php
rename to src/Ratchet/Application/WAMP/ServerInterface.php
diff --git a/lib/Ratchet/Application/WebSocket/App.php b/src/Ratchet/Application/WebSocket/App.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/App.php
rename to src/Ratchet/Application/WebSocket/App.php
diff --git a/lib/Ratchet/Application/WebSocket/Command/Action/Disconnect.php b/src/Ratchet/Application/WebSocket/Command/Action/Disconnect.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Command/Action/Disconnect.php
rename to src/Ratchet/Application/WebSocket/Command/Action/Disconnect.php
diff --git a/lib/Ratchet/Application/WebSocket/Command/Action/Ping.php b/src/Ratchet/Application/WebSocket/Command/Action/Ping.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Command/Action/Ping.php
rename to src/Ratchet/Application/WebSocket/Command/Action/Ping.php
diff --git a/lib/Ratchet/Application/WebSocket/Command/Action/Pong.php b/src/Ratchet/Application/WebSocket/Command/Action/Pong.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Command/Action/Pong.php
rename to src/Ratchet/Application/WebSocket/Command/Action/Pong.php
diff --git a/lib/Ratchet/Application/WebSocket/Guzzle/Http/Message/RequestFactory.php b/src/Ratchet/Application/WebSocket/Guzzle/Http/Message/RequestFactory.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Guzzle/Http/Message/RequestFactory.php
rename to src/Ratchet/Application/WebSocket/Guzzle/Http/Message/RequestFactory.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/FrameInterface.php b/src/Ratchet/Application/WebSocket/Version/FrameInterface.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/FrameInterface.php
rename to src/Ratchet/Application/WebSocket/Version/FrameInterface.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/Hixie76.php b/src/Ratchet/Application/WebSocket/Version/Hixie76.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/Hixie76.php
rename to src/Ratchet/Application/WebSocket/Version/Hixie76.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/Hixie76/Frame.php b/src/Ratchet/Application/WebSocket/Version/Hixie76/Frame.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/Hixie76/Frame.php
rename to src/Ratchet/Application/WebSocket/Version/Hixie76/Frame.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/Hixie76/Message.php b/src/Ratchet/Application/WebSocket/Version/Hixie76/Message.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/Hixie76/Message.php
rename to src/Ratchet/Application/WebSocket/Version/Hixie76/Message.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/HyBi10.php b/src/Ratchet/Application/WebSocket/Version/HyBi10.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/HyBi10.php
rename to src/Ratchet/Application/WebSocket/Version/HyBi10.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/MessageInterface.php b/src/Ratchet/Application/WebSocket/Version/MessageInterface.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/MessageInterface.php
rename to src/Ratchet/Application/WebSocket/Version/MessageInterface.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/RFC6455.php b/src/Ratchet/Application/WebSocket/Version/RFC6455.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/RFC6455.php
rename to src/Ratchet/Application/WebSocket/Version/RFC6455.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/RFC6455/Frame.php b/src/Ratchet/Application/WebSocket/Version/RFC6455/Frame.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/RFC6455/Frame.php
rename to src/Ratchet/Application/WebSocket/Version/RFC6455/Frame.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/RFC6455/HandshakeVerifier.php b/src/Ratchet/Application/WebSocket/Version/RFC6455/HandshakeVerifier.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/RFC6455/HandshakeVerifier.php
rename to src/Ratchet/Application/WebSocket/Version/RFC6455/HandshakeVerifier.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/RFC6455/Message.php b/src/Ratchet/Application/WebSocket/Version/RFC6455/Message.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/RFC6455/Message.php
rename to src/Ratchet/Application/WebSocket/Version/RFC6455/Message.php
diff --git a/lib/Ratchet/Application/WebSocket/Version/VersionInterface.php b/src/Ratchet/Application/WebSocket/Version/VersionInterface.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/Version/VersionInterface.php
rename to src/Ratchet/Application/WebSocket/Version/VersionInterface.php
diff --git a/lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php b/src/Ratchet/Application/WebSocket/WebSocketAppInterface.php
similarity index 100%
rename from lib/Ratchet/Application/WebSocket/WebSocketAppInterface.php
rename to src/Ratchet/Application/WebSocket/WebSocketAppInterface.php
diff --git a/lib/Ratchet/Exception.php b/src/Ratchet/Exception.php
similarity index 100%
rename from lib/Ratchet/Exception.php
rename to src/Ratchet/Exception.php
diff --git a/lib/Ratchet/Resource/Command/Action/CloseConnection.php b/src/Ratchet/Resource/Command/Action/CloseConnection.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/Action/CloseConnection.php
rename to src/Ratchet/Resource/Command/Action/CloseConnection.php
diff --git a/lib/Ratchet/Resource/Command/Action/Null.php b/src/Ratchet/Resource/Command/Action/Null.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/Action/Null.php
rename to src/Ratchet/Resource/Command/Action/Null.php
diff --git a/lib/Ratchet/Resource/Command/Action/Runtime.php b/src/Ratchet/Resource/Command/Action/Runtime.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/Action/Runtime.php
rename to src/Ratchet/Resource/Command/Action/Runtime.php
diff --git a/lib/Ratchet/Resource/Command/Action/SendMessage.php b/src/Ratchet/Resource/Command/Action/SendMessage.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/Action/SendMessage.php
rename to src/Ratchet/Resource/Command/Action/SendMessage.php
diff --git a/lib/Ratchet/Resource/Command/ActionInterface.php b/src/Ratchet/Resource/Command/ActionInterface.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/ActionInterface.php
rename to src/Ratchet/Resource/Command/ActionInterface.php
diff --git a/lib/Ratchet/Resource/Command/ActionTemplate.php b/src/Ratchet/Resource/Command/ActionTemplate.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/ActionTemplate.php
rename to src/Ratchet/Resource/Command/ActionTemplate.php
diff --git a/lib/Ratchet/Resource/Command/CommandInterface.php b/src/Ratchet/Resource/Command/CommandInterface.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/CommandInterface.php
rename to src/Ratchet/Resource/Command/CommandInterface.php
diff --git a/lib/Ratchet/Resource/Command/Composite.php b/src/Ratchet/Resource/Command/Composite.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/Composite.php
rename to src/Ratchet/Resource/Command/Composite.php
diff --git a/lib/Ratchet/Resource/Command/Factory.php b/src/Ratchet/Resource/Command/Factory.php
similarity index 100%
rename from lib/Ratchet/Resource/Command/Factory.php
rename to src/Ratchet/Resource/Command/Factory.php
diff --git a/lib/Ratchet/Resource/Connection.php b/src/Ratchet/Resource/Connection.php
similarity index 100%
rename from lib/Ratchet/Resource/Connection.php
rename to src/Ratchet/Resource/Connection.php
diff --git a/lib/Ratchet/Socket.php b/src/Ratchet/Socket.php
similarity index 100%
rename from lib/Ratchet/Socket.php
rename to src/Ratchet/Socket.php
diff --git a/lib/Ratchet/SocketInterface.php b/src/Ratchet/SocketInterface.php
similarity index 100%
rename from lib/Ratchet/SocketInterface.php
rename to src/Ratchet/SocketInterface.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index d8416df..658bdac 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,7 +4,7 @@
     $app = new SplClassLoader('Ratchet', __DIR__);
     $app->register();
 
-    $app = new SplClassLoader('Ratchet', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'lib');
+    $app = new SplClassLoader('Ratchet', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src');
     $app->register();
 
     $app = new SplClassLoader('Guzzle', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'guzzle' . DIRECTORY_SEPARATOR . 'src');