diff --git a/ConfigureNotificationsForArchive.md b/doc/ConfigureNotificationsForArchive.md
similarity index 100%
rename from ConfigureNotificationsForArchive.md
rename to doc/ConfigureNotificationsForArchive.md
diff --git a/GetShellWithoutMonitorOnLinux.md b/doc/GetShellWithoutMonitorOnLinux.md
similarity index 100%
rename from GetShellWithoutMonitorOnLinux.md
rename to doc/GetShellWithoutMonitorOnLinux.md
diff --git a/GetShellWithoutMonitorOnWindows.md b/doc/GetShellWithoutMonitorOnWindows.md
similarity index 100%
rename from GetShellWithoutMonitorOnWindows.md
rename to doc/GetShellWithoutMonitorOnWindows.md
diff --git a/SetupRSync.md b/doc/SetupRSync.md
similarity index 100%
rename from SetupRSync.md
rename to doc/SetupRSync.md
diff --git a/archive-teslacam-clips b/run/archive-teslacam-clips
similarity index 100%
rename from archive-teslacam-clips
rename to run/archive-teslacam-clips
diff --git a/archiveloop b/run/archiveloop
similarity index 100%
rename from archiveloop
rename to run/archiveloop
diff --git a/cifs_archive/archive-clips.sh b/run/cifs_archive/archive-clips.sh
similarity index 100%
rename from cifs_archive/archive-clips.sh
rename to run/cifs_archive/archive-clips.sh
diff --git a/cifs_archive/configure-archive.sh b/run/cifs_archive/configure-archive.sh
similarity index 100%
rename from cifs_archive/configure-archive.sh
rename to run/cifs_archive/configure-archive.sh
diff --git a/cifs_archive/connect-archive.sh b/run/cifs_archive/connect-archive.sh
similarity index 100%
rename from cifs_archive/connect-archive.sh
rename to run/cifs_archive/connect-archive.sh
diff --git a/cifs_archive/disconnect-archive.sh b/run/cifs_archive/disconnect-archive.sh
similarity index 100%
rename from cifs_archive/disconnect-archive.sh
rename to run/cifs_archive/disconnect-archive.sh
diff --git a/cifs_archive/verify-archive-configuration.sh b/run/cifs_archive/verify-archive-configuration.sh
similarity index 100%
rename from cifs_archive/verify-archive-configuration.sh
rename to run/cifs_archive/verify-archive-configuration.sh
diff --git a/cifs_archive/write-archive-credentials-to.sh b/run/cifs_archive/write-archive-credentials-to.sh
similarity index 100%
rename from cifs_archive/write-archive-credentials-to.sh
rename to run/cifs_archive/write-archive-credentials-to.sh
diff --git a/get-archiveserver-ip-address.sh b/run/get-archiveserver-ip-address.sh
similarity index 100%
rename from get-archiveserver-ip-address.sh
rename to run/get-archiveserver-ip-address.sh
diff --git a/remountfs_rw b/run/remountfs_rw
similarity index 100%
rename from remountfs_rw
rename to run/remountfs_rw
diff --git a/rsync_archive/archive-clips.sh b/run/rsync_archive/archive-clips.sh
similarity index 100%
rename from rsync_archive/archive-clips.sh
rename to run/rsync_archive/archive-clips.sh
diff --git a/rsync_archive/configure-archive.sh b/run/rsync_archive/configure-archive.sh
similarity index 100%
rename from rsync_archive/configure-archive.sh
rename to run/rsync_archive/configure-archive.sh
diff --git a/rsync_archive/connect-archive.sh b/run/rsync_archive/connect-archive.sh
similarity index 100%
rename from rsync_archive/connect-archive.sh
rename to run/rsync_archive/connect-archive.sh
diff --git a/rsync_archive/disconnect-archive.sh b/run/rsync_archive/disconnect-archive.sh
similarity index 100%
rename from rsync_archive/disconnect-archive.sh
rename to run/rsync_archive/disconnect-archive.sh
diff --git a/rsync_archive/verify-archive-configuration.sh b/run/rsync_archive/verify-archive-configuration.sh
similarity index 100%
rename from rsync_archive/verify-archive-configuration.sh
rename to run/rsync_archive/verify-archive-configuration.sh
diff --git a/send-pushover b/run/send-pushover
similarity index 100%
rename from send-pushover
rename to run/send-pushover
diff --git a/setup-piForHeadlessConfig.sh b/setup/macos_linux/setup-piForHeadlessConfig.sh
similarity index 100%
rename from setup-piForHeadlessConfig.sh
rename to setup/macos_linux/setup-piForHeadlessConfig.sh
diff --git a/create-backingfiles-partition.sh b/setup/pi/create-backingfiles-partition.sh
similarity index 100%
rename from create-backingfiles-partition.sh
rename to setup/pi/create-backingfiles-partition.sh
diff --git a/create-backingfiles.sh b/setup/pi/create-backingfiles.sh
similarity index 100%
rename from create-backingfiles.sh
rename to setup/pi/create-backingfiles.sh
diff --git a/make-root-fs-readonly.sh b/setup/pi/make-root-fs-readonly.sh
similarity index 100%
rename from make-root-fs-readonly.sh
rename to setup/pi/make-root-fs-readonly.sh
diff --git a/setup-teslausb b/setup/pi/setup-teslausb
similarity index 100%
rename from setup-teslausb
rename to setup/pi/setup-teslausb
diff --git a/setup-piForHeadlessConfig.ps1 b/setup/windows/setup-piForHeadlessConfig.ps1
similarity index 100%
rename from setup-piForHeadlessConfig.ps1
rename to setup/windows/setup-piForHeadlessConfig.ps1
diff --git a/windows_setup/setup-piForHeadlessConfigAddWifi.ps1 b/setup/windows/setup-piForHeadlessConfigAddWifi.ps1
similarity index 100%
rename from windows_setup/setup-piForHeadlessConfigAddWifi.ps1
rename to setup/windows/setup-piForHeadlessConfigAddWifi.ps1