diff --git a/DBRepair.sh b/bash/DBRepair.sh
similarity index 100%
rename from DBRepair.sh
rename to bash/DBRepair.sh
diff --git a/HostConfig.sh b/bash/HostConfig.sh
similarity index 100%
rename from HostConfig.sh
rename to bash/HostConfig.sh
diff --git a/claimpms.sh b/bash/claimpms.sh
similarity index 100%
rename from claimpms.sh
rename to bash/claimpms.sh
diff --git a/plex-analyze.sh b/bash/plex-analyze.sh
similarity index 100%
rename from plex-analyze.sh
rename to bash/plex-analyze.sh
diff --git a/plex-cleanbundles.sh b/bash/plex-cleanbundles.sh
similarity index 100%
rename from plex-cleanbundles.sh
rename to bash/plex-cleanbundles.sh
diff --git a/plex-emptytrash.sh b/bash/plex-emptytrash.sh
similarity index 100%
rename from plex-emptytrash.sh
rename to bash/plex-emptytrash.sh
diff --git a/plex-freshen.sh b/bash/plex-freshen.sh
similarity index 100%
rename from plex-freshen.sh
rename to bash/plex-freshen.sh
diff --git a/plex-library-stats.sh b/bash/plex-library-stats.sh
similarity index 100%
rename from plex-library-stats.sh
rename to bash/plex-library-stats.sh
diff --git a/plex-refreshmetadata.sh b/bash/plex-refreshmetadata.sh
similarity index 100%
rename from plex-refreshmetadata.sh
rename to bash/plex-refreshmetadata.sh
diff --git a/plex-sqlite.sh b/bash/plex-sqlite.sh
similarity index 100%
rename from plex-sqlite.sh
rename to bash/plex-sqlite.sh
diff --git a/plex-token.sh b/bash/plex-token.sh
similarity index 100%
rename from plex-token.sh
rename to bash/plex-token.sh
diff --git a/plex-tools.sh b/plex-tools.sh
index 567558c..9bdee0f 100644
--- a/plex-tools.sh
+++ b/plex-tools.sh
@@ -2,22 +2,21 @@
 
 echo "Welcome to plex-tools wrapper utility!"
 
-echo "$PWD"
-exit
+script_dir="$PWD"
 
 case "$1" in
-    token) source ./plex-token.sh;;
-    freshen) source ./plex-freshen.sh;;
-    trash) source ./plex-emptytrash.sh;;
-    analyze) source ./plex-analyze.sh;;
-    bundles) source ./plex-cleanbundles.sh;;
-    metadata) source ./plex-refreshmetadata.sh;;
-    claim) source ./claimpms.sh;;
-    sqlite) source ./plex-sqlite.sh;;
-    dbrepair) source ./DBRepair.sh stop auto start exit;;
-    start) source ./DBRepair.sh start exit;;
-    stop) source ./DBRepair.sh stop exit;;
-    restart) source ./DBRepair.sh stop start exit;;
+    token) source "$script_dir"/bash/plex-token.sh;;
+    freshen) source "$script_dir"/bash/plex-freshen.sh;;
+    trash) source "$script_dir"/bash/plex-emptytrash.sh;;
+    analyze) source "$script_dir"/bash/plex-analyze.sh;;
+    bundles) source "$script_dir"/bash/plex-cleanbundles.sh;;
+    metadata) source "$script_dir"/bash/plex-refreshmetadata.sh;;
+    claim) source "$script_dir"/bash/claimpms.sh;;
+    sqlite) source "$script_dir"/bash/plex-sqlite.sh;;
+    dbrepair) source "$script_dir"/bash/DBRepair.sh stop auto start exit;;
+    start) source "$script_dir"/bash/DBRepair.sh start exit;;
+    stop) source "$script_dir"/bash/DBRepair.sh stop exit;;
+    restart) source "$script_dir"/bash/DBRepair.sh stop start exit;;
     "") echo "No plex-tools command given";;
     *) echo "'$1' is not a valid plex-tools command";;
 esac
diff --git a/remove_lonely_collections.py b/python/remove_lonely_collections.py
similarity index 100%
rename from remove_lonely_collections.py
rename to python/remove_lonely_collections.py