diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 07e48ba..c89fd00 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -21,7 +21,7 @@ jobs:
     - run: rm -f bin/.gitkeep
       name: clean-bin-folder
       
-    - run: ./rebuild_linux_docker.sh
+    - run: ./scripts/rebuild_linux_docker.sh
       name: build-for-linux
       
     - uses: actions/upload-artifact@master
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 2c90a2c..ea07ad2 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -21,7 +21,7 @@ jobs:
     - run: rm -f bin/.gitkeep
       name: clean-bin-folder
       
-    - run: ./rebuild_osxcross_docker.sh
+    - run: ./scripts/rebuild_osxcross_docker.sh
       name: build-for-mac
       
     - uses: actions/upload-artifact@master
diff --git a/.github/workflows/mac_native.yml b/.github/workflows/mac_native.yml
index b77216f..bba3a03 100644
--- a/.github/workflows/mac_native.yml
+++ b/.github/workflows/mac_native.yml
@@ -22,7 +22,7 @@ jobs:
          setup-python: false
          py7zrversion: '==0.18.1'
       
-    - run: ./build_macos_native.sh
+    - run: ./scripts/build_macos_native.sh
       name: build-for-mac
 
     - uses: actions/upload-artifact@master
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index c71d9ac..6a758fb 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -65,13 +65,13 @@ jobs:
     - run: rm -f bin/.gitkeep
       name: clean-bin-folder
       
-    - run: ./rebuild_linux_with_gui_docker.sh
+    - run: ./scripts/rebuild_linux_with_gui_docker.sh
       name: build-for-linux
       
-    - run: ./rebuild_mxe_with_gui_docker.sh
+    - run: ./scripts/rebuild_mxe_with_gui_docker.sh
       name: build-for-win64
       
-    - run: ./rebuild_mxe32_with_gui_docker.sh
+    - run: ./scripts/rebuild_mxe32_with_gui_docker.sh
       name: build-for-win32
     
     - name: Upload Linux Build
@@ -128,7 +128,7 @@ jobs:
         setup-python: false
         py7zrversion: '==0.18.1'
       
-    - run: ./build_macos_native.sh
+    - run: ./scripts/build_macos_native.sh
       name: build-for-mac
     
     - name: Upload Mac Build
diff --git a/.github/workflows/windows_32.yml b/.github/workflows/windows_32.yml
index fd0e244..a7b3ea8 100644
--- a/.github/workflows/windows_32.yml
+++ b/.github/workflows/windows_32.yml
@@ -21,7 +21,7 @@ jobs:
     - run: rm -f bin/.gitkeep
       name: clean-bin-folder
       
-    - run: ./rebuild_mxe32_docker.sh
+    - run: ./scripts/rebuild_mxe32_docker.sh
       name: build-for-windows
       
     - uses: actions/upload-artifact@master
diff --git a/.github/workflows/windows_64.yml b/.github/workflows/windows_64.yml
index db3c2ac..a9b66c6 100644
--- a/.github/workflows/windows_64.yml
+++ b/.github/workflows/windows_64.yml
@@ -21,7 +21,7 @@ jobs:
     - run: rm -f bin/.gitkeep
       name: clean-bin-folder
       
-    - run: ./rebuild_mxe_docker.sh
+    - run: ./scripts/rebuild_mxe_docker.sh
       name: build-for-windows
       
     - uses: actions/upload-artifact@master
diff --git a/.github/workflows/windows_xp_gui.yml b/.github/workflows/windows_xp_gui.yml
index e9e9ea7..e971b3a 100644
--- a/.github/workflows/windows_xp_gui.yml
+++ b/.github/workflows/windows_xp_gui.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@master
       name: checkout
 
-    - run: ./build_gui_winxp.bat
+    - run: ./scripts/build_gui_winxp.bat
       name: build-xp-gui
 
     - uses: actions/upload-artifact@master
diff --git a/docs/COMPILING.md b/docs/COMPILING.md
index b010f8a..fe185b6 100644
--- a/docs/COMPILING.md
+++ b/docs/COMPILING.md
@@ -24,17 +24,17 @@ docker build -t justdan96/tsmuxer_build .
 
 *Linux*
 ```
-docker run -it --rm -v $(pwd):/workdir -w="/workdir" justdan96/tsmuxer_build bash -c ". rebuild_linux_docker.sh"
+docker run -it --rm -v $(pwd):/workdir -w="/workdir" justdan96/tsmuxer_build bash -c ". scripts/rebuild_linux_docker.sh"
 ```
 
 *Windows*
 ```
-docker run -it --rm -v $(pwd):/workdir -w="/workdir" justdan96/tsmuxer_build bash -c ". rebuild_mxe_docker.sh"
+docker run -it --rm -v $(pwd):/workdir -w="/workdir" justdan96/tsmuxer_build bash -c ". scripts/rebuild_mxe_docker.sh"
 ```
 
 *OSX*
 ```
-docker run -it --rm -v $(pwd):/workdir -w="/workdir" justdan96/tsmuxer_build bash -c ". rebuild_osxcross_docker.sh"
+docker run -it --rm -v $(pwd):/workdir -w="/workdir" justdan96/tsmuxer_build bash -c ". scripts/rebuild_osxcross_docker.sh"
 ```
 
 The executable binary will be saved to the "\bin" folder.
@@ -98,14 +98,14 @@ Open the folder where the git repo is stored in a terminal and run the following
 
 ```
 # build the project
-./rebuild_linux.sh
+./scripts/rebuild_linux.sh
 ```
 
 Or run the following to build the GUI as well:
 
 ```
 # build the project
-./rebuild_linux_with_gui.sh
+./scripts/rebuild_linux_with_gui.sh
 ```
 
 Next run the below to create a DEB file:
@@ -186,14 +186,14 @@ Open the folder where the git repo is stored in a terminal and run the following
 
 ```
 # build the project
-./rebuild_mxe.sh
+./scripts/rebuild_mxe.sh
 ```
 
 Or run the following to build the GUI as well:
 
 ```
 # build the project
-./rebuild_mxe_with_gui.sh
+./scripts/rebuild_mxe_with_gui.sh
 ```
 
 ## Windows (Msys2)
@@ -211,7 +211,7 @@ git
 
 Or just run:
 ```
-./rebuild_msys2.sh
+./scripts/rebuild_msys2.sh
 ```
 
 Close the Msys2 prompt and then open either a Mingw32 or a Mingw64 prompt, depending on whether you want to build for 32 or 64 bit.
@@ -242,14 +242,14 @@ cd tsMuxer
 ```
 Compile tsMuxer by run:
 ```
-./rebuild_linux.sh
+./scripts/rebuild_linux.sh
 ```
 
 This will create in tsMuxer/bin statically compiled versions of tsMuxer - so no external DLL files are required.
 
 Or just run:
 ```
-./rebuild_msys2.sh
+./scripts/rebuild_msys2.sh
 ```
 
 This will create in tsMuxer/bin statically compiled versions of tsMuxer and tsMuxerGUI - so no external DLL files are required.
@@ -327,14 +327,14 @@ Open the folder where the git repo is stored in a terminal and run the following
 
 ```
 # build the project
-./rebuild_osxcross.sh
+./scripts/rebuild_osxcross.sh
 ```
 
 Or run the following to build the GUI as well:
 
 ```
 # build the project
-./rebuild_osxcross_with_gui.sh
+./scripts/rebuild_osxcross_with_gui.sh
 ```
 
 ## MacOS (Native)
@@ -373,4 +373,4 @@ rm -f get-pip.py
 rm -rf ./6.2.2
 ```
 
-With all of those requirements met we can now compile the programs. Simply run `./build_macos_native.sh` from the repository folder. Upon completion the executables will be available in the ./build/bin folder.
+With all of those requirements met we can now compile the programs. Simply run `./scripts/build_macos_native.sh` from the repository folder. Upon completion the executables will be available in the ./build/bin folder.
diff --git a/build_gui_winxp.bat b/scripts/build_gui_winxp.bat
similarity index 100%
rename from build_gui_winxp.bat
rename to scripts/build_gui_winxp.bat
diff --git a/build_macos_native.sh b/scripts/build_macos_native.sh
similarity index 100%
rename from build_macos_native.sh
rename to scripts/build_macos_native.sh
diff --git a/rebuild_linux.sh b/scripts/rebuild_linux.sh
similarity index 100%
rename from rebuild_linux.sh
rename to scripts/rebuild_linux.sh
diff --git a/rebuild_linux_docker.sh b/scripts/rebuild_linux_docker.sh
similarity index 100%
rename from rebuild_linux_docker.sh
rename to scripts/rebuild_linux_docker.sh
diff --git a/rebuild_linux_with_gui.sh b/scripts/rebuild_linux_with_gui.sh
similarity index 100%
rename from rebuild_linux_with_gui.sh
rename to scripts/rebuild_linux_with_gui.sh
diff --git a/rebuild_linux_with_gui_docker.sh b/scripts/rebuild_linux_with_gui_docker.sh
similarity index 100%
rename from rebuild_linux_with_gui_docker.sh
rename to scripts/rebuild_linux_with_gui_docker.sh
diff --git a/rebuild_msys2.sh b/scripts/rebuild_msys2.sh
similarity index 100%
rename from rebuild_msys2.sh
rename to scripts/rebuild_msys2.sh
diff --git a/rebuild_mxe.sh b/scripts/rebuild_mxe.sh
similarity index 100%
rename from rebuild_mxe.sh
rename to scripts/rebuild_mxe.sh
diff --git a/rebuild_mxe32_docker.sh b/scripts/rebuild_mxe32_docker.sh
similarity index 100%
rename from rebuild_mxe32_docker.sh
rename to scripts/rebuild_mxe32_docker.sh
diff --git a/rebuild_mxe32_with_gui_docker.sh b/scripts/rebuild_mxe32_with_gui_docker.sh
similarity index 100%
rename from rebuild_mxe32_with_gui_docker.sh
rename to scripts/rebuild_mxe32_with_gui_docker.sh
diff --git a/rebuild_mxe_docker.sh b/scripts/rebuild_mxe_docker.sh
similarity index 100%
rename from rebuild_mxe_docker.sh
rename to scripts/rebuild_mxe_docker.sh
diff --git a/rebuild_mxe_with_gui.sh b/scripts/rebuild_mxe_with_gui.sh
similarity index 100%
rename from rebuild_mxe_with_gui.sh
rename to scripts/rebuild_mxe_with_gui.sh
diff --git a/rebuild_mxe_with_gui_docker.sh b/scripts/rebuild_mxe_with_gui_docker.sh
similarity index 100%
rename from rebuild_mxe_with_gui_docker.sh
rename to scripts/rebuild_mxe_with_gui_docker.sh
diff --git a/rebuild_osxcross.sh b/scripts/rebuild_osxcross.sh
similarity index 100%
rename from rebuild_osxcross.sh
rename to scripts/rebuild_osxcross.sh
diff --git a/rebuild_osxcross_docker.sh b/scripts/rebuild_osxcross_docker.sh
similarity index 100%
rename from rebuild_osxcross_docker.sh
rename to scripts/rebuild_osxcross_docker.sh
diff --git a/rebuild_osxcross_with_gui.sh b/scripts/rebuild_osxcross_with_gui.sh
similarity index 100%
rename from rebuild_osxcross_with_gui.sh
rename to scripts/rebuild_osxcross_with_gui.sh
diff --git a/rebuild_osxcross_with_gui_docker.sh b/scripts/rebuild_osxcross_with_gui_docker.sh
similarity index 100%
rename from rebuild_osxcross_with_gui_docker.sh
rename to scripts/rebuild_osxcross_with_gui_docker.sh