diff --git a/composer.json b/composer.json
index 87d24fa..8ee524a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,18 +1,14 @@
 {
   "name": "bosnadev/repositories",
   "description": "Laravel Repositories",
-  "keywords": [
-    "laravel",
-    "repository",
-    "repositories",
-    "eloquent",
-    "database"
-  ],
+  "license": "MIT",
+  "homepage": "https://bosnadev.com",
+  "keywords": ["laravel", "repository", "repositories", "eloquent", "database"],
   "licence": "MIT",
   "authors": [
     {
       "name": "Mirza Pasic",
-      "email": "mirza.pasic@edu.fit.ba"
+      "email": "mirza@bosnadev.com"
     },
     {
       "name": "Maarten Paauw",
@@ -21,15 +17,17 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "illuminate/support": "5.*",
-    "illuminate/database": "5.*"
+    "illuminate/support": "^5.2",
+    "illuminate/database": "^5.2",
+    "illuminate/filesystem": "^5.2",
+    "illuminate/console": "^5.2"
   },
   "require-dev": {
     "mockery/mockery": "dev-master@dev"
   },
   "autoload": {
     "psr-4": {
-      "Bosnadev\\Repositories\\": "src/"
+      "Bosnadev\\": "src/Bosnadev/"
     }
   },
   "autoload-dev": {
diff --git a/src/config/repositories.php b/config/repositories.php
similarity index 100%
rename from src/config/repositories.php
rename to config/repositories.php
diff --git a/src/resources/stubs/criteria.stub b/resources/stubs/criteria.stub
similarity index 100%
rename from src/resources/stubs/criteria.stub
rename to resources/stubs/criteria.stub
diff --git a/src/resources/stubs/repository.stub b/resources/stubs/repository.stub
similarity index 100%
rename from src/resources/stubs/repository.stub
rename to resources/stubs/repository.stub
diff --git a/src/Console/Commands/Creators/CriteriaCreator.php b/src/Bosnadev/Repositories/Console/Commands/Creators/CriteriaCreator.php
similarity index 97%
rename from src/Console/Commands/Creators/CriteriaCreator.php
rename to src/Bosnadev/Repositories/Console/Commands/Creators/CriteriaCreator.php
index 6742243..50cb390 100644
--- a/src/Console/Commands/Creators/CriteriaCreator.php
+++ b/src/Bosnadev/Repositories/Console/Commands/Creators/CriteriaCreator.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: maartenpaauw
- * Date: 05-07-15
- * Time: 16:24
- */
 
 namespace Bosnadev\Repositories\Console\Commands\Creators;
 
-use Doctrine\Common\Inflector\Inflector;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Config;
+use Doctrine\Common\Inflector\Inflector;
 
 /**
  * Class CriteriaCreator
@@ -212,7 +206,7 @@ protected function getStub()
     protected function getStubPath()
     {
         // Path
-        $path = __DIR__ . '/../../../resources/stubs/';
+        $path = __DIR__ . '/../../../../../../resources/stubs/';
 
         // Return the path.
         return $path;
@@ -273,4 +267,4 @@ protected function pluralizeModel()
         return $model_name;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/Console/Commands/Creators/RepositoryCreator.php b/src/Bosnadev/Repositories/Console/Commands/Creators/RepositoryCreator.php
similarity index 97%
rename from src/Console/Commands/Creators/RepositoryCreator.php
rename to src/Bosnadev/Repositories/Console/Commands/Creators/RepositoryCreator.php
index a9619ee..f9eac9d 100644
--- a/src/Console/Commands/Creators/RepositoryCreator.php
+++ b/src/Bosnadev/Repositories/Console/Commands/Creators/RepositoryCreator.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: maartenpaauw
- * Date: 05-07-15
- * Time: 14:16
- */
 
 namespace Bosnadev\Repositories\Console\Commands\Creators;
 
-use Doctrine\Common\Inflector\Inflector;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Facades\Config;
+use Doctrine\Common\Inflector\Inflector;
 
 /**
  * Class RepositoryCreator
@@ -79,6 +73,7 @@ public function setModel($model)
      *
      * @param $repository
      * @param $model
+     * @return int
      */
     public function create($repository, $model)
     {
@@ -257,7 +252,7 @@ protected function getStub()
     protected function getStubPath()
     {
         // Stub path.
-        $stub_path = __DIR__ . '/../../../resources/stubs/';
+        $stub_path = __DIR__ . '/../../../../../../resources/stubs/';
 
         // Return the stub path.
         return $stub_path;
diff --git a/src/Console/Commands/MakeCriteriaCommand.php b/src/Bosnadev/Repositories/Console/Commands/MakeCriteriaCommand.php
similarity index 100%
rename from src/Console/Commands/MakeCriteriaCommand.php
rename to src/Bosnadev/Repositories/Console/Commands/MakeCriteriaCommand.php
index 7a471a0..7cb871f 100644
--- a/src/Console/Commands/MakeCriteriaCommand.php
+++ b/src/Bosnadev/Repositories/Console/Commands/MakeCriteriaCommand.php
@@ -2,10 +2,10 @@
 
 namespace Bosnadev\Repositories\Console\Commands;
 
-use Bosnadev\Repositories\Console\Commands\Creators\CriteriaCreator;
 use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use Bosnadev\Repositories\Console\Commands\Creators\CriteriaCreator;
 
 /**
  * Class MakeCriteriaCommand
diff --git a/src/Console/Commands/MakeRepositoryCommand.php b/src/Bosnadev/Repositories/Console/Commands/MakeRepositoryCommand.php
similarity index 100%
rename from src/Console/Commands/MakeRepositoryCommand.php
rename to src/Bosnadev/Repositories/Console/Commands/MakeRepositoryCommand.php
index da38d47..6a2027e 100644
--- a/src/Console/Commands/MakeRepositoryCommand.php
+++ b/src/Bosnadev/Repositories/Console/Commands/MakeRepositoryCommand.php
@@ -2,10 +2,10 @@
 
 namespace Bosnadev\Repositories\Console\Commands;
 
-use Bosnadev\Repositories\Console\Commands\Creators\RepositoryCreator;
 use Illuminate\Console\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use Bosnadev\Repositories\Console\Commands\Creators\RepositoryCreator;
 
 /**
  * Class MakeRepositoryCommand
diff --git a/src/Contracts/CriteriaInterface.php b/src/Bosnadev/Repositories/Contracts/CriteriaInterface.php
similarity index 92%
rename from src/Contracts/CriteriaInterface.php
rename to src/Bosnadev/Repositories/Contracts/CriteriaInterface.php
index 48df134..64fc875 100644
--- a/src/Contracts/CriteriaInterface.php
+++ b/src/Bosnadev/Repositories/Contracts/CriteriaInterface.php
@@ -1,4 +1,6 @@
-<?php namespace Bosnadev\Repositories\Contracts;
+<?php
+
+namespace Bosnadev\Repositories\Contracts;
 
 use Bosnadev\Repositories\Criteria\Criteria;
 
@@ -35,4 +37,4 @@ public function pushCriteria(Criteria $criteria);
      * @return $this
      */
     public function  applyCriteria();
-}
\ No newline at end of file
+}
diff --git a/src/Contracts/RepositoryInterface.php b/src/Bosnadev/Repositories/Contracts/RepositoryInterface.php
similarity index 100%
rename from src/Contracts/RepositoryInterface.php
rename to src/Bosnadev/Repositories/Contracts/RepositoryInterface.php
diff --git a/src/Criteria/Criteria.php b/src/Bosnadev/Repositories/Criteria/Criteria.php
similarity index 100%
rename from src/Criteria/Criteria.php
rename to src/Bosnadev/Repositories/Criteria/Criteria.php
diff --git a/src/Eloquent/Repository.php b/src/Bosnadev/Repositories/Eloquent/Repository.php
similarity index 98%
rename from src/Eloquent/Repository.php
rename to src/Bosnadev/Repositories/Eloquent/Repository.php
index ef88202..303fe46 100644
--- a/src/Eloquent/Repository.php
+++ b/src/Bosnadev/Repositories/Eloquent/Repository.php
@@ -1,13 +1,14 @@
-<?php namespace Bosnadev\Repositories\Eloquent;
+<?php
 
-use Bosnadev\Repositories\Contracts\CriteriaInterface;
-use Bosnadev\Repositories\Criteria\Criteria;
-use Bosnadev\Repositories\Contracts\RepositoryInterface;
-use Bosnadev\Repositories\Exceptions\RepositoryException;
+namespace Bosnadev\Repositories\Eloquent;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Container\Container as App;
+use Bosnadev\Repositories\Contracts\RepositoryInterface;
+use Bosnadev\Repositories\Exceptions\RepositoryException;
+use Bosnadev\Repositories\Contracts\CriteriaInterface;
+use Bosnadev\Repositories\Criteria\Criteria;
 
 /**
  * Class Repository
@@ -315,7 +316,7 @@ public function pushCriteria(Criteria $criteria)
         if ($this->preventCriteriaOverwriting) {
             // Find existing criteria
             $key = $this->criteria->search(function ($item) use ($criteria) {
-                return (is_object($item) AND (get_class($item) == get_class($criteria)));
+                return (is_object($item) && (get_class($item) == get_class($criteria)));
             });
 
             // Remove old criteria
diff --git a/src/Exceptions/RepositoryException.php b/src/Bosnadev/Repositories/Exceptions/RepositoryException.php
similarity index 71%
rename from src/Exceptions/RepositoryException.php
rename to src/Bosnadev/Repositories/Exceptions/RepositoryException.php
index efb014f..41b4ced 100644
--- a/src/Exceptions/RepositoryException.php
+++ b/src/Bosnadev/Repositories/Exceptions/RepositoryException.php
@@ -1,4 +1,6 @@
-<?php namespace Bosnadev\Repositories\Exceptions;
+<?php
+
+namespace Bosnadev\Repositories\Exceptions;
 
 /**
  * Class RepositoryException
diff --git a/src/Providers/RepositoryProvider.php b/src/Bosnadev/Repositories/Providers/RepositoryProvider.php
similarity index 94%
rename from src/Providers/RepositoryProvider.php
rename to src/Bosnadev/Repositories/Providers/RepositoryProvider.php
index c23ec32..59f6cce 100644
--- a/src/Providers/RepositoryProvider.php
+++ b/src/Bosnadev/Repositories/Providers/RepositoryProvider.php
@@ -2,14 +2,13 @@
 
 namespace Bosnadev\Repositories\Providers;
 
-use Bosnadev\Repositories\Console\Commands\Creators\CriteriaCreator;
-use Bosnadev\Repositories\Console\Commands\Creators\RepositoryCreator;
-use Bosnadev\Repositories\Console\Commands\MakeCriteriaCommand;
-use Bosnadev\Repositories\Console\Commands\MakeRepositoryCommand;
-use Illuminate\Filesystem\Filesystem;
-use Illuminate\Filesystem\FilesystemServiceProvider;
 use Illuminate\Support\Composer;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\ServiceProvider;
+use Bosnadev\Repositories\Console\Commands\MakeCriteriaCommand;
+use Bosnadev\Repositories\Console\Commands\MakeRepositoryCommand;
+use Bosnadev\Repositories\Console\Commands\Creators\CriteriaCreator;
+use Bosnadev\Repositories\Console\Commands\Creators\RepositoryCreator;
 
 /**
  * Class RepositoryProvider
@@ -34,7 +33,7 @@ class RepositoryProvider extends ServiceProvider
     public function boot()
     {
         // Config path.
-        $config_path = __DIR__ . '/../config/repositories.php';
+        $config_path = __DIR__ . '/../../../config/repositories.php';
 
         // Publish config.
         $this->publishes(
@@ -63,7 +62,7 @@ public function register()
         $this->commands(['command.repository.make', 'command.criteria.make']);
 
         // Config path.
-        $config_path = __DIR__ . '/../config/repositories.php';
+        $config_path = __DIR__ . '/../../../config/repositories.php';
 
         // Merge config.
         $this->mergeConfigFrom(
diff --git a/tests/RepositoryTest.php b/tests/RepositoryTest.php
index 376c1f3..7718f6b 100644
--- a/tests/RepositoryTest.php
+++ b/tests/RepositoryTest.php
@@ -1,8 +1,7 @@
-<?php namespace Bosnadev\Tests\Repositories;
+<?php
+
+namespace Bosnadev\Tests\Repositories;
 
-use Bosnadev\Repositories\Contracts\CriteriaInterface as Criteria;
-use Bosnadev\Repositories\Contracts\RepositoryInterface as Repository;
-use Illuminate\Database\Eloquent\Model;
 use \Mockery as m;
 use \PHPUnit_Framework_TestCase as TestCase;