diff --git a/composer.json b/composer.json
index d456fc2a..217e0451 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Stevebauman\\Inventory\\": "src/Stevebauman/Inventory/"
+            "Stevebauman\\Inventory\\": "src/"
         }
     },
     "autoload-dev":
diff --git a/src/Stevebauman/Inventory/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
similarity index 100%
rename from src/Stevebauman/Inventory/Commands/InstallCommand.php
rename to src/Commands/InstallCommand.php
diff --git a/src/Stevebauman/Inventory/Commands/RunMigrationsCommand.php b/src/Commands/RunMigrationsCommand.php
similarity index 100%
rename from src/Stevebauman/Inventory/Commands/RunMigrationsCommand.php
rename to src/Commands/RunMigrationsCommand.php
diff --git a/src/Stevebauman/Inventory/Commands/SchemaCheckCommand.php b/src/Commands/SchemaCheckCommand.php
similarity index 100%
rename from src/Stevebauman/Inventory/Commands/SchemaCheckCommand.php
rename to src/Commands/SchemaCheckCommand.php
diff --git a/src/Stevebauman/Inventory/Exceptions/Commands/DatabaseTableReservedException.php b/src/Exceptions/Commands/DatabaseTableReservedException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/Commands/DatabaseTableReservedException.php
rename to src/Exceptions/Commands/DatabaseTableReservedException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/Commands/DependencyNotFoundException.php b/src/Exceptions/Commands/DependencyNotFoundException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/Commands/DependencyNotFoundException.php
rename to src/Exceptions/Commands/DependencyNotFoundException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/InvalidItemException.php b/src/Exceptions/InvalidItemException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/InvalidItemException.php
rename to src/Exceptions/InvalidItemException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/InvalidLocationException.php b/src/Exceptions/InvalidLocationException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/InvalidLocationException.php
rename to src/Exceptions/InvalidLocationException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/InvalidMovementException.php b/src/Exceptions/InvalidMovementException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/InvalidMovementException.php
rename to src/Exceptions/InvalidMovementException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/InvalidPartException.php b/src/Exceptions/InvalidPartException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/InvalidPartException.php
rename to src/Exceptions/InvalidPartException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/InvalidQuantityException.php b/src/Exceptions/InvalidQuantityException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/InvalidQuantityException.php
rename to src/Exceptions/InvalidQuantityException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/InvalidSupplierException.php b/src/Exceptions/InvalidSupplierException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/InvalidSupplierException.php
rename to src/Exceptions/InvalidSupplierException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/InvalidTransactionStateException.php b/src/Exceptions/InvalidTransactionStateException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/InvalidTransactionStateException.php
rename to src/Exceptions/InvalidTransactionStateException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/NoUserLoggedInException.php b/src/Exceptions/NoUserLoggedInException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/NoUserLoggedInException.php
rename to src/Exceptions/NoUserLoggedInException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/NotEnoughStockException.php b/src/Exceptions/NotEnoughStockException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/NotEnoughStockException.php
rename to src/Exceptions/NotEnoughStockException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/SkuAlreadyExistsException.php b/src/Exceptions/SkuAlreadyExistsException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/SkuAlreadyExistsException.php
rename to src/Exceptions/SkuAlreadyExistsException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/StockAlreadyExistsException.php b/src/Exceptions/StockAlreadyExistsException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/StockAlreadyExistsException.php
rename to src/Exceptions/StockAlreadyExistsException.php
diff --git a/src/Stevebauman/Inventory/Exceptions/StockNotFoundException.php b/src/Exceptions/StockNotFoundException.php
similarity index 100%
rename from src/Stevebauman/Inventory/Exceptions/StockNotFoundException.php
rename to src/Exceptions/StockNotFoundException.php
diff --git a/src/Stevebauman/Inventory/Interfaces/StateableInterface.php b/src/Interfaces/StateableInterface.php
similarity index 100%
rename from src/Stevebauman/Inventory/Interfaces/StateableInterface.php
rename to src/Interfaces/StateableInterface.php
diff --git a/src/Stevebauman/Inventory/InventoryServiceProvider.php b/src/InventoryServiceProvider.php
similarity index 88%
rename from src/Stevebauman/Inventory/InventoryServiceProvider.php
rename to src/InventoryServiceProvider.php
index 4e176696..bcd31027 100644
--- a/src/Stevebauman/Inventory/InventoryServiceProvider.php
+++ b/src/InventoryServiceProvider.php
@@ -14,7 +14,7 @@ class InventoryServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    const VERSION = '1.7.3';
+    const VERSION = '1.7.4';
 
     /**
      * Stores the package configuration separator
@@ -48,7 +48,7 @@ public function boot()
          * If the package method exists, we're using Laravel 4, if not, we're on 5
          */
         if (method_exists($this, 'package')) {
-            $this->package('stevebauman/inventory');
+            $this->package('stevebauman/inventory', 'stevebauman/inventory', __DIR__.'/..');
         } else {
             /*
              * Set the proper configuration separator since
@@ -65,20 +65,20 @@ public function boot()
             /*
              * Load the inventory translations from the inventory lang folder
              */
-            $this->loadTranslationsFrom(__DIR__.'../../../lang', 'inventory');
+            $this->loadTranslationsFrom(__DIR__.'/lang', 'inventory');
 
             /*
              * Assign the configuration as publishable, and tag it as 'config'
              */
             $this->publishes([
-                __DIR__.'../../../config/config.php' => config_path('inventory.php'),
+                __DIR__.'/config/config.php' => config_path('inventory.php'),
             ], 'config');
 
             /*
              * Assign the migrations as publishable, and tag it as 'migrations'
              */
             $this->publishes([
-                __DIR__.'../../../migrations/' => base_path('database/migrations'),
+                __DIR__.'/migrations/' => base_path('database/migrations'),
             ], 'migrations');
         }
     }
@@ -121,7 +121,7 @@ public function register()
         /*
          * Include the helpers file
          */
-        include __DIR__.'../../../helpers.php';
+        include __DIR__.'/helpers.php';
     }
 
     /**
diff --git a/src/Stevebauman/Inventory/Models/BaseModel.php b/src/Models/BaseModel.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/BaseModel.php
rename to src/Models/BaseModel.php
diff --git a/src/Stevebauman/Inventory/Models/Category.php b/src/Models/Category.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/Category.php
rename to src/Models/Category.php
diff --git a/src/Stevebauman/Inventory/Models/Inventory.php b/src/Models/Inventory.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/Inventory.php
rename to src/Models/Inventory.php
diff --git a/src/Stevebauman/Inventory/Models/InventorySku.php b/src/Models/InventorySku.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/InventorySku.php
rename to src/Models/InventorySku.php
diff --git a/src/Stevebauman/Inventory/Models/InventoryStock.php b/src/Models/InventoryStock.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/InventoryStock.php
rename to src/Models/InventoryStock.php
diff --git a/src/Stevebauman/Inventory/Models/InventoryStockMovement.php b/src/Models/InventoryStockMovement.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/InventoryStockMovement.php
rename to src/Models/InventoryStockMovement.php
diff --git a/src/Stevebauman/Inventory/Models/InventoryTransaction.php b/src/Models/InventoryTransaction.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/InventoryTransaction.php
rename to src/Models/InventoryTransaction.php
diff --git a/src/Stevebauman/Inventory/Models/InventoryTransactionHistory.php b/src/Models/InventoryTransactionHistory.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/InventoryTransactionHistory.php
rename to src/Models/InventoryTransactionHistory.php
diff --git a/src/Stevebauman/Inventory/Models/Location.php b/src/Models/Location.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/Location.php
rename to src/Models/Location.php
diff --git a/src/Stevebauman/Inventory/Models/Metric.php b/src/Models/Metric.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/Metric.php
rename to src/Models/Metric.php
diff --git a/src/Stevebauman/Inventory/Models/Supplier.php b/src/Models/Supplier.php
similarity index 100%
rename from src/Stevebauman/Inventory/Models/Supplier.php
rename to src/Models/Supplier.php
diff --git a/src/Stevebauman/Inventory/Traits/AssemblyTrait.php b/src/Traits/AssemblyTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/AssemblyTrait.php
rename to src/Traits/AssemblyTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/CategoryTrait.php b/src/Traits/CategoryTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/CategoryTrait.php
rename to src/Traits/CategoryTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/DatabaseTransactionTrait.php b/src/Traits/DatabaseTransactionTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/DatabaseTransactionTrait.php
rename to src/Traits/DatabaseTransactionTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/InventorySkuTrait.php b/src/Traits/InventorySkuTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/InventorySkuTrait.php
rename to src/Traits/InventorySkuTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/InventoryStockMovementTrait.php b/src/Traits/InventoryStockMovementTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/InventoryStockMovementTrait.php
rename to src/Traits/InventoryStockMovementTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/InventoryStockTrait.php b/src/Traits/InventoryStockTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/InventoryStockTrait.php
rename to src/Traits/InventoryStockTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/InventoryTrait.php b/src/Traits/InventoryTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/InventoryTrait.php
rename to src/Traits/InventoryTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/InventoryTransactionHistoryTrait.php b/src/Traits/InventoryTransactionHistoryTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/InventoryTransactionHistoryTrait.php
rename to src/Traits/InventoryTransactionHistoryTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/InventoryTransactionTrait.php b/src/Traits/InventoryTransactionTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/InventoryTransactionTrait.php
rename to src/Traits/InventoryTransactionTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/InventoryVariantTrait.php b/src/Traits/InventoryVariantTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/InventoryVariantTrait.php
rename to src/Traits/InventoryVariantTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/LocationTrait.php b/src/Traits/LocationTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/LocationTrait.php
rename to src/Traits/LocationTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/SupplierTrait.php b/src/Traits/SupplierTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/SupplierTrait.php
rename to src/Traits/SupplierTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/UserIdentificationTrait.php b/src/Traits/UserIdentificationTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/UserIdentificationTrait.php
rename to src/Traits/UserIdentificationTrait.php
diff --git a/src/Stevebauman/Inventory/Traits/VerifyTrait.php b/src/Traits/VerifyTrait.php
similarity index 100%
rename from src/Stevebauman/Inventory/Traits/VerifyTrait.php
rename to src/Traits/VerifyTrait.php