diff --git a/README.md b/README.md
index 76526e2..3f8f636 100644
--- a/README.md
+++ b/README.md
@@ -235,7 +235,6 @@ $zip = new \Nelexa\Zip\ZipFile();
 $zip->open("output.zip");
 $zip->addFromString("new-file", file_get_contents(__FILE__));
 $zip->saveAs("output2.zip");
-$zip->save();
 $zip->close();
 
 // $ zipinfo output2.zip 
diff --git a/composer.json b/composer.json
index 8ec18cf..76c5533 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
   "description": "Zip create, modify and extract tool. Alternative ZipArchive.",
   "type": "library",
   "require-dev": {
-    "phpunit/phpunit": "^5.5"
+    "phpunit/phpunit": "4.8"
   },
   "license": "MIT",
   "authors": [
@@ -19,7 +19,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Nelexa\\Zip\\": "src"
+      "Nelexa\\Zip\\": "src/Nelexa/Zip"
     }
   }
 }
diff --git a/src/FilterFileIterator.php b/src/Nelexa/Zip/FilterFileIterator.php
similarity index 100%
rename from src/FilterFileIterator.php
rename to src/Nelexa/Zip/FilterFileIterator.php
diff --git a/src/ZipEntry.php b/src/Nelexa/Zip/ZipEntry.php
similarity index 100%
rename from src/ZipEntry.php
rename to src/Nelexa/Zip/ZipEntry.php
diff --git a/src/ZipException.php b/src/Nelexa/Zip/ZipException.php
similarity index 100%
rename from src/ZipException.php
rename to src/Nelexa/Zip/ZipException.php
diff --git a/src/ZipFile.php b/src/Nelexa/Zip/ZipFile.php
similarity index 100%
rename from src/ZipFile.php
rename to src/Nelexa/Zip/ZipFile.php
diff --git a/src/ZipUtils.php b/src/Nelexa/Zip/ZipUtils.php
similarity index 100%
rename from src/ZipUtils.php
rename to src/Nelexa/Zip/ZipUtils.php
diff --git a/tests/TestZipFile.php b/tests/TestZipFile.php
index f6ae4a4..fafec21 100644
--- a/tests/TestZipFile.php
+++ b/tests/TestZipFile.php
@@ -1,6 +1,6 @@
 <?php
 
-class TestZipFile extends \PHPUnit\Framework\TestCase
+class TestZipFile extends PHPUnit_Framework_TestCase
 {
 
     public function testCreate()