diff --git a/flake.nix b/flake.nix
index 37b8f56..c314ead 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,8 +115,8 @@
             system.stateVersion = "24.11";
           }
 
-          ./systems/ll-latitude-e5591.nix
-          ./disko/nvme/uefi-luks-lvm-ext4.nix
+          ./systems/ll-latitude-e5591/configuration.nix
+          ./nixos/disko/nvme/uefi-luks-lvm-ext4.nix
 
           lix-module.nixosModules.default
           home-manager.nixosModules.home-manager
diff --git a/system.sh b/system.sh
new file mode 100755
index 0000000..e6f76df
--- /dev/null
+++ b/system.sh
@@ -0,0 +1 @@
+sudo nixos-rebuild switch --flake .?submodules=1#$HOSTNAME
diff --git a/systems/ll-latitude-e5591/configuration.nix b/systems/ll-latitude-e5591/configuration.nix
index 989d752..1209cf0 100644
--- a/systems/ll-latitude-e5591/configuration.nix
+++ b/systems/ll-latitude-e5591/configuration.nix
@@ -3,42 +3,42 @@
 { config, pkgs, ... }: {
   imports = [
     # Core Features
-    ../features/base.nix
-    ../features/tui-apps.nix
-    ../features/openssh-server.nix
+    ../../nixos/features/base.nix
+    ../../nixos/features/tui-apps.nix
+    ../../nixos/features/openssh-server.nix
 
     # Core Tweaks
-    ../tweaks/zram.nix
-    ../tweaks/enable_flakes.nix
-    ../tweaks/disable_nixos_user.nix
-    ../tweaks/systemd-resolved_nonsense.nix
+    ../../nixos/tweaks/zram.nix
+    ../../nixos/tweaks/enable_flakes.nix
+    ../../nixos/tweaks/disable_nixos_user.nix
+    ../../nixos/tweaks/systemd-resolved_nonsense.nix
 
     # Lauren Base
-    ../users/lauren_lagarde/lauren_lagarde.nix
+    ../../users/lauren_lagarde/lauren_lagarde.nix
 
     # i3wm
-    ../features/i3wm.nix
-    ../features/hardware/yubikey.nix
-    ../tweaks/bluetooth.nix
-    ../tweaks/intel_igpu_screen_tearing.nix
+    ../../nixos/features/i3wm.nix
+    ../../nixos/features/hardware/yubikey.nix
+    ../../nixos/tweaks/bluetooth.nix
+    ../../nixos/tweaks/intel_igpu_screen_tearing.nix
 
     # Dotspace
-    ../secrets/dotspace.nix
-    ../secrets/dotspace_shares.nix
-    ../features/stronghold-binary-cache.nix
+    ../../secrets/dotspace.nix
+    ../../secrets/dotspace_shares.nix
+    ../../nixos/features/stronghold-binary-cache.nix
 
     # Additional Software
-    ../features/embedded.nix
-    ../features/hardware/rtl-sdr.nix
-    ../features/hardware/printing.nix
-    ../tweaks/aarch64-crosscompile.nix
-    ../features/virtualization/docker.nix
-    ../features/virtualization/libvirt-host.nix
+    ../../nixos/features/embedded.nix
+    ../../nixos/features/hardware/rtl-sdr.nix
+    ../../nixos/features/hardware/printing.nix
+    ../../nixos/tweaks/aarch64-crosscompile.nix
+    ../../nixos/features/virtualization/docker.nix
+    ../../nixos/features/virtualization/libvirt-host.nix
 
     # ll-latitude-e5591
-    ../features/gpu/intel.nix
-    ../features/systemd-boot.nix
-    ../features/factorio.nix
+    ../../nixos/features/gpu/intel.nix
+    ../../nixos/features/systemd-boot.nix
+    ../../nixos/features/factorio.nix
   ];
 
   specialisation = {
@@ -46,7 +46,7 @@
       system.nixos.tags = [ "nvidia" ];
 
       imports = [
-        ../features/gpu/nvidia.nix
+        ../../nixos/features/gpu/nvidia.nix
       ];
 
       hardware.nvidia.prime = {