diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index e634a837..c87a5b7c 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -22,7 +22,8 @@ tempDir="$tempRoot/$relativeDir";
 
 loadkeys "$ARCH_KEYMAP";
 timedatectl set-timezone "$ARCH_TIMEZONE";
-. "./partition.sh";
+OS_DISK="${ARCH_DISK}" \
+    . "../../Common/OS/partition.sh";
 
 pacman-key --init;
 pacman-key --populate;
diff --git a/scripts/Arch/OS/default-partition.sh b/scripts/Common/OS/default-partition.sh
similarity index 94%
rename from scripts/Arch/OS/default-partition.sh
rename to scripts/Common/OS/default-partition.sh
index 720efbaa..12838a0e 100755
--- a/scripts/Arch/OS/default-partition.sh
+++ b/scripts/Common/OS/default-partition.sh
@@ -29,4 +29,4 @@
     echo "23";
 
     echo "w";
-} | fdisk "$ARCH_DISK";
+} | fdisk "$OS_DISK";
diff --git a/scripts/Arch/OS/partition.sh b/scripts/Common/OS/partition.sh
old mode 100755
new mode 100644
similarity index 65%
rename from scripts/Arch/OS/partition.sh
rename to scripts/Common/OS/partition.sh
index 6503dc1c..9ef32d0c
--- a/scripts/Arch/OS/partition.sh
+++ b/scripts/Common/OS/partition.sh
@@ -1,31 +1,31 @@
 #!/bin/bash
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
-source "../../Common/Scripts/is-truthy.sh";
-source "../../Common/Scripts/choose-disk.sh";
-ARCH_DISK="${ARCH_DISK}";
+source "../Scripts/is-truthy.sh";
+source "../Scripts/choose-disk.sh";
+OS_DISK="${OS_DISK}";
 SKIP_FORMAT_EFI="${SKIP_FORMAT_EFI}";
 PARTITION_SCRIPT="${PARTITION_SCRIPT:-"./default-partition.sh"}";
 memory="$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }')";
 swapSize="$(echo "$memory" | awk '{ print int((($1 / 1024 / 1024) * 0.75) + 0.5)}')";
 
-export SWAP_SIZE="$swapSize";
-
-if [ ! -z "$ARCH_DISK" ] && [ ! -e "$ARCH_DISK" ]
+if [ ! -z "$OS_DISK" ] && [ ! -e "$OS_DISK" ]
 then
-    ARCH_DISK="/dev/${ARCH_DISK}"
+    OS_DISK="/dev/${OS_DISK}"
 fi;
 
-if [ -z "$ARCH_DISK" ] || [ ! -e "$ARCH_DISK" ]
+if [ -z "$OS_DISK" ] || [ ! -e "$OS_DISK" ]
 then
-    chooseDisk ARCH_DISK "Which disk do you wish to format for installing Arch?";
+    chooseDisk OS_DISK "Which disk do you wish to format for installing the OS?";
 fi;
 
-. "$PARTITION_SCRIPT";
+OS_DISK="${OS_DISK}" \
+SWAP_SIZE="$swapSize" \
+    . "$PARTITION_SCRIPT";
 
 while true
 do
-    disks=($(bash -c "echo $ARCH_DISK*"));
+    disks=($(bash -c "echo $OS_DISK*"));
     [ "${#disks[@]}" -ge 4 ] && break;
 done;