diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/populate_anidb.php b/cli/data/populate_anidb.php
similarity index 84%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/populate_anidb.php
rename to cli/data/populate_anidb.php
index 26ddd0a42..236ae91f6 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/populate_anidb.php
+++ b/cli/data/populate_anidb.php
@@ -2,14 +2,15 @@
 /* This script is designed to gather all show data from anidb and add it to the anidb table for newznab, as part of this process we need the number of PI queries that can be executed max and whether or not we want debuging the first argument if unset will try to do the entire list (a good way to get banned), the second option can be blank or true for debugging.
 * IF you are using this script then then you also want to edit anidb.php in www/lib and locate "604800" and replace it with 1204400, this will make sure it never tries to connect to anidb as this will fail
 */
-require_once(dirname(__FILE__) . "/../../bin/config.php");
+require_once dirname(__FILE__) . '/../../www/config.php';
 
 use newznab\db\Settings;
+use newznab\db\populate\AniDB;
 
 $pdo = new Settings();
 
 if ($argc > 1 && $argv[1] == true) {
-	(new \PopulateAniDB(['Settings' => $pdo, 'Echo' => true]))->populateTable('full');
+	(new AniDB(['Settings' => $pdo, 'Echo' => true]))->populateTable('full');
 } else {
 	$pdo->log->doEcho(PHP_EOL . $pdo->log->error(
 			"To execute this script you must provide a boolean argument." . PHP_EOL .
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/predb_import_daily_batch.php b/cli/data/predb_import_daily_batch.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/predb_import_daily_batch.php
rename to cli/data/predb_import_daily_batch.php
index d06921863..0c9ad84ae 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/predb_import_daily_batch.php
+++ b/cli/data/predb_import_daily_batch.php
@@ -7,14 +7,14 @@
 use newznab\db\Settings;
 use newznab\utility\Utility;
 
-$config = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR .
+$config = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'www' . DIRECTORY_SEPARATOR .
 	'config.php';
 
 
 if (!is_file($config)) {
-	exit('Place this script in the lib/testing folder of tmux.' . PHP_EOL);
+	exit('Place this script in the testing folder of tmux.' . PHP_EOL);
 }
-require_once $config;
+require_once dirname(__FILE__) . '/../../www/config.php';
 unset($config);
 
 if (!Utility::isWin()) {
@@ -36,7 +36,7 @@ if (!is_writable(NN_RES)) {
 	exit('The (' . NN_RES . ') folder must be writable.' . PHP_EOL);
 }
 
-$progress = rw_progress(settings_[]);
+$progress = rw_progress(settings_array());
 
 if (!isset($argv[1]) || !is_numeric($argv[1]) && $argv[1] != 'progress' || !isset($argv[2]) ||
 	!in_array($argv[2], ['local', 'remote']) || !isset($argv[3]) ||
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/change_USP_provider.php b/misc/testing/DB/change_USP_provider.php
similarity index 99%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/change_USP_provider.php
rename to misc/testing/DB/change_USP_provider.php
index 36bc2bca9..7d4d6982f 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/change_USP_provider.php
+++ b/misc/testing/DB/change_USP_provider.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_mysql_tables.php b/misc/testing/DB/convert_mysql_tables.php
similarity index 99%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_mysql_tables.php
rename to misc/testing/DB/convert_mysql_tables.php
index 7ca35e77b..ef499b993 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_mysql_tables.php
+++ b/misc/testing/DB/convert_mysql_tables.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg.php b/misc/testing/DB/convert_to_tpg.php
similarity index 99%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg.php
rename to misc/testing/DB/convert_to_tpg.php
index 312d8624c..d1afac3a5 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg.php
+++ b/misc/testing/DB/convert_to_tpg.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg_alt.php b/misc/testing/DB/convert_to_tpg_alt.php
similarity index 98%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg_alt.php
rename to misc/testing/DB/convert_to_tpg_alt.php
index c4e3695a4..78b673a59 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/convert_to_tpg_alt.php
+++ b/misc/testing/DB/convert_to_tpg_alt.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/mysqldump_tables.php b/misc/testing/DB/mysqldump_tables.php
similarity index 99%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/mysqldump_tables.php
rename to misc/testing/DB/mysqldump_tables.php
index 919e77db3..03c467784 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/mysqldump_tables.php
+++ b/misc/testing/DB/mysqldump_tables.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/populate_nzb_guid.php b/misc/testing/DB/populate_nzb_guid.php
similarity index 98%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/populate_nzb_guid.php
rename to misc/testing/DB/populate_nzb_guid.php
index 3c9c8f875..f4ca374bf 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/populate_nzb_guid.php
+++ b/misc/testing/DB/populate_nzb_guid.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 use newznab\utility\Utility;
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/rename_to_lower.php b/misc/testing/DB/rename_to_lower.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/rename_to_lower.php
rename to misc/testing/DB/rename_to_lower.php
index 9e4d151c4..22dc9f04d 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/rename_to_lower.php
+++ b/misc/testing/DB/rename_to_lower.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 
 passthru('clear');
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_postprocessing.php b/misc/testing/DB/reset_postprocessing.php
similarity index 99%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_postprocessing.php
rename to misc/testing/DB/reset_postprocessing.php
index dfc018f01..5ee1b4b90 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_postprocessing.php
+++ b/misc/testing/DB/reset_postprocessing.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_truncate.php b/misc/testing/DB/reset_truncate.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_truncate.php
rename to misc/testing/DB/reset_truncate.php
index 727ad3994..eddff5b69 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/reset_truncate.php
+++ b/misc/testing/DB/reset_truncate.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/resetdb.php b/misc/testing/DB/resetdb.php
similarity index 98%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/resetdb.php
rename to misc/testing/DB/resetdb.php
index fcf43a7fa..54ba0ce30 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/resetdb.php
+++ b/misc/testing/DB/resetdb.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 use newznab\utility\Utility;
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/setUserPasswordHash.php b/misc/testing/DB/setUserPasswordHash.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/setUserPasswordHash.php
rename to misc/testing/DB/setUserPasswordHash.php
index 0baa43720..bf29c0357 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/setUserPasswordHash.php
+++ b/misc/testing/DB/setUserPasswordHash.php
@@ -6,7 +6,7 @@
  * reason, it will allow the password hash on the account to be changed.
  * Hopefully that will allow admin access to fix any further problems.
  */
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/setUserPasswordHashesToEmail.php b/misc/testing/DB/setUserPasswordHashesToEmail.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/DB/setUserPasswordHashesToEmail.php
rename to misc/testing/DB/setUserPasswordHashesToEmail.php
index 4c43f740b..f8ed6cdd0 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/DB/setUserPasswordHashesToEmail.php
+++ b/misc/testing/DB/setUserPasswordHashesToEmail.php
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/clean_nzbs.php b/misc/testing/Dev/clean_nzbs.php
similarity index 98%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/clean_nzbs.php
rename to misc/testing/Dev/clean_nzbs.php
index a7a1e0402..7b17e7143 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/clean_nzbs.php
+++ b/misc/testing/Dev/clean_nzbs.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 use newznab\utility\Utility;
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/renametopre.php b/misc/testing/Dev/renametopre.php
similarity index 99%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/renametopre.php
rename to misc/testing/Dev/renametopre.php
index c89f4ce15..4b4bd7233 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/renametopre.php
+++ b/misc/testing/Dev/renametopre.php
@@ -1,6 +1,6 @@
 <?php
 // TODO: bunch of if/elses need converting to switches
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/test_hash_algorithms.php b/misc/testing/Dev/test_hash_algorithms.php
similarity index 100%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/Dev/test_hash_algorithms.php
rename to misc/testing/Dev/test_hash_algorithms.php
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/check_previews.php b/misc/testing/PostProc/check_previews.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/check_previews.php
rename to misc/testing/PostProc/check_previews.php
index 2d3ccdd5a..1a965e20c 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/check_previews.php
+++ b/misc/testing/PostProc/check_previews.php
@@ -2,7 +2,7 @@
 // --------------------------------------------------------------
 //          Scan for releases missing previews on disk
 // --------------------------------------------------------------
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 use newznab\utility\Utility;
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getConsole.php b/misc/testing/PostProc/getConsole.php
similarity index 94%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getConsole.php
rename to misc/testing/PostProc/getConsole.php
index 89d385ded..b357ce279 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getConsole.php
+++ b/misc/testing/PostProc/getConsole.php
@@ -1,7 +1,7 @@
 <?php
 //This script will update all records in the consoleinfo table
 
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getGameCovers.php b/misc/testing/PostProc/getGameCovers.php
similarity index 94%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getGameCovers.php
rename to misc/testing/PostProc/getGameCovers.php
index 901eb2dc6..9ce02c7fe 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getGameCovers.php
+++ b/misc/testing/PostProc/getGameCovers.php
@@ -1,7 +1,7 @@
 <?php
 //This script will update all records in the gamesinfo table
 
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getImdb.php b/misc/testing/PostProc/getImdb.php
similarity index 92%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getImdb.php
rename to misc/testing/PostProc/getImdb.php
index 97a714e50..6bd139ec2 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getImdb.php
+++ b/misc/testing/PostProc/getImdb.php
@@ -1,6 +1,6 @@
 <?php
 //This script will update all records in the movieinfo table
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getMovieCovers.php b/misc/testing/PostProc/getMovieCovers.php
similarity index 92%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getMovieCovers.php
rename to misc/testing/PostProc/getMovieCovers.php
index 3302bcd83..a6b63b164 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getMovieCovers.php
+++ b/misc/testing/PostProc/getMovieCovers.php
@@ -1,6 +1,6 @@
 <?php
 //This script will update all records in the movieinfo table where there is no cover
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getXXXCovers.php b/misc/testing/PostProc/getXXXCovers.php
similarity index 91%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getXXXCovers.php
rename to misc/testing/PostProc/getXXXCovers.php
index 94b2d3289..f5f9d6ff8 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/getXXXCovers.php
+++ b/misc/testing/PostProc/getXXXCovers.php
@@ -1,6 +1,6 @@
 <?php
 //This script will update all records in the xxxinfo table where there is no cover
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/populate_tvrage.php b/misc/testing/PostProc/populate_tvrage.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/populate_tvrage.php
rename to misc/testing/PostProc/populate_tvrage.php
index f91e46ccd..9872b0c63 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/populate_tvrage.php
+++ b/misc/testing/PostProc/populate_tvrage.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateBookImages.php b/misc/testing/PostProc/updateBookImages.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateBookImages.php
rename to misc/testing/PostProc/updateBookImages.php
index 8fdc013de..9c253348c 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateBookImages.php
+++ b/misc/testing/PostProc/updateBookImages.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateConsoleImages.php b/misc/testing/PostProc/updateConsoleImages.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateConsoleImages.php
rename to misc/testing/PostProc/updateConsoleImages.php
index d1cfcb444..7ac19dec1 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateConsoleImages.php
+++ b/misc/testing/PostProc/updateConsoleImages.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateGamesImages.php b/misc/testing/PostProc/updateGamesImages.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateGamesImages.php
rename to misc/testing/PostProc/updateGamesImages.php
index a6b654580..3679e1e54 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateGamesImages.php
+++ b/misc/testing/PostProc/updateGamesImages.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 use newznab\utility\Utility;
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateMovieImages.php b/misc/testing/PostProc/updateMovieImages.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateMovieImages.php
rename to misc/testing/PostProc/updateMovieImages.php
index b6d79dab7..446b374e0 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateMovieImages.php
+++ b/misc/testing/PostProc/updateMovieImages.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateMusicImages.php b/misc/testing/PostProc/updateMusicImages.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateMusicImages.php
rename to misc/testing/PostProc/updateMusicImages.php
index b16c6468c..22ceb024c 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateMusicImages.php
+++ b/misc/testing/PostProc/updateMusicImages.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateTvRage.php b/misc/testing/PostProc/updateTvRage.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateTvRage.php
rename to misc/testing/PostProc/updateTvRage.php
index b8f6b20fd..a4c79fe04 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateTvRage.php
+++ b/misc/testing/PostProc/updateTvRage.php
@@ -1,6 +1,6 @@
 <?php
 //This script downloads covert art for Tv Shows -- it is intended to be run at interval, generally after the TvRage database is populated
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 use newznab\utility\Utility;
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateXXXImages.php b/misc/testing/PostProc/updateXXXImages.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateXXXImages.php
rename to misc/testing/PostProc/updateXXXImages.php
index 5e4c1bf24..dac4d4360 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/PostProc/updateXXXImages.php
+++ b/misc/testing/PostProc/updateXXXImages.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/Releases/delete_releases.php b/misc/testing/Releases/delete_releases.php
similarity index 98%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/Releases/delete_releases.php
rename to misc/testing/Releases/delete_releases.php
index b9f4b7e9a..78d700fa0 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/Releases/delete_releases.php
+++ b/misc/testing/Releases/delete_releases.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 // New line for CLI.
 $n = PHP_EOL;
 
diff --git a/misc/testing/memcache.php b/misc/testing/Tests/memcache.php
similarity index 100%
rename from misc/testing/memcache.php
rename to misc/testing/Tests/memcache.php
diff --git a/misc/testing/Tests/queryamazon.php b/misc/testing/Tests/queryamazon.php
new file mode 100644
index 000000000..44dfa783f
--- /dev/null
+++ b/misc/testing/Tests/queryamazon.php
@@ -0,0 +1 @@
+<?php
require_once dirname(__FILE__) . '/../../../www/config.php';
require_once (NN_LIBS . 'AmazonProductAPI.php');

$b = new Book();


$s = new Sites();
$site = $s->get();

$title = "Long Arm, The - Franz Habl ";

$obj = new AmazonProductAPI($site->amazonpubkey, $site->amazonprivkey, $site->amazonassociatetag);

try
{
	$amaz = $obj->searchProducts($title, AmazonProductAPI::BOOKS, "TITLE");

	$item = [];
	$item["asin"] = (string) $amaz->Items->Item->ASIN;
	$item["url"] = (string) $amaz->Items->Item->DetailPageURL;
	$item["cover"] = (string) $amaz->Items->Item->LargeImage->URL;
	$item["author"] = (string) $amaz->Items->Item->ItemAttributes->Author;
	$item["dewey"] = (string) $amaz->Items->Item->ItemAttributes->DeweyDecimalNumber;
	$item["ean"] = (string) $amaz->Items->Item->ItemAttributes->EAN;
	$item["isbn"] = (string) $amaz->Items->Item->ItemAttributes->ISBN;
	$item["publisher"] = (string) $amaz->Items->Item->ItemAttributes->Publisher;
	$item["publishdate"] = (string) $amaz->Items->Item->ItemAttributes->PublicationDate;
	$item["pages"] = (string) $amaz->Items->Item->ItemAttributes->NumberOfPages;
	$item["title"] = (string) $amaz->Items->Item->ItemAttributes->Title;

	$item["review"] = "";
	if (isset($amaz->Items->Item->EditorialReviews))
		$item["review"] = trim(strip_tags((string) $amaz->Items->Item->EditorialReviews->EditorialReview->Content));

	print_r($item);
}
catch(Exception $e)
{
	echo "failed";
}
\ No newline at end of file
diff --git a/misc/testing/regexverify.php b/misc/testing/Tests/regexverify.php
similarity index 95%
rename from misc/testing/regexverify.php
rename to misc/testing/Tests/regexverify.php
index 211f96a39..f9cb21bb3 100644
--- a/misc/testing/regexverify.php
+++ b/misc/testing/Tests/regexverify.php
@@ -5,7 +5,7 @@
 //
 // by l2g
 //
-require_once dirname(__FILE__) . '/../../www/config.php';
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 
 function handleError($errno, $errstr, $errfile, $errline, array $errcontext)
diff --git a/misc/testing/test_blacklist.php b/misc/testing/Tests/test_blacklist.php
similarity index 99%
rename from misc/testing/test_blacklist.php
rename to misc/testing/Tests/test_blacklist.php
index ba9cef634..8ac18bdc1 100644
--- a/misc/testing/test_blacklist.php
+++ b/misc/testing/Tests/test_blacklist.php
@@ -8,7 +8,7 @@
 //
 // by l2g
 //
-require_once dirname(__FILE__) . '/../../www/config.php';
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/testing/test_regex.php b/misc/testing/Tests/test_regex.php
similarity index 95%
rename from misc/testing/test_regex.php
rename to misc/testing/Tests/test_regex.php
index 841b873c2..48af227ec 100644
--- a/misc/testing/test_regex.php
+++ b/misc/testing/Tests/test_regex.php
@@ -5,7 +5,7 @@
 //
 // by l2g
 //
-require_once dirname(__FILE__) . '/../../www/config.php';
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/testing/testnewamazon.php b/misc/testing/Tests/testnewamazon.php
similarity index 92%
rename from misc/testing/testnewamazon.php
rename to misc/testing/Tests/testnewamazon.php
index b649616dc..197f301b4 100644
--- a/misc/testing/testnewamazon.php
+++ b/misc/testing/Tests/testnewamazon.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__) . '/../../www/config.php';
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\libraries\ApaiIO\Configuration\GenericConfiguration;
 use newznab\libraries\ApaiIO\Operations\Search;
diff --git a/misc/testing/timetest.php b/misc/testing/Tests/timetest.php
similarity index 89%
rename from misc/testing/timetest.php
rename to misc/testing/Tests/timetest.php
index 5a8bcfb38..afbec7865 100644
--- a/misc/testing/timetest.php
+++ b/misc/testing/Tests/timetest.php
@@ -1,6 +1,6 @@
 <?php
 //This Script Verifies your System Time vs Myself Time vs PHP Time
-require_once dirname(__FILE__) . '/../../www/config.php';
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 $res="";
diff --git a/misc/testing/transactiontest.php b/misc/testing/Tests/transactiontest.php
similarity index 98%
rename from misc/testing/transactiontest.php
rename to misc/testing/Tests/transactiontest.php
index d79b63191..b35211f4b 100644
--- a/misc/testing/transactiontest.php
+++ b/misc/testing/Tests/transactiontest.php
@@ -1,5 +1,5 @@
 <?php
-
+use newznab\db\Settings;
 
 try {
     // Create the first database class instance (which will initialize the PDO connection)
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_add_collections_column_2015-02-20.php b/misc/testing/_run_once/tpg_add_collections_column_2015-02-20.php
similarity index 96%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_add_collections_column_2015-02-20.php
rename to misc/testing/_run_once/tpg_add_collections_column_2015-02-20.php
index bf1f90122..036b4087f 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_add_collections_column_2015-02-20.php
+++ b/misc/testing/_run_once/tpg_add_collections_column_2015-02-20.php
@@ -18,7 +18,7 @@
  * @author niel
  * @copyright 2014 nZEDb
  */
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_fixes.php b/misc/testing/_run_once/tpg_fixes.php
similarity index 97%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_fixes.php
rename to misc/testing/_run_once/tpg_fixes.php
index 62f91f5ca..377168f8e 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/_run_once/tpg_fixes.php
+++ b/misc/testing/_run_once/tpg_fixes.php
@@ -26,7 +26,7 @@ if (!isset($argv[1]) || !in_array($argv[1], ['1'])) {
 	);
 }
 
-require_once(dirname(__FILE__) . "/../../../bin/config.php");
+require_once dirname(__FILE__) . '/../../../www/config.php';
 
 use newznab\db\Settings;
 
diff --git a/misc/testing/queryamazon.php b/misc/testing/queryamazon.php
deleted file mode 100644
index e4a6ffcd1..000000000
--- a/misc/testing/queryamazon.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
require_once dirname(__FILE__) . '/../../www/config.php';
require_once (NN_LIBS . 'AmazonProductAPI.php');

$b = new Book();


$s = new Sites();
$site = $s->get();

$title = "Long Arm, The - Franz Habl ";

$obj = new AmazonProductAPI($site->amazonpubkey, $site->amazonprivkey, $site->amazonassociatetag);

try
{
	$amaz = $obj->searchProducts($title, AmazonProductAPI::BOOKS, "TITLE");

	$item = [];
	$item["asin"] = (string) $amaz->Items->Item->ASIN;
	$item["url"] = (string) $amaz->Items->Item->DetailPageURL;
	$item["cover"] = (string) $amaz->Items->Item->LargeImage->URL;
	$item["author"] = (string) $amaz->Items->Item->ItemAttributes->Author;
	$item["dewey"] = (string) $amaz->Items->Item->ItemAttributes->DeweyDecimalNumber;
	$item["ean"] = (string) $amaz->Items->Item->ItemAttributes->EAN;
	$item["isbn"] = (string) $amaz->Items->Item->ItemAttributes->ISBN;
	$item["publisher"] = (string) $amaz->Items->Item->ItemAttributes->Publisher;
	$item["publishdate"] = (string) $amaz->Items->Item->ItemAttributes->PublicationDate;
	$item["pages"] = (string) $amaz->Items->Item->ItemAttributes->NumberOfPages;
	$item["title"] = (string) $amaz->Items->Item->ItemAttributes->Title;

	$item["review"] = "";
	if (isset($amaz->Items->Item->EditorialReviews))
		$item["review"] = trim(strip_tags((string) $amaz->Items->Item->EditorialReviews->EditorialReview->Content));

	print_r($item);
}
catch(Exception $e)
{
	echo "failed";
}
\ No newline at end of file
diff --git a/misc/update_scripts/nix_scripts/tmux/lib/testing/recategorize.php b/misc/testing/recategorize.php
similarity index 98%
rename from misc/update_scripts/nix_scripts/tmux/lib/testing/recategorize.php
rename to misc/testing/recategorize.php
index d7cd563f0..2ce8da19b 100644
--- a/misc/update_scripts/nix_scripts/tmux/lib/testing/recategorize.php
+++ b/misc/testing/recategorize.php
@@ -1,5 +1,5 @@
 <?php
-require_once(dirname(__FILE__) . "/../../bin/config.php");
+require_once dirname(__FILE__) . '/../../www/config.php';
 
 use newznab\db\Settings;