diff --git a/autoload.php b/autoload.php
index 0f37a58b..a3c467b7 100644
--- a/autoload.php
+++ b/autoload.php
@@ -2,7 +2,7 @@
 
 namespace triagens\Avocado;
 
-require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'Autoloader.php';
+require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'triagens' . DIRECTORY_SEPARATOR . 'Avocado' . DIRECTORY_SEPARATOR . 'Autoloader.php';
 
 Autoloader::init();
 
diff --git a/lib/Autoloader.php b/lib/triagens/Avocado/Autoloader.php
similarity index 100%
rename from lib/Autoloader.php
rename to lib/triagens/Avocado/Autoloader.php
diff --git a/lib/BindVars.php b/lib/triagens/Avocado/BindVars.php
similarity index 100%
rename from lib/BindVars.php
rename to lib/triagens/Avocado/BindVars.php
diff --git a/lib/ClientException.php b/lib/triagens/Avocado/ClientException.php
similarity index 100%
rename from lib/ClientException.php
rename to lib/triagens/Avocado/ClientException.php
diff --git a/lib/Collection.php b/lib/triagens/Avocado/Collection.php
similarity index 100%
rename from lib/Collection.php
rename to lib/triagens/Avocado/Collection.php
diff --git a/lib/CollectionHandler.php b/lib/triagens/Avocado/CollectionHandler.php
similarity index 100%
rename from lib/CollectionHandler.php
rename to lib/triagens/Avocado/CollectionHandler.php
diff --git a/lib/ConnectException.php b/lib/triagens/Avocado/ConnectException.php
similarity index 100%
rename from lib/ConnectException.php
rename to lib/triagens/Avocado/ConnectException.php
diff --git a/lib/Connection.php b/lib/triagens/Avocado/Connection.php
similarity index 100%
rename from lib/Connection.php
rename to lib/triagens/Avocado/Connection.php
diff --git a/lib/ConnectionOptions.php b/lib/triagens/Avocado/ConnectionOptions.php
similarity index 100%
rename from lib/ConnectionOptions.php
rename to lib/triagens/Avocado/ConnectionOptions.php
diff --git a/lib/Cursor.php b/lib/triagens/Avocado/Cursor.php
similarity index 100%
rename from lib/Cursor.php
rename to lib/triagens/Avocado/Cursor.php
diff --git a/lib/DefaultValues.php b/lib/triagens/Avocado/DefaultValues.php
similarity index 100%
rename from lib/DefaultValues.php
rename to lib/triagens/Avocado/DefaultValues.php
diff --git a/lib/Document.php b/lib/triagens/Avocado/Document.php
similarity index 100%
rename from lib/Document.php
rename to lib/triagens/Avocado/Document.php
diff --git a/lib/DocumentHandler.php b/lib/triagens/Avocado/DocumentHandler.php
similarity index 100%
rename from lib/DocumentHandler.php
rename to lib/triagens/Avocado/DocumentHandler.php
diff --git a/lib/Exception.php b/lib/triagens/Avocado/Exception.php
similarity index 100%
rename from lib/Exception.php
rename to lib/triagens/Avocado/Exception.php
diff --git a/lib/HttpHelper.php b/lib/triagens/Avocado/HttpHelper.php
similarity index 100%
rename from lib/HttpHelper.php
rename to lib/triagens/Avocado/HttpHelper.php
diff --git a/lib/HttpResponse.php b/lib/triagens/Avocado/HttpResponse.php
similarity index 100%
rename from lib/HttpResponse.php
rename to lib/triagens/Avocado/HttpResponse.php
diff --git a/lib/Scope.php b/lib/triagens/Avocado/Scope.php
similarity index 100%
rename from lib/Scope.php
rename to lib/triagens/Avocado/Scope.php
diff --git a/lib/ServerException.php b/lib/triagens/Avocado/ServerException.php
similarity index 100%
rename from lib/ServerException.php
rename to lib/triagens/Avocado/ServerException.php
diff --git a/lib/Statement.php b/lib/triagens/Avocado/Statement.php
similarity index 100%
rename from lib/Statement.php
rename to lib/triagens/Avocado/Statement.php
diff --git a/lib/UpdatePolicy.php b/lib/triagens/Avocado/UpdatePolicy.php
similarity index 100%
rename from lib/UpdatePolicy.php
rename to lib/triagens/Avocado/UpdatePolicy.php
diff --git a/lib/UrlHelper.php b/lib/triagens/Avocado/UrlHelper.php
similarity index 100%
rename from lib/UrlHelper.php
rename to lib/triagens/Avocado/UrlHelper.php
diff --git a/lib/ValueValidator.php b/lib/triagens/Avocado/ValueValidator.php
similarity index 100%
rename from lib/ValueValidator.php
rename to lib/triagens/Avocado/ValueValidator.php