diff --git a/misc/update_scripts/nix_scripts/tmux/bin/update_binaries.php b/misc/update_scripts/nix_scripts/tmux/bin/update_binaries.php
deleted file mode 100644
index 04cb97d7c..000000000
--- a/misc/update_scripts/nix_scripts/tmux/bin/update_binaries.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/config.php");
-
-
-$time = TIME();
-$c = new ColorCLI();
-
-if (isset($argv[1])) {
-	$group = $argv[1];
-	echo $c->header("Updating group {$group}");
-
-	$g = new Groups;
-	$group = $g->getByName($group);
-
-	$bin = new Binaries;
-	$bin->updateGroup($group);
-} else {
-	$binaries = new Binaries;
-	$binaries->updateAllGroups();
-}
-
-function relativeTime($_time)
-{
-	$d = [];
-	$d[0] = array(1, "sec");
-	$d[1] = array(60, "min");
-	$d[2] = array(3600, "hr");
-	$d[3] = array(86400, "day");
-	$d[4] = array(31104000, "yr");
-
-	$w = [];
-
-	$return = "";
-	$now = TIME();
-	$diff = ($now - $_time);
-	$secondsLeft = $diff;
-
-	for ($i = 4; $i > -1; $i--) {
-		$w[$i] = intval($secondsLeft / $d[$i][0]);
-		$secondsLeft -= ($w[$i] * $d[$i][0]);
-		if ($w[$i] != 0) {
-			//$return.= abs($w[$i]). " " . $d[$i][1] . (($w[$i]>1)?'s':'') ." ";
-			$return .= $w[$i] . " " . $d[$i][1] . (($w[$i] > 1) ? 's' : '') . " ";
-		}
-	}
-
-	//$return .= ($diff>0)?"ago":"left";
-	return $return;
-}
-
-echo $c->header("Group update process completed in: " . relativeTime($time) . "\n");
-
diff --git a/misc/update_scripts/nix_scripts/tmux/conf/.gitignore b/misc/update_scripts/nix_scripts/tmux/conf/.gitignore
deleted file mode 100644
index 2d2fd07c1..000000000
--- a/misc/update_scripts/nix_scripts/tmux/conf/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-tmux_user.conf
-my.cnf
diff --git a/misc/update_scripts/nix_scripts/tmux/monitor.php b/misc/update_scripts/nix_scripts/tmux/monitor.php
index eb09628d5..128ea418f 100644
--- a/misc/update_scripts/nix_scripts/tmux/monitor.php
+++ b/misc/update_scripts/nix_scripts/tmux/monitor.php
@@ -84,7 +84,7 @@ while ($runVar['counts']['iterations'] > 0) {
 
 	//assign scripts
 	$runVar['scripts']['releases'] = ($runVar['constants']['tablepergroup'] == 0
-		? "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/bin/update_releases.php 1 false"
+		? "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/update_releases.php 1 false"
 		: "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/releases.php"
 	);
 
@@ -104,7 +104,7 @@ while ($runVar['counts']['iterations'] > 0) {
 			$runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/backfill.php";
 			break;
 		case 2:
-			$runVar['scripts']['backfill'] = "{$runVar['commands']['_python']} {$runVar['paths']['misc']}update_scripts/nix_scripts/tmux/python/backfill_threaded.py group";
+			$runVar['scripts']['backfill'] = "{$runVar['commands']['_python']} {$runVar['paths']['misc']}update_scripts/python/backfill_threaded.py group";
 			break;
 		case 4:
 			$runVar['scripts']['backfill'] = "{$runVar['commands']['_php']} {$runVar['paths']['misc']}update_scripts/nix_scripts/multiprocessing/safe.php backfill";
diff --git a/misc/update_scripts/nix_scripts/tmux/run.php b/misc/update_scripts/nix_scripts/tmux/run.php
index 5f667a62b..287da3bf1 100644
--- a/misc/update_scripts/nix_scripts/tmux/run.php
+++ b/misc/update_scripts/nix_scripts/tmux/run.php
@@ -153,9 +153,9 @@ function window_proxy($tmux_session, $window)
 	$nntpproxy = $pdo->getSetting('nntpproxy');
 	if ($nntpproxy === '1') {
 		$DIR = NN_MISC;
-		$nntpproxypy = $DIR . "update_scripts/nix_scripts/tmux/python/nntpproxy.py";
-		if (file_exists($DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf")) {
-			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf";
+		$nntpproxypy = $DIR . "update_scripts/python/nntpproxy.py";
+		if (file_exists($DIR . "update_scripts/python/lib/nntpproxy.conf")) {
+			$nntpproxyconf = $DIR . "update_scripts/python/lib/nntpproxy.conf";
 			exec("tmux new-window -t $tmux_session -n nntpproxy 'printf \"\033]2;NNTPProxy\033\" && python $nntpproxypy $nntpproxyconf'");
 		}
 	}
@@ -235,7 +235,7 @@ function attach($DIR, $tmux_session)
 if ($powerline == 1) {
 	$tmuxconfig = $DIR . "powerline/tmux.conf";
 } else {
-	$tmuxconfig = $DIR . "conf/tmux.conf";
+	$tmuxconfig = $DIR . "tmux.conf";
 }
 
 if ($seq == 1) {
diff --git a/misc/update_scripts/nix_scripts/tmux/conf/tmux.conf b/misc/update_scripts/nix_scripts/tmux/tmux.conf
similarity index 100%
rename from misc/update_scripts/nix_scripts/tmux/conf/tmux.conf
rename to misc/update_scripts/nix_scripts/tmux/tmux.conf
diff --git a/misc/update_scripts/nntpproxy.php b/misc/update_scripts/nntpproxy.php
index 6387f36ae..fee92abef 100644
--- a/misc/update_scripts/nntpproxy.php
+++ b/misc/update_scripts/nntpproxy.php
@@ -45,18 +45,18 @@ function window_proxy($tmux_session, $powerline)
 	$nntpproxy = $pdo->getSetting('nntpproxy');
 	if ($nntpproxy === '1') {
 		$DIR = NN_MISC;
-		$nntpproxypy = $DIR . "update_scripts/nix_scripts/_tmux/python/nntpproxy.py";
-		if (file_exists($DIR . "update_scripts/nix_scripts/tmux//python/lib/nntpproxy.conf")) {
-			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy.conf";
+		$nntpproxypy = $DIR . "update_scripts/nix_scripts/python/nntpproxy.py";
+		if (file_exists($DIR . "update_scripts/nix_scripts/python/lib/nntpproxy.conf")) {
+			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/python/lib/nntpproxy.conf";
 			shell_exec("cd ${DIR}/update_scripts/nix_scripts/tmux; tmux -f $tmuxconfig attach-session -t $tmux_session || tmux -f $tmuxconfig new-session -d -s $tmux_session -n NNTPProxy 'printf \"\033]2;\"NNTPProxy\"\033\" && python $nntpproxypy $nntpproxyconf'");
 		}
 	}
 
 	if ($nntpproxy == '1' && ($pdo->getSetting('alternate_nntp') == '1')) {
 		$DIR = NN_MISC;
-		$nntpproxypy = $DIR . "update_scripts/nix_scripts/tmux/python/nntpproxy.py";
-		if (file_exists($DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy_a.conf")) {
-			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/tmux/python/lib/nntpproxy_a.conf";
+		$nntpproxypy = $DIR . "update_scripts/nix_scripts/python/nntpproxy.py";
+		if (file_exists($DIR . "update_scripts/nix_scripts/python/lib/nntpproxy_a.conf")) {
+			$nntpproxyconf = $DIR . "update_scripts/nix_scripts/python/lib/nntpproxy_a.conf";
 			shell_exec("tmux selectp -t 0; tmux splitw -t $tmux_session:0 -h -p 50 'printf \"\033]2;NNTPProxy\033\" && python $nntpproxypy $nntpproxyconf'");
 		}
 	}
diff --git a/misc/update_scripts/optimise_db.php b/misc/update_scripts/optimise_db.php
deleted file mode 100644
index e61a79588..000000000
--- a/misc/update_scripts/optimise_db.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-require_once("config.php");
-
-use newznab\db\Settings;
-
-$force = ((isset($argv[1]) && ($argv[1] == "true")));
-
-$db = new Settings;
-$ret = $db->optimise($force);
-
-if (count($ret) > 0)
-{
-	echo "Optmze  : Optimised ".count($ret)." tables\n";
-}
-else
-{
-	echo "Optmze  : Nothing required optimisation.".(!$force ? " Try using force (optimise_db.php true)" : "")."\n";
-}
\ No newline at end of file
diff --git a/misc/update_scripts/update_binaries.php b/misc/update_scripts/update_binaries.php
index bde8bb42b..b1d606d1e 100644
--- a/misc/update_scripts/update_binaries.php
+++ b/misc/update_scripts/update_binaries.php
@@ -1,15 +1,14 @@
 <?php
-
-require_once("config.php");
+require_once(dirname(__FILE__) . "/config.php");
 
 use newznab\db\Settings;
 
 $pdo = new Settings();
 
-$maxHeaders = $pdo->getSetting('maxheadersiteration') ?: 1000000;
+$maxHeaders = $pdo->getSetting('max.headers.iteration') ?: 1000000;
 
 // Create the connection here and pass
-$nntp = new \NNTP(['Settings' => $pdo]);
+$nntp = new NNTP(['Settings' => $pdo]);
 if ($nntp->doConnect() !== true) {
 	exit($pdo->log->error("Unable to connect to usenet."));
 }