diff --git a/src/bootstrap.php b/src/bootstrap.php
deleted file mode 100644
index 9fb8f00..0000000
--- a/src/bootstrap.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * phpillow CouchDB backend
- *
- * This file is part of phpillow.
- *
- * phpillow is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; version 3 of the License.
- *
- * phpillow is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with phpillow; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @package Core
- * @version $Revision: 124 $
- * @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPL
- */
-
-/**
- * This is the bootstrap file, which sets up an autoload mechanism using
- * spl-Autoload-register, which makes all PHPillow classes available in your
- * scripts.
- *
- * To use PHPillow just include this file, like:
- *
- * <code>
- *  include '/path/to/phpillow/bootstrap.php';
- * </code>
- */
-function phpillow_autoload( $class )
-{
-    static $classes;
-
-    if ( $classes === null )
-    {
-        $classes = include dirname( __FILE__ ) . '/classes/autoload.php';
-    }
-
-    if ( !isset( $classes[$class] ) )
-    {
-        return false;
-    }
-
-    include dirname( __FILE__ ) . '/' . $classes[$class];
-    return true;
-}
-
-spl_autoload_register( 'phpillow_autoload' );
\ No newline at end of file
diff --git a/src/classes/autoload.php b/src/classes/autoload.php
deleted file mode 100644
index c1f45e5..0000000
--- a/src/classes/autoload.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * phpillow autoload file
- *
- * This file is part of phpillow.
- *
- * phpillow is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; version 3 of the License.
- *
- * phpillow is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with phpillow; if not, write to the Free Software Foundation, Inc., 51
- * Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @package Core
- * @version $Revision$
- * @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPL
- */
-
-/*
- * This array is autogenerated and topologically sorted. Do not change anything
- * in here, but just run the following script in the trunk/ directory.
- *
- * # scripts/gen_autoload_files.php
- */
-return array(
-    'phpillowConnection'                     => 'classes/connection.php',
-    'phpillowCustomConnection'               => 'classes/connection/custom.php',
-    'phpillowStreamConnection'               => 'classes/connection/stream.php',
-    'phpillowDocument'                       => 'classes/document.php',
-    'phpillowGroupDocument'                  => 'classes/document/group.php',
-    'phpillowUserDocument'                   => 'classes/document/user.php',
-    'phpillowException'                      => 'classes/exception.php',
-    'phpillowRuntimeException'               => 'classes/exception.php',
-    'phpillowConnectionException'            => 'classes/exception.php',
-    'phpillowOptionException'                => 'classes/exception.php',
-    'phpillowNoDatabaseException'            => 'classes/exception.php',
-    'phpillowInvalidRequestException'        => 'classes/exception.php',
-    'phpillowNoSuchPropertyException'        => 'classes/exception.php',
-    'phpillowValidationException'            => 'classes/exception.php',
-    'phpillowOrValidationException'          => 'classes/exception.php',
-    'phpillowResponseErrorException'         => 'classes/exception.php',
-    'phpillowResponseNotFoundErrorException' => 'classes/exception.php',
-    'phpillowResponseConflictErrorException' => 'classes/exception.php',
-    'phpillowMultipartParserException'       => 'classes/exception.php',
-    'phpillowLazyFile'                       => 'classes/lazy_file.php',
-    'phpillowView'                           => 'classes/view.php',
-    'phpillowFileView'                       => 'classes/file_view.php',
-    'phpillowUserFileView'                   => 'classes/file_view/user.php',
-    'phpillowLazyFile'                       => 'classes/lazy_file.php',
-    'phpillowManager'                        => 'classes/manager.php',
-    'phpillowResponseFactory'                => 'classes/response.php',
-    'phpillowResponse'                       => 'classes/response/base.php',
-    'phpillowArrayResponse'                  => 'classes/response/array.php',
-    'phpillowDataResponse'                   => 'classes/response/data.php',
-    'phpillowResultSetResponse'              => 'classes/response/result.php',
-    'phpillowStatusResponse'                 => 'classes/response/status.php',
-    'phpillowTool'                           => 'classes/tool.php',
-    'phpillowToolMultipartParser'            => 'classes/tool/multipart_parser.php',
-    'phpillowToolMultipartWriter'            => 'classes/tool/multipart_writer.php',
-    'phpillowToolStringStream'               => 'classes/tool/string_stream.php',
-    'phpillowValidator'                      => 'classes/validator.php',
-    'phpillowArrayValidator'                 => 'classes/validator/array.php',
-    'phpillowBooleanValidator'               => 'classes/validator/boolean.php',
-    'phpillowDateValidator'                  => 'classes/validator/date.php',
-    'phpillowDocumentValidator'              => 'classes/validator/document.php',
-    'phpillowDocumentArrayValidator'         => 'classes/validator/document_array.php',
-    'phpillowEmailValidator'                 => 'classes/validator/email.php',
-    'phpillowFloatValidator'                 => 'classes/validator/float.php',
-    'phpillowImageFileLocationValidator'     => 'classes/validator/image_file_location.php',
-    'phpillowIndexableDateValidator'         => 'classes/validator/indexable_date.php',
-    'phpillowIntegerValidator'               => 'classes/validator/integer.php',
-    'phpillowNoValidator'                    => 'classes/validator/no.php',
-    'phpillowNullValidator'                  => 'classes/validator/null.php',
-    'phpillowObjectValidator'                => 'classes/validator/object.php',
-    'phpillowObjectArrayValidator'           => 'classes/validator/object_array.php',
-    'phpillowOrValidator'                    => 'classes/validator/or.php',
-    'phpillowRegexpValidator'                => 'classes/validator/regexp.php',
-    'phpillowStringValidator'                => 'classes/validator/string.php',
-    'phpillowTextValidator'                  => 'classes/validator/text.php',
-    'phpillowUuidValidator'                  => 'classes/validator/uuid.php',
-    'phpillowGroupView'                      => 'classes/view/group.php',
-    'phpillowUserView'                       => 'classes/view/user.php',
-);
-
diff --git a/src/classes/classes.png b/src/classes/classes.png
deleted file mode 100644
index 9ffd007..0000000
Binary files a/src/classes/classes.png and /dev/null differ
diff --git a/tests/test_environment.php b/tests/test_environment.php
index cf7325e..902aacb 100644
--- a/tests/test_environment.php
+++ b/tests/test_environment.php
@@ -10,7 +10,7 @@
  */
 date_default_timezone_set( 'UTC' );
 
-require __DIR__ . '/../src/bootstrap.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 require dirname( __FILE__ ) . '/helper/general.php';