diff --git a/testing/install_script.sh b/testing/install_script.sh
index 570f4e4..ec483b8 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -74,54 +74,34 @@ if [ $MC_TYPE = "vanilla" ]; then
 			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 	fi
 
-elif [ $MC_TYPE = "forge" ]; then
-    echo "INFO ! Forge Selected"
-	if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
+elif [ $MC_TYPE = "bukkit" ]; then
+    echo "INFO ! Bukkit Selected"
+	if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
 		then
 			echo " "
-			echo "INFO ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar found starting now."
+			echo "INFO ! craftbukkit-$MC_VERSION.jar found starting now."
 		else
 			echo " "
-			echo "WARNING ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar is out of date/missing ... will download now."
+			echo "WARNING ! craftbukkit-$MC_VERSION.jar is out of date/missing ... will download now."
 			echo " "
 			echo "INFO ! Cleaning old files."
-			cd $MC_DIR
-			mkdir -p /old-server-versions/
-			mv *.jar /old-server-versions/
-			mv run-*.sh /old-server-versions/ 
-			mv *.log /old-server-versions/
-			mv /libraries /old-server-versions/libraries_OLD
-			wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-			chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-			java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
-			mv run.sh run-$MC_TYPE-$MC_VERSION.sh
-			chmod +x run-$MC_TYPE-$MC_VERSION.sh
-			cd ..
+			mkdir -p $MC_DIR/old-server-versions/
+			mv $MC_DIR/*.jar $MC_DIR/old-server-versions/
+			mv $MC_DIR/*.log $MC_DIR/old-server-versions/
+			wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
+			chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
 	fi
-
-elif [ $MC_TYPE = "neoforged" ]; then
-    echo "INFO ! Neoforged Selected"
-	if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ]
+	# Looking for run-$MC_TYPE-$MC_VERSION.sh
+	if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ]
 		then
 			echo " "
-			echo "INFO ! neoforge-$NEOFORGED_VERSION-installer.jar found starting now."
+			echo "INFO ! run-$MC_TYPE-$MC_VERSION.sh found ... will use existing file."
 		else
 			echo " "
-			echo "WARNING ! neoforge-$NEOFORGED_VERSION-installer.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			cd $MC_DIR
-			mkdir -p /old-server-versions/
-			mv *.jar /old-server-versions/
-			mv run-*.sh /old-server-versions/ 
-			mv *.log /old-server-versions/
-			mv /libraries /old-server-versions/libraries_OLD
-			wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
-			chmod +x neoforge-$NEOFORGED_VERSION-installer.jar
-			java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
-			mv run.sh run-$MC_TYPE-$MC_VERSION.sh
-			chmod +x run-$MC_TYPE-$MC_VERSION.sh
-			cd ..
+			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
+			mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
+			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_BUKKIT_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
+			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 	fi
 
 elif [ $MC_TYPE = "fabric" ]; then
@@ -154,6 +134,56 @@ elif [ $MC_TYPE = "fabric" ]; then
 			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 	fi
 
+elif [ $MC_TYPE = "forge" ]; then
+    echo "INFO ! Forge Selected"
+	if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
+		then
+			echo " "
+			echo "INFO ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar found starting now."
+		else
+			echo " "
+			echo "WARNING ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar is out of date/missing ... will download now."
+			echo " "
+			echo "INFO ! Cleaning old files."
+			cd $MC_DIR
+			mkdir -p /old-server-versions
+			mv *.jar /old-server-versions/
+			mv run-*.sh /old-server-versions/ 
+			mv *.log /old-server-versions/
+			mv /libraries /old-server-versions/libraries_OLD_$MC_TYPE
+			wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+			chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
+			java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
+			mv run.sh run-$MC_TYPE-$MC_VERSION.sh
+			chmod +x run-$MC_TYPE-$MC_VERSION.sh
+			cd ..
+	fi
+
+elif [ $MC_TYPE = "neoforged" ]; then
+    echo "INFO ! Neoforged Selected"
+	if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ]
+		then
+			echo " "
+			echo "INFO ! neoforge-$NEOFORGED_VERSION-installer.jar found starting now."
+		else
+			echo " "
+			echo "WARNING ! neoforge-$NEOFORGED_VERSION-installer.jar is out of date/missing ... will download now."
+			echo " "
+			echo "INFO ! Cleaning old files."
+			cd $MC_DIR
+			mkdir -p /old-server-versions
+			mv *.jar /old-server-versions/
+			mv run-*.sh /old-server-versions/ 
+			mv *.log /old-server-versions/
+			mv /libraries /old-server-versions/libraries_OLD_$MC_TYPE
+			wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
+			chmod +x neoforge-$NEOFORGED_VERSION-installer.jar
+			java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
+			mv run.sh run-$MC_TYPE-$MC_VERSION.sh
+			chmod +x run-$MC_TYPE-$MC_VERSION.sh
+			cd ..
+	fi
+
 elif [ $MC_TYPE = "quilt" ]; then
     echo "INFO ! Quilt Selected"
 	if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ]
@@ -166,10 +196,10 @@ elif [ $MC_TYPE = "quilt" ]; then
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
-			mkdir -p /old-server-versions/
+			mkdir -p /old-server-versions
 			mv *.jar /old-server-versions/
 			mv *.log /old-server-versions/
-			mv /libraries /old-server-versions/libraries_OLD
+			mv /libraries /old-server-versions/libraries_OLD_$MC_TYPE
 			wget --no-cache --show-progress --progress=bar:force:noscroll $QUILT_INSTALLER_FILE -O quilt-installer-$QUILT_VERSION.jar
 			chmod +x quilt-installer-$QUILT_VERSION.jar
 			java -jar quilt-installer-$QUILT_VERSION.jar install server $MC_VERSION --download-server
@@ -192,36 +222,6 @@ elif [ $MC_TYPE = "quilt" ]; then
 			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 	fi
 
-elif [ $MC_TYPE = "bukkit" ]; then
-    echo "INFO ! Bukkit Selected"
-	if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
-		then
-			echo " "
-			echo "INFO ! craftbukkit-$MC_VERSION.jar found starting now."
-		else
-			echo " "
-			echo "WARNING ! craftbukkit-$MC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir -p $MC_DIR/old-server-versions/
-			mv $MC_DIR/*.jar $MC_DIR/old-server-versions/
-			mv $MC_DIR/*.log $MC_DIR/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
-			chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
-	fi
-	# Looking for run-$MC_TYPE-$MC_VERSION.sh
-	if [ -e $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh ]
-		then
-			echo " "
-			echo "INFO ! run-$MC_TYPE-$MC_VERSION.sh found ... will use existing file."
-		else
-			echo " "
-			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will download now."
-			mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_BUKKIT_RUN_FILE -O $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
-			chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
-	fi
-
 else
     echo "ERROR ! MC_TYPE must be set first run"
     sleep infinity