diff --git a/autoload.php b/autoload.php
deleted file mode 100644
index 8e66813..0000000
--- a/autoload.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-$vendors = __DIR__.'/vendor/autoload.php';
-if (file_exists($vendors)) {
-    return require $vendors;
-}
-
-/*
-* Registers an autoload for all the classes in Gregwar\Image
-*/
-spl_autoload_register(function ($className) {
-    $namespace = 'Gregwar\\Image';
-
-    if (strpos($className, $namespace) === 0) {
-        $className = str_replace($namespace, '', $className);
-        $fileName = __DIR__.'/'.str_replace('\\', '/', $className).'.php';
-        if (file_exists($fileName)) {
-            require $fileName;
-        }
-    }
-});
diff --git a/composer.json b/composer.json
index 62b7cdc..bb41bb4 100755
--- a/composer.json
+++ b/composer.json
@@ -26,10 +26,9 @@
     "suggest": {
         "behat/transliterator": "Transliterator provides ability to set non-latin1 pretty names"
     },
-    "target-dir": "Gregwar/Image",
     "autoload": {
-        "psr-0": {
-            "Gregwar\\Image": ""
+        "psr-4": {
+            "Gregwar\\Image\\": ""
         }
     },
     "scripts": {
diff --git a/demo/basic.php b/demo/basic.php
index e44e707..fb9a56d 100644
--- a/demo/basic.php
+++ b/demo/basic.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/cache.php b/demo/cache.php
index 9046494..ba70b90 100644
--- a/demo/cache.php
+++ b/demo/cache.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/cacheCreate.php b/demo/cacheCreate.php
index 49694d6..f42326f 100644
--- a/demo/cacheCreate.php
+++ b/demo/cacheCreate.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/cacheName.php b/demo/cacheName.php
index e82638a..2f1140e 100644
--- a/demo/cacheName.php
+++ b/demo/cacheName.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/crop.php b/demo/crop.php
index 84899d0..9a838b4 100644
--- a/demo/crop.php
+++ b/demo/crop.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/data.php b/demo/data.php
index 6f12ce5..0c08506 100644
--- a/demo/data.php
+++ b/demo/data.php
@@ -1,14 +1,14 @@
 <?php
 
+require_once __DIR__.'/../vendor/autoload.php';
+
+use Gregwar\Image\Image;
+
 $data = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABl'
     .'BMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDr'
     .'EX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r'
     .'8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';
 $data = base64_decode($data);
 
-require_once '../Image.php';
-
-use Gregwar\Image\Image;
-
 Image::fromData($data)
     ->save('out.jpg');
diff --git a/demo/fallback.php b/demo/fallback.php
index a16f512..19df647 100644
--- a/demo/fallback.php
+++ b/demo/fallback.php
@@ -1,11 +1,10 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
 echo Image::open('img/something-wrong.png')
     ->resize(100, 0)
     ->negate()
-    ->jpeg()
-    ;
+    ->jpeg();
diff --git a/demo/gc.php b/demo/gc.php
index 01a6bf1..036d809 100644
--- a/demo/gc.php
+++ b/demo/gc.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\GarbageCollect;
 
diff --git a/demo/get.php b/demo/get.php
index 2e2ffe2..367f53d 100644
--- a/demo/get.php
+++ b/demo/get.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/guess.php b/demo/guess.php
index 9e2931f..d8bf66f 100644
--- a/demo/guess.php
+++ b/demo/guess.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/inline.php b/demo/inline.php
index 8edad37..42e799b 100644
--- a/demo/inline.php
+++ b/demo/inline.php
@@ -1,5 +1,6 @@
 <?php
-require_once '../autoload.php';
+
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/merge.php b/demo/merge.php
index 7458cbf..5d98013 100644
--- a/demo/merge.php
+++ b/demo/merge.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/percent.php b/demo/percent.php
index 1986482..f206d50 100644
--- a/demo/percent.php
+++ b/demo/percent.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/demo/resource.php b/demo/resource.php
index 4204b40..4acbf6d 100644
--- a/demo/resource.php
+++ b/demo/resource.php
@@ -1,14 +1,15 @@
 <?php
 
+require_once __DIR__.'/../vendor/autoload.php';
+
+use Gregwar\Image\Image;
+
 $data = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABl'
     .'BMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDr'
     .'EX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r'
     .'8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg==';
 $data = base64_decode($data);
 
-require_once '../autoload.php';
-
-use Gregwar\Image\Image;
 
 $gd = imagecreatefromstring($data);
 
diff --git a/demo/watermark.php b/demo/watermark.php
index 3e7f241..9a7fa5f 100644
--- a/demo/watermark.php
+++ b/demo/watermark.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
@@ -10,7 +10,7 @@
 // Opening vinci.png
 $watermark = Image::open('img/vinci.png');
 
-// Mergine vinci text into mona in the top-right corner
+// Merging vinci text into mona in the top-right corner
 $img->merge($watermark, $img->width()-$watermark->width(),
     $img->height()-$watermark->height())
     ->save('out.jpg', 'jpg');
diff --git a/demo/write.php b/demo/write.php
index 8aab688..a21fae9 100644
--- a/demo/write.php
+++ b/demo/write.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/doc/generate.php b/doc/generate.php
index 8740f8a..e187e24 100644
--- a/doc/generate.php
+++ b/doc/generate.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once '../autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 use Gregwar\Image\Image;
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index a58ca82..a8e5ead 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -5,5 +5,3 @@
     class_exists('\PHPUnit_Framework_TestCase')) {
     class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
 }
-
-require_once(__DIR__.'/../autoload.php');