diff --git a/.gitignore b/.gitignore
index 377157168..42bed50d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@ test.php
 *.orig
 
 /.idea/
-/app/Libraries/*
+/vendor/*
 /app/resources/tmp/*
 /nntmux/config/settings.php
 /nntmux/config/ircscraper_settings.php
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index e5d555256..847fda14c 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -94,6 +94,6 @@ coding_style:
                 true_false_null: undefined
 
 filter:
-    excluded_paths: [app/Libraries/*, libraries/*, libs/*, resources/*]
+    excluded_paths: [vendor/*, libraries/*, libs/*, resources/*]
 tools:
     sensiolabs_security_checker: true
diff --git a/Changelog b/Changelog
index 3d0427cff..ffbcd081d 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2017-08-02 DariusIII
+	* Chg: Use default composer install folder (vendor) to align with laravel defaults
 	* Chg: Add @throws PHPDOC to some of the functions in Binaries class
 	* Chg: Remove deprecated functions from NNTP class
 	* Chg: Remove commented code from Binaries class
diff --git a/_install/install.sh b/_install/install.sh
index 810797dbe..9af1d6349 100644
--- a/_install/install.sh
+++ b/_install/install.sh
@@ -26,7 +26,7 @@ echo ""
 echo "Setting cache directory permissions for you..."
 sudo chown -R www-data:www-data /var/lib/php/sessions/
 chmod 755 ./
-chmod -R 755 app/Libraries
+chmod -R 755 vendor
 chmod -R 777 app/resources
 chmod -R 755 libraries
 chmod -R 755 resources
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index f28c75966..1ff814c38 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -19,4 +19,4 @@ if (!defined('NN_ROOT')) {
 	define('NN_ROOT', dirname(NN_APP_PATH, 2));
 }
 
-require_once NN_APP_PATH . DS . 'Libraries' . DS . 'autoload.php';
+require_once NN_ROOT . DS . 'vendor' . DS . 'autoload.php';
diff --git a/composer.json b/composer.json
index 9e53c104d..4ff838287 100755
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
   ],
   "autoload": {
     "files": [
-      "app/Libraries/laravel/framework/src/Illuminate/Support/helpers.php",
+      "vendor/laravel/framework/src/Illuminate/Support/helpers.php",
       "app/Extensions/helper/helpers.php"
     ],
     "psr-4": {
@@ -33,8 +33,7 @@
         "npm-asset-library": "public/themes/shared/assets",
         "bower-asset-library": "public/themes/shared/assets"
       }
-    },
-    "vendor-dir": "app/Libraries"
+    }
   },
   "description": "A Usenet Indexer",
   "extra": {
diff --git a/config/nntmux.php b/config/nntmux.php
index e650c261b..b4e521c6b 100644
--- a/config/nntmux.php
+++ b/config/nntmux.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'Libraries' . DIRECTORY_SEPARATOR . 'autoload.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
 use Illuminate\Database\Capsule\Manager as Capsule;
 use Dotenv\Dotenv;
diff --git a/nntmux/bootstrap.php b/nntmux/bootstrap.php
index f5a4f68c5..f87b14ce5 100755
--- a/nntmux/bootstrap.php
+++ b/nntmux/bootstrap.php
@@ -18,7 +18,7 @@
  * @author    niel
  * @copyright 2016 nZEDb
  */
-require_once NN_ROOT . 'app/Libraries/autoload.php';
+require_once NN_ROOT . 'vendor/autoload.php';
 
 use nntmux\config\Configure;
 use nntmux\utility\Utility;