diff --git a/profiles/DerGeret/Windows/Backup.ps1 b/profiles/DerGeret/Windows/Backup.ps1
index 402ff066a..02c374da6 100644
--- a/profiles/DerGeret/Windows/Backup.ps1
+++ b/profiles/DerGeret/Windows/Backup.ps1
@@ -1,6 +1,6 @@
 #!/bin/pwsh
 $null = New-Module {
-    . "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
+    . "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
     . "$PSScriptRoot/../../../scripts/Windows/OS/Manage.ps1";
 
     Write-Host "Starting Backup of Windows";
diff --git a/profiles/DerGeret/Windows/Drivers.ps1 b/profiles/DerGeret/Windows/Drivers.ps1
index b0f0236bb..0ef24d23f 100644
--- a/profiles/DerGeret/Windows/Drivers.ps1
+++ b/profiles/DerGeret/Windows/Drivers.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
 
 function Install-PortValhallaDrivers {
     param(
diff --git a/profiles/DerGeret/Windows/Restore.ps1 b/profiles/DerGeret/Windows/Restore.ps1
index 7e707e4ea..baa71f11c 100644
--- a/profiles/DerGeret/Windows/Restore.ps1
+++ b/profiles/DerGeret/Windows/Restore.ps1
@@ -1,8 +1,8 @@
 #!/bin/pwsh
 . "$PSScriptRoot/Drivers.ps1";
+. "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
 . "$PSScriptRoot/../../../scripts/Windows/Collections/Personal.ps1"
 . "$PSScriptRoot/../../../scripts/Windows/OS/Install.ps1";
-. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
 
 function Initialize-Configuration {
     # Fix synchronization between Linux and Windows clock
diff --git a/profiles/Generic/Windows/Install.ps1 b/profiles/Generic/Windows/Install.ps1
index f3fc26ad4..708f1d783 100644
--- a/profiles/Generic/Windows/Install.ps1
+++ b/profiles/Generic/Windows/Install.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../../scripts/Windows/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../scripts/Common/Scripts/Context.ps1";
 . "$PSScriptRoot/../../../scripts/Windows/OS/Install.ps1";
 . "$PSScriptRoot/../../../scripts/Windows/Collections/Generic.ps1"
 
diff --git a/scripts/Windows/Scripts/BrowserAutomation.ps1 b/scripts/Common/Scripts/BrowserAutomation.ps1
similarity index 100%
rename from scripts/Windows/Scripts/BrowserAutomation.ps1
rename to scripts/Common/Scripts/BrowserAutomation.ps1
diff --git a/scripts/Windows/Scripts/Config.ps1 b/scripts/Common/Scripts/Config.ps1
similarity index 100%
rename from scripts/Windows/Scripts/Config.ps1
rename to scripts/Common/Scripts/Config.ps1
diff --git a/scripts/Windows/Scripts/Context.ps1 b/scripts/Common/Scripts/Context.ps1
similarity index 99%
rename from scripts/Windows/Scripts/Context.ps1
rename to scripts/Common/Scripts/Context.ps1
index 2f91358f0..30ea877e6 100644
--- a/scripts/Windows/Scripts/Context.ps1
+++ b/scripts/Common/Scripts/Context.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/Entrypoints.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Entrypoints.ps1";
 . "$PSScriptRoot/../../Common/Software/PowerShell/profile.ps1";
 
 class Context {
diff --git a/scripts/Windows/Scripts/Entrypoints.ps1 b/scripts/Common/Scripts/Entrypoints.ps1
similarity index 100%
rename from scripts/Windows/Scripts/Entrypoints.ps1
rename to scripts/Common/Scripts/Entrypoints.ps1
diff --git a/scripts/Windows/Scripts/Operations.ps1 b/scripts/Common/Scripts/Operations.ps1
similarity index 100%
rename from scripts/Windows/Scripts/Operations.ps1
rename to scripts/Common/Scripts/Operations.ps1
diff --git a/scripts/Windows/Scripts/Scripting.ps1 b/scripts/Common/Scripts/Scripting.ps1
similarity index 100%
rename from scripts/Windows/Scripts/Scripting.ps1
rename to scripts/Common/Scripts/Scripting.ps1
diff --git a/scripts/Windows/Scripts/Software.ps1 b/scripts/Common/Scripts/Software.ps1
similarity index 100%
rename from scripts/Windows/Scripts/Software.ps1
rename to scripts/Common/Scripts/Software.ps1
diff --git a/scripts/Windows/Scripts/SoftwareManagement.ps1 b/scripts/Common/Scripts/SoftwareManagement.ps1
similarity index 100%
rename from scripts/Windows/Scripts/SoftwareManagement.ps1
rename to scripts/Common/Scripts/SoftwareManagement.ps1
diff --git a/scripts/Windows/Scripts/System.ps1 b/scripts/Common/Scripts/System.ps1
similarity index 100%
rename from scripts/Windows/Scripts/System.ps1
rename to scripts/Common/Scripts/System.ps1
diff --git a/scripts/Common/Software/PowerShell/Manage.ps1 b/scripts/Common/Software/PowerShell/Manage.ps1
index 7b40bf2b6..be995d7d8 100644
--- a/scripts/Common/Software/PowerShell/Manage.ps1
+++ b/scripts/Common/Software/PowerShell/Manage.ps1
@@ -3,9 +3,9 @@ param (
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../../Windows/Scripts/Software.ps1";
-. "$PSScriptRoot/../../../Windows/Scripts/Scripting.ps1";
-. "$PSScriptRoot/../../../Windows/Types/InstallerAction.ps1";
+. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../Scripts/Scripting.ps1";
+. "$PSScriptRoot/../../Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Types/InstallerAction.ps1 b/scripts/Common/Types/InstallerAction.ps1
similarity index 100%
rename from scripts/Windows/Types/InstallerAction.ps1
rename to scripts/Common/Types/InstallerAction.ps1
diff --git a/scripts/Windows/Collections/Generic.ps1 b/scripts/Windows/Collections/Generic.ps1
index f89c8fe24..14f7236f1 100644
--- a/scripts/Windows/Collections/Generic.ps1
+++ b/scripts/Windows/Collections/Generic.ps1
@@ -1,6 +1,4 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../Scripts/Context.ps1";
-. "$PSScriptRoot/../Scripts/SoftwareManagement.ps1";
 . "$PSScriptRoot/../Software/Firefox/Install.ps1";
 . "$PSScriptRoot/../Software/git/Manage.ps1";
 . "$PSScriptRoot/../Software/LGHub/Manage.ps1";
@@ -13,6 +11,8 @@
 . "$PSScriptRoot/../Software/TrackMania Nations Forever/Manage.ps1";
 . "$PSScriptRoot/../Software/TrackMania United Forever/Manage.ps1";
 . "$PSScriptRoot/../Software/VisualStudio/Manage.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1";
 
 function Backup-GenericApps([Context] $context) {
     Backup-Git $context;
diff --git a/scripts/Windows/Collections/Personal.ps1 b/scripts/Windows/Collections/Personal.ps1
index 968eda848..35389c6ae 100644
--- a/scripts/Windows/Collections/Personal.ps1
+++ b/scripts/Windows/Collections/Personal.ps1
@@ -1,7 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../Scripts/Context.ps1";
 . "$PSScriptRoot/Generic.ps1";
-. "$PSScriptRoot/../Scripts/SoftwareManagement.ps1";
 . "$PSScriptRoot/../Software/Firefox/Install.ps1";
 . "$PSScriptRoot/../Software/git/Manage.ps1";
 . "$PSScriptRoot/../Software/LGHub/Manage.ps1";
@@ -14,6 +12,8 @@
 . "$PSScriptRoot/../Software/TrackMania Nations Forever/Manage.ps1";
 . "$PSScriptRoot/../Software/TrackMania United Forever/Manage.ps1";
 . "$PSScriptRoot/../Software/VisualStudio/Manage.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1";
 
 function Backup-PersonalApps([Context] $context) {
     Backup-GenericApps $context;
diff --git a/scripts/Windows/Config/Windows/Install.ps1 b/scripts/Windows/Config/Windows/Install.ps1
index ec0a8b1b1..a272052a8 100644
--- a/scripts/Windows/Config/Windows/Install.ps1
+++ b/scripts/Windows/Config/Windows/Install.ps1
@@ -1,7 +1,7 @@
 #!/bin/pwsh
 param($context)
 
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 [Context] $context = $context;
 $tempDir = $context.GetTempDirectory();
diff --git a/scripts/Windows/Drivers/AMDChipsetX399/Manage.ps1 b/scripts/Windows/Drivers/AMDChipsetX399/Manage.ps1
index ee2ff3904..d7fe2065a 100644
--- a/scripts/Windows/Drivers/AMDChipsetX399/Manage.ps1
+++ b/scripts/Windows/Drivers/AMDChipsetX399/Manage.ps1
@@ -3,7 +3,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Drivers/Predator Z301C/Install.ps1 b/scripts/Windows/Drivers/Predator Z301C/Install.ps1
index 5baa3c756..4eaeab48e 100644
--- a/scripts/Windows/Drivers/Predator Z301C/Install.ps1	
+++ b/scripts/Windows/Drivers/Predator Z301C/Install.ps1	
@@ -2,7 +2,7 @@
 param($context)
 
 
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 [Context]$context = $context;
 
 $tempDir = $context.GetTempDirectory();
diff --git a/scripts/Windows/Drivers/Predator Z301C/Manage.ps1 b/scripts/Windows/Drivers/Predator Z301C/Manage.ps1
index a54c40f31..933089f9f 100644
--- a/scripts/Windows/Drivers/Predator Z301C/Manage.ps1	
+++ b/scripts/Windows/Drivers/Predator Z301C/Manage.ps1	
@@ -3,7 +3,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 . "$PSScriptRoot/../../Scripts/System.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Manage.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Manage.ps1
index 8353838c5..8322cfdd9 100644
--- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Manage.ps1	
+++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Manage.ps1	
@@ -3,7 +3,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Manage.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Manage.ps1
index 380ad0406..27ae8e71f 100644
--- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Manage.ps1	
+++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Manage.ps1	
@@ -3,7 +3,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Manage.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Manage.ps1
index 3f6876bc4..1daaf378d 100644
--- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Manage.ps1	
+++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Manage.ps1	
@@ -3,7 +3,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Manage.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Manage.ps1
index 2d88ea293..791c49bd3 100644
--- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Manage.ps1	
+++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Manage.ps1	
@@ -3,7 +3,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Drivers/Tobii EyeX/Install.ps1 b/scripts/Windows/Drivers/Tobii EyeX/Install.ps1
index 775c5968b..3fde2a88e 100644
--- a/scripts/Windows/Drivers/Tobii EyeX/Install.ps1	
+++ b/scripts/Windows/Drivers/Tobii EyeX/Install.ps1	
@@ -1,6 +1,6 @@
 #!/bin/bash
 param($context)
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/SoftwareManagement.ps1";
 
 Write-Host "Installing Tobii Eye Tracking";
 Install-SoftwarePackage $context "https://files.update.tech.tobii.com/Tobii_Eye_Tracking_Core_v2.16.8.214_x86.exe";
diff --git a/scripts/Windows/Drivers/Tobii EyeX/Manage.ps1 b/scripts/Windows/Drivers/Tobii EyeX/Manage.ps1
index 78df2de70..1c909f112 100644
--- a/scripts/Windows/Drivers/Tobii EyeX/Manage.ps1	
+++ b/scripts/Windows/Drivers/Tobii EyeX/Manage.ps1	
@@ -3,7 +3,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/OS/Install.ps1 b/scripts/Windows/OS/Install.ps1
index 5c8737112..73d1e7880 100644
--- a/scripts/Windows/OS/Install.ps1
+++ b/scripts/Windows/OS/Install.ps1
@@ -3,18 +3,18 @@
 
 . "$PSScriptRoot/Manage.ps1";
 . "$PSScriptRoot/User/Install.ps1";
-. "$PSScriptRoot/../Scripts/Context.ps1";
 . "$PSScriptRoot/../Software/Firefox/Install.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
-    . "$PSScriptRoot/../Scripts/Config.ps1";
     . "$PSScriptRoot/../Scripts/Hooks.ps1";
-    . "$PSScriptRoot/../Scripts/Operations.ps1";
     . "$PSScriptRoot/../Scripts/PowerManagement.ps1";
-    . "$PSScriptRoot/../Scripts/Software.ps1";
-    . "$PSScriptRoot/../Scripts/SoftwareManagement.ps1";
     . "$PSScriptRoot/../Scripts/Update.ps1";
-    . "$PSScriptRoot/../Types/InstallerAction.ps1";
+    . "$PSScriptRoot/../../Common/Scripts/Config.ps1";
+    . "$PSScriptRoot/../../Common/Scripts/Operations.ps1";
+    . "$PSScriptRoot/../../Common/Scripts/Software.ps1";
+    . "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1";
+    . "$PSScriptRoot/../../Common/Types/InstallerAction.ps1";
 
     <#
         .SYNOPSIS
diff --git a/scripts/Windows/OS/Manage.ps1 b/scripts/Windows/OS/Manage.ps1
index 624e387c6..e648798da 100644
--- a/scripts/Windows/OS/Manage.ps1
+++ b/scripts/Windows/OS/Manage.ps1
@@ -1,9 +1,9 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../Scripts/Context.ps1";
 . "$PSScriptRoot/../Scripts/PersonalFiles.ps1";
 . "$PSScriptRoot/../Software/Firefox/Install.ps1";
 . "$PSScriptRoot/../Software/Nextcloud/Manage.ps1";
 . "$PSScriptRoot/../Collections/Personal.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
 
 function Backup-WindowsInstallation([Context] $context) {
     Write-Information "Backing up Windows";
diff --git a/scripts/Windows/OS/Setup.ps1 b/scripts/Windows/OS/Setup.ps1
index 7bf71dc4c..8bba1c8dd 100644
--- a/scripts/Windows/OS/Setup.ps1
+++ b/scripts/Windows/OS/Setup.ps1
@@ -1,8 +1,8 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../Scripts/Scripting.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Scripting.ps1";
 
 function Start-Setup {
-    . "$PSScriptRoot/../Scripts/Scripting.ps1";
+    . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1";
     $Global:InformationPreference = "Continue";
     $Global:ErrorActionPreference = "Inquire";
     $null = $env:WIN_COMPUTER_NAME;
diff --git a/scripts/Windows/OS/Upgrade.ps1 b/scripts/Windows/OS/Upgrade.ps1
index 9c6a4aa86..2150c859a 100644
--- a/scripts/Windows/OS/Upgrade.ps1
+++ b/scripts/Windows/OS/Upgrade.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../Scripts/Context.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
 
 function Update-WindowsInstallation([Context] $context)
 {
diff --git a/scripts/Windows/OS/User/Add.ps1 b/scripts/Windows/OS/User/Add.ps1
index be5a30c04..d38abeacd 100644
--- a/scripts/Windows/OS/User/Add.ps1
+++ b/scripts/Windows/OS/User/Add.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-$contextScript = "$PSScriptRoot/../../Scripts/Context.ps1";
+$contextScript = "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 . "$contextScript";
 $preparedUsernameProperty = "AutoLoginUser";
 $preparedPasswordProperty = "AutoLoginPassword";
diff --git a/scripts/Windows/OS/User/AutoLogin.ps1 b/scripts/Windows/OS/User/AutoLogin.ps1
index f6970ede4..53c338fda 100644
--- a/scripts/Windows/OS/User/AutoLogin.ps1
+++ b/scripts/Windows/OS/User/AutoLogin.ps1
@@ -5,7 +5,7 @@ param(
     [string]$PreparedSecretProperty
 );
 
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 $context = [Context]::new();
 $userName = $context.Get($PreparedUsernameProperty);
 $password = $context.Get($PreparedSecretProperty);
diff --git a/scripts/Windows/OS/User/Install.ps1 b/scripts/Windows/OS/User/Install.ps1
index d279df44f..bf24dd9f5 100644
--- a/scripts/Windows/OS/User/Install.ps1
+++ b/scripts/Windows/OS/User/Install.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 . "$PSScriptRoot/Add.ps1";
 
 function Install-PersonalUsers([Context] $context) {
diff --git a/scripts/Windows/OS/User/UACDisabler.ps1 b/scripts/Windows/OS/User/UACDisabler.ps1
index 172f5cf62..ad257d843 100644
--- a/scripts/Windows/OS/User/UACDisabler.ps1
+++ b/scripts/Windows/OS/User/UACDisabler.ps1
@@ -7,7 +7,7 @@ param (
     [string]$UACDisablerTriggerProperty
 );
 
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 $context = [Context]::new();
 $context.SetUACState($false);
 Unregister-ScheduledTask -Confirm:$false $UACDisablerTaskName;
diff --git a/scripts/Windows/Scripts/AmdSoftwarePackage.ps1 b/scripts/Windows/Scripts/AmdSoftwarePackage.ps1
index 7e2ecc310..e33a7a3ab 100644
--- a/scripts/Windows/Scripts/AmdSoftwarePackage.ps1
+++ b/scripts/Windows/Scripts/AmdSoftwarePackage.ps1
@@ -1,6 +1,6 @@
 #!/bin/pwsh
-. "$PSScriptRoot/Context.ps1";
-. "$PSScriptRoot/BrowserAutomation.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../Common/Scripts/BrowserAutomation.ps1";
 
 function Install-AmdSoftwarePackage() {
     param(
diff --git a/scripts/Windows/Scripts/AsusSoftwarePackage.ps1 b/scripts/Windows/Scripts/AsusSoftwarePackage.ps1
index 7f6565d4c..d2216807d 100644
--- a/scripts/Windows/Scripts/AsusSoftwarePackage.ps1
+++ b/scripts/Windows/Scripts/AsusSoftwarePackage.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot/Context.ps1";
+. "$PSScriptRoot/../../Common/ScriptsContext.ps1";
 
 function Install-AsusSoftwarePackage([Context] $context, [string] $url) {
     $packageFile = "AsusPackage.zip";
diff --git a/scripts/Windows/Scripts/PersonalFiles.ps1 b/scripts/Windows/Scripts/PersonalFiles.ps1
index 41c5ef17f..0181a0964 100644
--- a/scripts/Windows/Scripts/PersonalFiles.ps1
+++ b/scripts/Windows/Scripts/PersonalFiles.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/Context.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
 
 function Get-BackupCandidates() {
     [System.Collections.Generic.List[System.Tuple[string, string, string[]]]]$candidates = @();
diff --git a/scripts/Windows/Scripts/PowerManagement.ps1 b/scripts/Windows/Scripts/PowerManagement.ps1
index 2a2ce4789..2741bcf9c 100644
--- a/scripts/Windows/Scripts/PowerManagement.ps1
+++ b/scripts/Windows/Scripts/PowerManagement.ps1
@@ -1,7 +1,7 @@
 using namespace Microsoft.Win32;
 
 $null = New-Module {
-    . "$PSScriptRoot/Scripting.ps1";
+    . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1";
     [RegistryKey] $key = $null;
     $runOncePath = "HKLM:\Software\Microsoft\Windows\CurrentVersion\RunOnce";
     $runOnceName = "PortValhalla";
diff --git a/scripts/Windows/Scripts/Prerequisites.ps1 b/scripts/Windows/Scripts/Prerequisites.ps1
index 7494dc886..e320b3685 100644
--- a/scripts/Windows/Scripts/Prerequisites.ps1
+++ b/scripts/Windows/Scripts/Prerequisites.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/Context.ps1";
+. "$PSScriptRoot/../../Common/Scripts/Context.ps1";
 
 [Context]::new().PreventSleepMode();
 $null = powershell -c Get-PackageProvider -ListAvailable NuGet;
diff --git a/scripts/Windows/Software/Ext4Fsd/Install.ps1 b/scripts/Windows/Software/Ext4Fsd/Install.ps1
index 309f00980..e3c4956fb 100644
--- a/scripts/Windows/Software/Ext4Fsd/Install.ps1
+++ b/scripts/Windows/Software/Ext4Fsd/Install.ps1
@@ -1,4 +1,4 @@
 #!/bin/pwsh
 param($context)
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/SoftwareManagement.ps1";
 Install-SoftwarePackage $context "https://github.com/bobranten/Ext4Fsd/releases/download/v0.71/Ext2Fsd-0.71-setup.exe"
diff --git a/scripts/Windows/Software/Firefox/Install.ps1 b/scripts/Windows/Software/Firefox/Install.ps1
index 7a6160f99..c0753c8a9 100644
--- a/scripts/Windows/Software/Firefox/Install.ps1
+++ b/scripts/Windows/Software/Firefox/Install.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 function Install-Firefox {
     param([Context] $context)
diff --git a/scripts/Windows/Software/GPU-Z/Install.ps1 b/scripts/Windows/Software/GPU-Z/Install.ps1
index 3b9fe7677..406a6ad8c 100644
--- a/scripts/Windows/Software/GPU-Z/Install.ps1
+++ b/scripts/Windows/Software/GPU-Z/Install.ps1
@@ -1,8 +1,8 @@
 #!/bin/pwsh
 param($context)
-. "$PSScriptRoot/../../Scripts/Context.ps1";
-. "$PSScriptRoot/../../Scripts/BrowserAutomation.ps1";
-. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/BrowserAutomation.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/SoftwareManagement.ps1";
 
 Write-Host "Installing GPU-Z";
 $tempDir = $context.GetTempDirectory();
diff --git a/scripts/Windows/Software/LGHub/Manage.ps1 b/scripts/Windows/Software/LGHub/Manage.ps1
index f4ff91fbc..e83ba5f30 100644
--- a/scripts/Windows/Software/LGHub/Manage.ps1
+++ b/scripts/Windows/Software/LGHub/Manage.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $path = "$env:LOCALAPPDATA/LGHUB";
diff --git a/scripts/Windows/Software/ManiaPlanet/Manage.ps1 b/scripts/Windows/Software/ManiaPlanet/Manage.ps1
index 72e270bd3..3a338f84b 100644
--- a/scripts/Windows/Software/ManiaPlanet/Manage.ps1
+++ b/scripts/Windows/Software/ManiaPlanet/Manage.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $path = "$HOME/Documents/ManiaPlanet";
diff --git a/scripts/Windows/Software/Nextcloud/Manage.ps1 b/scripts/Windows/Software/Nextcloud/Manage.ps1
index 861414ab1..0cb23372a 100644
--- a/scripts/Windows/Software/Nextcloud/Manage.ps1
+++ b/scripts/Windows/Software/Nextcloud/Manage.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     function Restore-Nextcloud([Context] $context) {
diff --git a/scripts/Windows/Software/Oh My Posh/Install.ps1 b/scripts/Windows/Software/Oh My Posh/Install.ps1
index e85a482ff..c78bac000 100644
--- a/scripts/Windows/Software/Oh My Posh/Install.ps1	
+++ b/scripts/Windows/Software/Oh My Posh/Install.ps1	
@@ -1,6 +1,6 @@
 #!/bin/pwsh
 param($context);
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 [Context] $context = $context;
 winget install --accept-source-agreements --accept-package-agreements -s winget --scope machine -e --id JanDeDobbeleer.OhMyPosh;
diff --git a/scripts/Windows/Software/OpenSSH/Manage.ps1 b/scripts/Windows/Software/OpenSSH/Manage.ps1
index 43507671b..03b3a6177 100644
--- a/scripts/Windows/Software/OpenSSH/Manage.ps1
+++ b/scripts/Windows/Software/OpenSSH/Manage.ps1
@@ -5,7 +5,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Software/PowerShell/Manage.ps1 b/scripts/Windows/Software/PowerShell/Manage.ps1
index a52a04529..c7ff69450 100644
--- a/scripts/Windows/Software/PowerShell/Manage.ps1
+++ b/scripts/Windows/Software/PowerShell/Manage.ps1
@@ -3,8 +3,8 @@ param (
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../Scripts/Software.ps1";
-. "$PSScriptRoot/../../Types/InstallerAction.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
@@ -16,6 +16,5 @@ Start-SoftwareInstaller @PSBoundParameters `
     } `
     -Configurator {
         . "$PSScriptRoot/../../../Common/Software/PowerShell/Manage.ps1" `
-            -Action ([InstallerAction]::Configure) `
-            -Arguments @{ Linux = $false };
+            -Action ([InstallerAction]::Configure);
     };
diff --git a/scripts/Windows/Software/PuTTY/Manage.ps1 b/scripts/Windows/Software/PuTTY/Manage.ps1
index 0f42441e1..546ab2fa0 100644
--- a/scripts/Windows/Software/PuTTY/Manage.ps1
+++ b/scripts/Windows/Software/PuTTY/Manage.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $softwareName = "PuTTY";
diff --git a/scripts/Windows/Software/RetroArch/Manage.ps1 b/scripts/Windows/Software/RetroArch/Manage.ps1
index 0e147eb55..8f2d3fd6d 100644
--- a/scripts/Windows/Software/RetroArch/Manage.ps1
+++ b/scripts/Windows/Software/RetroArch/Manage.ps1
@@ -1,6 +1,6 @@
 #!/bin/pwsh
 . "$PSScriptRoot/../../Scripts/KnownFolders.ps1";
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     Import-Module "$env:ChocolateyInstall/helpers/chocolateyInstaller.psm1";
diff --git a/scripts/Windows/Software/Thunderbird/Install.ps1 b/scripts/Windows/Software/Thunderbird/Install.ps1
index fcd039ba5..a32cce3c1 100644
--- a/scripts/Windows/Software/Thunderbird/Install.ps1
+++ b/scripts/Windows/Software/Thunderbird/Install.ps1
@@ -1,7 +1,7 @@
 #!/bin/pwsh
 param($context)
 
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 [Context] $context = $context;
 
 choco install -y thunderbird --params "/NoTaskbarShortcut /NoDesktopShortcut";
diff --git a/scripts/Windows/Software/Thunderbird/Manage.ps1 b/scripts/Windows/Software/Thunderbird/Manage.ps1
index 221bb9f33..59030f029 100644
--- a/scripts/Windows/Software/Thunderbird/Manage.ps1
+++ b/scripts/Windows/Software/Thunderbird/Manage.ps1
@@ -5,8 +5,8 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../Scripts/AppAssociations.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/AppAssociations.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Software/TrackMania Nations Forever/Manage.ps1 b/scripts/Windows/Software/TrackMania Nations Forever/Manage.ps1
index 2b4ca77b6..951eb2818 100644
--- a/scripts/Windows/Software/TrackMania Nations Forever/Manage.ps1	
+++ b/scripts/Windows/Software/TrackMania Nations Forever/Manage.ps1	
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $path = "$HOME/Documents/TmForever";
diff --git a/scripts/Windows/Software/TrackMania United Forever/Manage.ps1 b/scripts/Windows/Software/TrackMania United Forever/Manage.ps1
index a92b2e1b1..f2ccf88bb 100644
--- a/scripts/Windows/Software/TrackMania United Forever/Manage.ps1	
+++ b/scripts/Windows/Software/TrackMania United Forever/Manage.ps1	
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $path = "$HOME/Documents/TrackMania";
diff --git a/scripts/Windows/Software/Ubiquiti UniFi Controller/Install.ps1 b/scripts/Windows/Software/Ubiquiti UniFi Controller/Install.ps1
index b07a8b7bf..c48696d85 100644
--- a/scripts/Windows/Software/Ubiquiti UniFi Controller/Install.ps1	
+++ b/scripts/Windows/Software/Ubiquiti UniFi Controller/Install.ps1	
@@ -1,7 +1,7 @@
 #!/bin/pwsh
 param($context);
 
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 [Context] $context = $context;
 
 Write-Host "Installing UniFi Controller";
diff --git a/scripts/Windows/Software/VisualStudio/Manage.ps1 b/scripts/Windows/Software/VisualStudio/Manage.ps1
index 903b47526..185e92762 100644
--- a/scripts/Windows/Software/VisualStudio/Manage.ps1
+++ b/scripts/Windows/Software/VisualStudio/Manage.ps1
@@ -1,6 +1,6 @@
 #!/bin/pwsh
 . "$PSScriptRoot/../../Scripts/KnownFolders.ps1";
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $programs32Path = $(Get-KnownFolder "ProgramFilesX86").Path;
diff --git a/scripts/Windows/Software/WinSCP/Install.ps1 b/scripts/Windows/Software/WinSCP/Install.ps1
index e47b430c8..b3a99554a 100644
--- a/scripts/Windows/Software/WinSCP/Install.ps1
+++ b/scripts/Windows/Software/WinSCP/Install.ps1
@@ -1,7 +1,7 @@
 #!/bin/pwsh
 param($context)
 
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 [Context] $context = $context;
 
 choco install -y winscp;
diff --git a/scripts/Windows/Software/WinSCP/Manage.ps1 b/scripts/Windows/Software/WinSCP/Manage.ps1
index 150fc1af9..03261557f 100644
--- a/scripts/Windows/Software/WinSCP/Manage.ps1
+++ b/scripts/Windows/Software/WinSCP/Manage.ps1
@@ -6,7 +6,7 @@ param(
 )
 
 . "$PSScriptRoot/../../Scripts/AppAssociations.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 . "$PSScriptRoot/../../Scripts/System.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
diff --git a/scripts/Windows/Software/Windows/Manage.ps1 b/scripts/Windows/Software/Windows/Manage.ps1
index d2866e077..79a38a2aa 100644
--- a/scripts/Windows/Software/Windows/Manage.ps1
+++ b/scripts/Windows/Software/Windows/Manage.ps1
@@ -8,8 +8,8 @@ param(
 . "$PSScriptRoot/../../Scripts/Registry.ps1";
 . "$PSScriptRoot/../../Scripts/Config.ps1";
 . "$PSScriptRoot/../../Scripts/System.ps1";
-. "$PSScriptRoot/../../Scripts/Software.ps1";
-. "$PSScriptRoot/../../Types/InstallerAction.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Software/aliae/Install.ps1 b/scripts/Windows/Software/aliae/Install.ps1
index c681ebebf..b48201837 100644
--- a/scripts/Windows/Software/aliae/Install.ps1
+++ b/scripts/Windows/Software/aliae/Install.ps1
@@ -1,6 +1,6 @@
 #!/bin/pwsh
 param($context);
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 [Context] $context = $context;
 winget install --accept-source-agreements --accept-package-agreements -s winget --scope machine -e --id JanDeDobbeleer.Aliae;
diff --git a/scripts/Windows/Software/chocolatey/Manage.ps1 b/scripts/Windows/Software/chocolatey/Manage.ps1
index 45674d91f..9cd6d9b93 100644
--- a/scripts/Windows/Software/chocolatey/Manage.ps1
+++ b/scripts/Windows/Software/chocolatey/Manage.ps1
@@ -5,7 +5,7 @@ param(
     [hashtable] $Arguments
 )
 
-. "$PSScriptRoot/../../Scripts/Software.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Software.ps1";
 
 Start-SoftwareInstaller @PSBoundParameters `
     -Installer {
diff --git a/scripts/Windows/Software/git/Manage.ps1 b/scripts/Windows/Software/git/Manage.ps1
index a89c0c108..0d7f34ffd 100644
--- a/scripts/Windows/Software/git/Manage.ps1
+++ b/scripts/Windows/Software/git/Manage.ps1
@@ -1,6 +1,6 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
 . "$PSScriptRoot/../../Scripts/BashScript.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     function Backup-Git([Context] $context) {}
diff --git a/scripts/Windows/Software/osu!/Manage.ps1 b/scripts/Windows/Software/osu!/Manage.ps1
index b71885bfc..c49e6c20d 100644
--- a/scripts/Windows/Software/osu!/Manage.ps1
+++ b/scripts/Windows/Software/osu!/Manage.ps1
@@ -1,6 +1,6 @@
 #!/bin/pwsh
 . "$PSScriptRoot/../../Scripts/KnownFolders.ps1";
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $path = "$((Get-KnownFolder -SpecialFolder ProgramFilesX86).Path)/osu!";
diff --git a/scripts/Windows/Software/osu!lazer/Manage.ps1 b/scripts/Windows/Software/osu!lazer/Manage.ps1
index 936048d45..51e3065fd 100644
--- a/scripts/Windows/Software/osu!lazer/Manage.ps1
+++ b/scripts/Windows/Software/osu!lazer/Manage.ps1
@@ -1,5 +1,5 @@
 #!/bin/pwsh
-. "$PSScriptRoot/../../Scripts/Context.ps1";
+. "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
 $null = New-Module {
     $path = "$env:APPDATA/osu";
diff --git a/scripts/Windows/Software/reWASD/Manage.ps1 b/scripts/Windows/Software/reWASD/Manage.ps1
index e95a3ef67..7e915701e 100644
--- a/scripts/Windows/Software/reWASD/Manage.ps1
+++ b/scripts/Windows/Software/reWASD/Manage.ps1
@@ -1,7 +1,7 @@
 #!/bin/pwsh
 $null = New-Module {
-    . "$PSScriptRoot/../../Scripts/Context.ps1";
-    . "$PSScriptRoot/../../Scripts/BrowserAutomation.ps1";
+    . "$PSScriptRoot/../../../Common/Scripts/BrowserAutomation.ps1";
+    . "$PSScriptRoot/../../../Common/Scripts/Context.ps1";
 
     $path = "$env:PUBLIC/Documents/reWASD";
     $softwareName = "reWASD";