diff --git a/Changelog b/Changelog
index e68e34b73..908880f57 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-03-08 DariusIII
+	* Upd: Many changes related to composer
 	* Upd: Update smarty handling in composer.json
 	* Fix: Remove require for GiantBomb as it should be handled by composer
 	* Fix: Fix errors related to changes to libraries.
diff --git a/autoloader.php b/autoloader.php
index 9250473b5..c3f8dfd96 100755
--- a/autoloader.php
+++ b/autoloader.php
@@ -18,14 +18,14 @@
  * @author    niel
  * @copyright 2014 nZEDb
  */
-
+/*
 spl_autoload_register(
 	function ($class) {
 		// Only continue if the class is in our namespace.
-		if (strpos($class, 'newznab\\') === 0) {
+		if (strpos($class, 'nzedb\\') === 0) {
 			// Replace namespace separators with directory separators in the class name, append
 			// with .php
-			$file = NN_ROOT . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
+			$file = nZEDb_ROOT . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
 
 			// if the file exists, require it
 			if (file_exists($file)) {
@@ -34,5 +34,6 @@ spl_autoload_register(
 		}
 	}
 );
-
+*/
+require_once 'vendor/autoload.php'
 ?>
diff --git a/cli/update_db.php b/cli/update_db.php
index 8dc043ab4..47d2c3db5 100644
--- a/cli/update_db.php
+++ b/cli/update_db.php
@@ -19,7 +19,6 @@
  * @copyright 2014 nZEDb
  */
 require_once realpath(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'indexer.php');
-require_once NN_LIBS . DIRECTORY_SEPARATOR . 'smarty' . DIRECTORY_SEPARATOR . 'Smarty.class.php';
 
 use newznab\db\DbUpdate;
 use newznab\utility\Utility;
diff --git a/composer.json b/composer.json
index bfda02eaf..a9abd2788 100755
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,5 @@
 {
   "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/JPinkney/TVMaze-PHP-API-Wrapper"
-    },
     {
       "type": "vcs",
       "url": "https://github.com/kbjr/Git.php"
@@ -11,9 +7,17 @@
   ],
 
   "autoload": {
-    "psr-0": {
-      "libs\\": "libs/"
-    }
+    "psr-4": {
+      "newznab\\": "newznab/"
+    },
+
+    "classmap": [
+      "www/pages/",
+      "libs/pixelead0/Tmdb/",
+      "libs/PEAR/Net_NNTP/NNTP/",
+      "libs/zeebinz/rarinfo/",
+      "libs/"
+    ]
   },
 
   "description": "A Usenet Indexer",
diff --git a/composer.lock b/composer.lock
index c3b0e7023..4165f133a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "0a3f84f9d5db96b9186c06d0c96ef1ce",
-    "content-hash": "2712a32ca345e3388bbf24a4cc19e504",
+    "hash": "1a3c5a32761ec995c50fae5b1593ca73",
+    "content-hash": "5010febeee39df8e4e330d1ff4315651",
     "packages": [
         {
             "name": "barracudanetworks/forkdaemon-php",
@@ -258,6 +258,7 @@
                     "JPinkney": ""
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "authors": [
                 {
                     "name": "Josh Pinkney",
@@ -265,10 +266,6 @@
                 }
             ],
             "description": "TVMaze-API-Wrapper",
-            "support": {
-                "source": "https://github.com/JPinkney/TVMaze-PHP-API-Wrapper/tree/master",
-                "issues": "https://github.com/JPinkney/TVMaze-PHP-API-Wrapper/issues"
-            },
             "time": "2016-03-08 02:23:27"
         },
         {
@@ -299,16 +296,16 @@
         },
         {
             "name": "moinax/tvdb",
-            "version": "v1.0.3",
+            "version": "v1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Moinax/TvDb.git",
-                "reference": "7ddf816552966fcc75c85bb7f92ce4c6c9190dc2"
+                "reference": "68204c72efe99945cd49fe99ac23c8f9b068f2d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Moinax/TvDb/zipball/7ddf816552966fcc75c85bb7f92ce4c6c9190dc2",
-                "reference": "7ddf816552966fcc75c85bb7f92ce4c6c9190dc2",
+                "url": "https://api.github.com/repos/Moinax/TvDb/zipball/68204c72efe99945cd49fe99ac23c8f9b068f2d6",
+                "reference": "68204c72efe99945cd49fe99ac23c8f9b068f2d6",
                 "shasum": ""
             },
             "require": {
@@ -335,7 +332,7 @@
             "keywords": [
                 "api"
             ],
-            "time": "2016-02-03 08:52:14"
+            "time": "2016-03-08 12:37:26"
         },
         {
             "name": "phpmailer/phpmailer",
diff --git a/indexer.php b/indexer.php
index 408b6309f..7e3c17b55 100644
--- a/indexer.php
+++ b/indexer.php
@@ -20,8 +20,8 @@
  */
 require_once 'constants.php';
 require_once 'autoloader.php';
-require_once 'libs/autoloader.php';
-require_once 'vendor/autoload.php';
+//require_once 'libs/autoloader.php';
+//require_once 'vendor/autoload.php';
 
 use newznab\config\Configure;
 use newznab\utility\Utility;
diff --git a/libs/autoloader.php b/libs/autoloader.php
deleted file mode 100644
index 43b58db04..000000000
--- a/libs/autoloader.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * PSR-0 compliant autoloader for libs
- *
- * @param string $class The fully-qualified class name.
- *
- * @return void
- */
-spl_autoload_register(
-	function ($class) {
-		// Only continue if the class is in our namespace.
-		if (strpos($class, 'libs\\') === 0) {
-			// Replace namespace separators with directory separators in the class name, append
-			// with .php
-			$file = NN_ROOT . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
-
-			// if the file exists, require it
-			if (file_exists($file)) {
-				require_once $file;
-			}
-		}
-	}
-);
-
-/**
- *
- * @param string $class The fully-qualified class name.
- *
- * @return void
- */
-spl_autoload_register(
-	function($class) {
-		// base directory for the namespace prefix
-		$base_dir = __DIR__ . DIRECTORY_SEPARATOR;
-
-		// replace the namespace prefix with the base directory, replace namespace
-		// separators with directory separators in the relative class name, append
-		// with .php
-		$file = $base_dir . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
-
-		// if the file exists, require it
-		if (file_exists($file) && is_readable($file)) {
-			require_once $file;
-		} else {
-			// Let's try the old style format with 'class.' prefixed to the lower-cased filename.
-			// This bypasses the concept of a Vendor namespace as older libs don't use it.
-
-			$filename    = 'class.' . strtolower($class) . '.php';
-			$DirIterator = new \DirectoryIterator($base_dir);
-			foreach ($DirIterator as $fileInfo) {
-				if ($fileInfo->isDir() && !$fileInfo->isDot()) {
-					$file = $fileInfo->getPathname() . DIRECTORY_SEPARATOR . $filename;
-					if (file_exists($file) && is_readable($file)) {
-						require_once $file;
-					}
-				}
-			}
-		}
-	}
-);
-
-?>
\ No newline at end of file
diff --git a/misc/testing/Tests/test_giantbomb_API.php b/misc/testing/Tests/test_giantbomb_API.php
index c76f25947..64852c9ce 100755
--- a/misc/testing/Tests/test_giantbomb_API.php
+++ b/misc/testing/Tests/test_giantbomb_API.php
@@ -1,6 +1,5 @@
 <?php
 require_once realpath(dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR . 'indexer.php');
-require_once NN_LIBS . 'GiantBombAPI.php';
 
 // Test if your giantbomb key is working.
 
diff --git a/newznab/ADE.php b/newznab/ADE.php
index 16be0b97a..6ec14a1f4 100644
--- a/newznab/ADE.php
+++ b/newznab/ADE.php
@@ -1,7 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
 use newznab\utility\Utility;
 
 
diff --git a/newznab/ADM.php b/newznab/ADM.php
index 9721c2a7f..60441707b 100644
--- a/newznab/ADM.php
+++ b/newznab/ADM.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 use newznab\utility\Utility;
 
 class ADM
diff --git a/newznab/AEBN.php b/newznab/AEBN.php
index 37dd77de3..85010edf4 100644
--- a/newznab/AEBN.php
+++ b/newznab/AEBN.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 use newznab\utility\Utility;
 
 class AEBN
diff --git a/newznab/Desura.php b/newznab/Desura.php
index 43a81ff72..52d06c38b 100644
--- a/newznab/Desura.php
+++ b/newznab/Desura.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 use newznab\utility\Utility;
 
 class Desura
diff --git a/newznab/Greenlight.php b/newznab/Greenlight.php
index f64d181f5..6e6d4f10d 100644
--- a/newznab/Greenlight.php
+++ b/newznab/Greenlight.php
@@ -1,6 +1,5 @@
 <?php
 namespace newznab;
-require_once NN_LIBS . 'simple_html_dom.php';
 
 use newznab\utility\Utility;
 
diff --git a/newznab/Hotmovies.php b/newznab/Hotmovies.php
index a5989872e..7867a3fa0 100644
--- a/newznab/Hotmovies.php
+++ b/newznab/Hotmovies.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 class Hotmovies
 {
 
diff --git a/newznab/IAFD.php b/newznab/IAFD.php
index 490ebb6a2..12c5edd6c 100644
--- a/newznab/IAFD.php
+++ b/newznab/IAFD.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 use newznab\utility\Utility;
 
 class IAFD
diff --git a/newznab/Installpage.php b/newznab/Installpage.php
index 50c076430..11bf8ab34 100644
--- a/newznab/Installpage.php
+++ b/newznab/Installpage.php
@@ -1,6 +1,5 @@
 <?php
 namespace newznab;
-require_once NN_LIBS . DS . 'smarty/Smarty.class.php';
 
 /**
  * This class represents each page during installation.
diff --git a/newznab/NNTP.php b/newznab/NNTP.php
index c2b6a74b8..ea6cb71c1 100644
--- a/newznab/NNTP.php
+++ b/newznab/NNTP.php
@@ -3,7 +3,6 @@ namespace newznab;
 /**
  * Attempt to include PEAR's nntp class if it has not already been included.
  */
-require_once NN_LIBS . 'PEAR/Net_NNTP/NNTP/Client.php';
 
 use newznab\db\Settings;
 use newznab\utility\Utility;
diff --git a/newznab/Nfo.php b/newznab/Nfo.php
index 0c9f3fc19..6edf3d15c 100644
--- a/newznab/Nfo.php
+++ b/newznab/Nfo.php
@@ -4,9 +4,6 @@ use newznab\db\Settings;
 use \newznab\processing\PostProcess;
 use newznab\utility\Utility;
 
-require_once NN_LIBS . 'zeebinz/rarinfo/par2info.php';
-require_once NN_LIBS . 'zeebinz/rarinfo/sfvinfo.php';
-
 /**
  * Class Nfo
  * Class for handling fetching/storing of NFO files.
diff --git a/newznab/Popporn.php b/newznab/Popporn.php
index cc72e8a95..783516875 100644
--- a/newznab/Popporn.php
+++ b/newznab/Popporn.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 use newznab\utility\Utility;
 
 class Popporn
diff --git a/newznab/PreDb.php b/newznab/PreDb.php
index 19f9841d2..57cdf970d 100644
--- a/newznab/PreDb.php
+++ b/newznab/PreDb.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 use newznab\db\Settings;
 
 /**
diff --git a/newznab/Releases.php b/newznab/Releases.php
index d5fefc126..f1593839c 100755
--- a/newznab/Releases.php
+++ b/newznab/Releases.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'ZipFile.php';
-
 use newznab\db\Settings;
 use newznab\utility\Utility;
 
diff --git a/newznab/Steam.php b/newznab/Steam.php
index 447147b88..ee2fc70ac 100644
--- a/newznab/Steam.php
+++ b/newznab/Steam.php
@@ -1,8 +1,6 @@
 <?php
 namespace newznab;
 
-require_once NN_LIBS . 'simple_html_dom.php';
-
 use newznab\utility\Utility;
 
 class Steam
diff --git a/newznab/config/Configure.php b/newznab/config/Configure.php
index 410eff4af..dc64d4152 100644
--- a/newznab/config/Configure.php
+++ b/newznab/config/Configure.php
@@ -20,8 +20,6 @@
  */
 namespace newznab\config;
 
-require_once NN_LIBS . 'autoloader.php';
-
 class Configure
 {
 	private $environments = [
diff --git a/newznab/processing/PostProcess.php b/newznab/processing/PostProcess.php
index ce1ce2037..6e58d8501 100755
--- a/newznab/processing/PostProcess.php
+++ b/newznab/processing/PostProcess.php
@@ -24,9 +24,6 @@ use newznab\processing\post\ProcessAdditional;
 use newznab\SpotNab;
 use newznab\utility\Utility;
 
-require_once NN_LIBS . 'zeebinz/rarinfo/par2info.php';
-require_once NN_LIBS . 'zeebinz/rarinfo/srrinfo.php';
-
 class PostProcess
 {
 	/**
diff --git a/newznab/processing/post/ProcessAdditional.php b/newznab/processing/post/ProcessAdditional.php
index 4cbdb7e7f..adab96ef0 100644
--- a/newznab/processing/post/ProcessAdditional.php
+++ b/newznab/processing/post/ProcessAdditional.php
@@ -1,10 +1,6 @@
 <?php
 namespace newznab\processing\post;
 
-require_once NN_LIBS . 'zeebinz/rarinfo/archiveinfo.php';
-require_once NN_LIBS . 'zeebinz/rarinfo/par2info.php';
-require_once NN_LIBS . 'zeebinz/rarinfo/srrinfo.php';
-
 use newznab\db\Settings;
 use newznab\utility\Utility;
 use newznab\NZB;
diff --git a/www/pages/BasePage.php b/www/pages/BasePage.php
index a73ee4382..3fb5e2872 100644
--- a/www/pages/BasePage.php
+++ b/www/pages/BasePage.php
@@ -1,8 +1,5 @@
 <?php
 
-Smarty_Autoloader::register();
-require_once NN_LIB . 'utility' . DS . 'SmartyUtils.php';
-
 use newznab\db\Settings;
 use newznab\Users;
 use newznab\SABnzbd;
diff --git a/www/smarty.php b/www/smarty.php
index a5e1046e3..6aebaeee4 100644
--- a/www/smarty.php
+++ b/www/smarty.php
@@ -20,7 +20,7 @@
  */
 require_once realpath(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'constants.php');
 require_once realpath(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'autoloader.php');
-require_once 'autoloader.php';
+//require_once 'autoloader.php';
 
 use newznab\config\Configure;
 
@@ -46,7 +46,7 @@ if (function_exists('ini_set') && function_exists('ini_get')) {
 }
 
 // Path to smarty files. (not prefixed with NN as the name is needed in smarty files).
-define('SMARTY_DIR', NN_LIBS . 'smarty' . DS);
+//define('SMARTY_DIR', NN_LIBS . 'smarty' . DS);
 
 $www_top = str_replace("\\", "/", dirname($_SERVER['PHP_SELF']));
 if (strlen($www_top) == 1) {