diff --git a/extras/displays.nix b/extras/displays.nix
index cfaa867..b111d6b 100644
--- a/extras/displays.nix
+++ b/extras/displays.nix
@@ -1,5 +1,6 @@
 {
-  d1 = ''DP-3'';
-  d2 = ''DP-1'';
-  d3 = ''DP-2'';
+  d1 = "DP-3";
+  d2 = "DP-1";
+  d3 = "DP-2";
+  dI = "eDP-1";
 }
diff --git a/flake.nix b/flake.nix
index e847f1a..e75a469 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,7 +87,7 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_desktop.nix
+          ./home/jimbo_desktop.nix
 	  nur.nixosModules.nur
         ];
       };
@@ -95,14 +95,14 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_server.nix
+          ./home/jimbo_server.nix
         ];
       };
       "jimbo@JimPine" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.aarch64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_pinebook.nix
+          ./home/jimbo_pinebook.nix
 	  nur.nixosModules.nur
         ];
       };
@@ -110,7 +110,7 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_lenovo.nix
+          ./home/jimbo_lenovo.nix
 	  nur.nixosModules.nur
         ];
       };
@@ -119,7 +119,7 @@
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = {inherit inputs outputs;};
         modules = [
-          ./home-manager/jimbo_ssh.nix
+          ./home/jimbo_ssh.nix
         ];
       };
     };
diff --git a/home-manager/assets/user-icon.png b/home/assets/user-icon.png
similarity index 100%
rename from home-manager/assets/user-icon.png
rename to home/assets/user-icon.png
diff --git a/home-manager/assets/wallpapers/1.png b/home/assets/wallpapers/1.png
similarity index 100%
rename from home-manager/assets/wallpapers/1.png
rename to home/assets/wallpapers/1.png
diff --git a/home-manager/assets/wallpapers/2.png b/home/assets/wallpapers/2.png
similarity index 100%
rename from home-manager/assets/wallpapers/2.png
rename to home/assets/wallpapers/2.png
diff --git a/home-manager/assets/wallpapers/3.png b/home/assets/wallpapers/3.png
similarity index 100%
rename from home-manager/assets/wallpapers/3.png
rename to home/assets/wallpapers/3.png
diff --git a/home-manager/assets/wallpapers/lock.png b/home/assets/wallpapers/lock.png
similarity index 100%
rename from home-manager/assets/wallpapers/lock.png
rename to home/assets/wallpapers/lock.png
diff --git a/home-manager/guiapps/easyeffects.nix b/home/guiapps/easyeffects.nix
similarity index 100%
rename from home-manager/guiapps/easyeffects.nix
rename to home/guiapps/easyeffects.nix
diff --git a/home-manager/guiapps/foot.nix b/home/guiapps/foot.nix
similarity index 100%
rename from home-manager/guiapps/foot.nix
rename to home/guiapps/foot.nix
diff --git a/home-manager/guiapps/gtk.nix b/home/guiapps/gtk.nix
similarity index 100%
rename from home-manager/guiapps/gtk.nix
rename to home/guiapps/gtk.nix
diff --git a/home-manager/guiapps/librewolf.nix b/home/guiapps/librewolf.nix
similarity index 100%
rename from home-manager/guiapps/librewolf.nix
rename to home/guiapps/librewolf.nix
diff --git a/home-manager/guiapps/mangohud.nix b/home/guiapps/mangohud.nix
similarity index 100%
rename from home-manager/guiapps/mangohud.nix
rename to home/guiapps/mangohud.nix
diff --git a/home-manager/guiapps/mpv.nix b/home/guiapps/mpv.nix
similarity index 100%
rename from home-manager/guiapps/mpv.nix
rename to home/guiapps/mpv.nix
diff --git a/home-manager/guiapps/obs.nix b/home/guiapps/obs.nix
similarity index 100%
rename from home-manager/guiapps/obs.nix
rename to home/guiapps/obs.nix
diff --git a/home-manager/guiapps/pcmanfm-qt.nix b/home/guiapps/pcmanfm-qt.nix
similarity index 100%
rename from home-manager/guiapps/pcmanfm-qt.nix
rename to home/guiapps/pcmanfm-qt.nix
diff --git a/home-manager/guiapps/rofi.nix b/home/guiapps/rofi.nix
similarity index 98%
rename from home-manager/guiapps/rofi.nix
rename to home/guiapps/rofi.nix
index 61528b6..f84a2c3 100644
--- a/home-manager/guiapps/rofi.nix
+++ b/home/guiapps/rofi.nix
@@ -125,9 +125,7 @@
   };
   home.packages = let
     # All my rofi scripts in one file
-    rofiScripts = let
-      displays = import ../common/displays.nix;
-    in pkgs.writeScriptBin "rofiscripts" ''
+    rofiScripts = pkgs.writeScriptBin "rofiscripts" ''
       # Scratchpad function
       handle_scratchpads() {
         SCRATCHPADS=$(echo -e "Gotop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
diff --git a/home-manager/guiapps/swappy.nix b/home/guiapps/swappy.nix
similarity index 100%
rename from home-manager/guiapps/swappy.nix
rename to home/guiapps/swappy.nix
diff --git a/home-manager/home.nix b/home/home.nix
similarity index 100%
rename from home-manager/home.nix
rename to home/home.nix
diff --git a/home-manager/jimbo_desktop.nix b/home/jimbo_desktop.nix
similarity index 100%
rename from home-manager/jimbo_desktop.nix
rename to home/jimbo_desktop.nix
diff --git a/home-manager/jimbo_lenovo.nix b/home/jimbo_lenovo.nix
similarity index 100%
rename from home-manager/jimbo_lenovo.nix
rename to home/jimbo_lenovo.nix
diff --git a/home-manager/jimbo_pinebook.nix b/home/jimbo_pinebook.nix
similarity index 84%
rename from home-manager/jimbo_pinebook.nix
rename to home/jimbo_pinebook.nix
index bf11dd3..5d0e5df 100644
--- a/home-manager/jimbo_pinebook.nix
+++ b/home/jimbo_pinebook.nix
@@ -1,6 +1,4 @@
-let
-  displays = import ./common/displays.nix;
-in {
+{outputs, ...}: {
   imports = [
     # Common modules
     ./home.nix
@@ -35,5 +33,5 @@ in {
     ./services/udiskie.nix
   ];
 
-  wayland.windowManager.sway.config.output.${displays.dTouch}.scale = "1.3";
+  wayland.windowManager.sway.config.output.${outputs.displays.dI}.scale = "1.3";
 }
diff --git a/home-manager/jimbo_server.nix b/home/jimbo_server.nix
similarity index 100%
rename from home-manager/jimbo_server.nix
rename to home/jimbo_server.nix
diff --git a/home-manager/jimbo_ssh.nix b/home/jimbo_ssh.nix
similarity index 79%
rename from home-manager/jimbo_ssh.nix
rename to home/jimbo_ssh.nix
index 3269777..7fc8d44 100644
--- a/home-manager/jimbo_ssh.nix
+++ b/home/jimbo_ssh.nix
@@ -7,9 +7,7 @@
 
   # Rebuild this entire system
   programs.zsh = {
-    shellAliases = let
-      auth = import ./common/auth.nix;
-    in {
+    shellAliases = {
       sshswitch = "home-manager switch --flake ~/.home-manager/.#jimbo@SSH --extra-experimental-features 'nix-command flakes'";
     };
   };
diff --git a/home-manager/misc/avtools.nix b/home/misc/avtools.nix
similarity index 100%
rename from home-manager/misc/avtools.nix
rename to home/misc/avtools.nix
diff --git a/home-manager/misc/emulators.nix b/home/misc/emulators.nix
similarity index 100%
rename from home-manager/misc/emulators.nix
rename to home/misc/emulators.nix
diff --git a/home-manager/misc/filemanager.nix b/home/misc/filemanager.nix
similarity index 100%
rename from home-manager/misc/filemanager.nix
rename to home/misc/filemanager.nix
diff --git a/home-manager/misc/gaming.nix b/home/misc/gaming.nix
similarity index 100%
rename from home-manager/misc/gaming.nix
rename to home/misc/gaming.nix
diff --git a/home-manager/misc/guifiles.nix b/home/misc/guifiles.nix
similarity index 100%
rename from home-manager/misc/guifiles.nix
rename to home/misc/guifiles.nix
diff --git a/home-manager/misc/production.nix b/home/misc/production.nix
similarity index 100%
rename from home-manager/misc/production.nix
rename to home/misc/production.nix
diff --git a/home-manager/misc/remotedesktop.nix b/home/misc/remotedesktop.nix
similarity index 100%
rename from home-manager/misc/remotedesktop.nix
rename to home/misc/remotedesktop.nix
diff --git a/home-manager/misc/school.nix b/home/misc/school.nix
similarity index 100%
rename from home-manager/misc/school.nix
rename to home/misc/school.nix
diff --git a/home-manager/misc/useful.nix b/home/misc/useful.nix
similarity index 100%
rename from home-manager/misc/useful.nix
rename to home/misc/useful.nix
diff --git a/home-manager/misc/variables.nix b/home/misc/variables.nix
similarity index 100%
rename from home-manager/misc/variables.nix
rename to home/misc/variables.nix
diff --git a/home-manager/misc/xash3d.nix b/home/misc/xash3d.nix
similarity index 100%
rename from home-manager/misc/xash3d.nix
rename to home/misc/xash3d.nix
diff --git a/home-manager/services/gnome-keyring.nix b/home/services/gnome-keyring.nix
similarity index 100%
rename from home-manager/services/gnome-keyring.nix
rename to home/services/gnome-keyring.nix
diff --git a/home-manager/services/mako.nix b/home/services/mako.nix
similarity index 100%
rename from home-manager/services/mako.nix
rename to home/services/mako.nix
diff --git a/home-manager/services/reloadunits.nix b/home/services/reloadunits.nix
similarity index 100%
rename from home-manager/services/reloadunits.nix
rename to home/services/reloadunits.nix
diff --git a/home-manager/services/udiskie.nix b/home/services/udiskie.nix
similarity index 100%
rename from home-manager/services/udiskie.nix
rename to home/services/udiskie.nix
diff --git a/home-manager/sway/README.md b/home/sway/README.md
similarity index 100%
rename from home-manager/sway/README.md
rename to home/sway/README.md
diff --git a/home-manager/sway/autostart.nix b/home/sway/autostart.nix
similarity index 100%
rename from home-manager/sway/autostart.nix
rename to home/sway/autostart.nix
diff --git a/home-manager/sway/hardware.nix b/home/sway/hardware.nix
similarity index 100%
rename from home-manager/sway/hardware.nix
rename to home/sway/hardware.nix
diff --git a/home-manager/sway/hotkeys.nix b/home/sway/hotkeys.nix
similarity index 99%
rename from home-manager/sway/hotkeys.nix
rename to home/sway/hotkeys.nix
index fa45efd..1b834f3 100644
--- a/home-manager/sway/hotkeys.nix
+++ b/home/sway/hotkeys.nix
@@ -1,7 +1,6 @@
 {config, pkgs, outputs, ...}: {
   wayland.windowManager.sway = {
     config = let
-      colors = import ../common/colors.nix;
       # Set default modifier and variables
       primeMod = "Mod4";
       secMod = "Mod1";
diff --git a/home-manager/sway/rules.nix b/home/sway/rules.nix
similarity index 100%
rename from home-manager/sway/rules.nix
rename to home/sway/rules.nix
diff --git a/home-manager/sway/sway.nix b/home/sway/sway.nix
similarity index 100%
rename from home-manager/sway/sway.nix
rename to home/sway/sway.nix
diff --git a/home-manager/sway/swayfx.nix b/home/sway/swayfx.nix
similarity index 100%
rename from home-manager/sway/swayfx.nix
rename to home/sway/swayfx.nix
diff --git a/home-manager/sway/swaylock.nix b/home/sway/swaylock.nix
similarity index 100%
rename from home-manager/sway/swaylock.nix
rename to home/sway/swaylock.nix
diff --git a/home-manager/sway/swayshot.nix b/home/sway/swayshot.nix
similarity index 100%
rename from home-manager/sway/swayshot.nix
rename to home/sway/swayshot.nix
diff --git a/home-manager/sway/theme.nix b/home/sway/theme.nix
similarity index 100%
rename from home-manager/sway/theme.nix
rename to home/sway/theme.nix
diff --git a/home-manager/sway/waybar.nix b/home/sway/waybar.nix
similarity index 100%
rename from home-manager/sway/waybar.nix
rename to home/sway/waybar.nix
diff --git a/home-manager/tuiapps/fastfetch.nix b/home/tuiapps/fastfetch.nix
similarity index 100%
rename from home-manager/tuiapps/fastfetch.nix
rename to home/tuiapps/fastfetch.nix
diff --git a/home-manager/tuiapps/git.nix b/home/tuiapps/git.nix
similarity index 100%
rename from home-manager/tuiapps/git.nix
rename to home/tuiapps/git.nix
diff --git a/home-manager/tuiapps/ncmpcpp.nix b/home/tuiapps/ncmpcpp.nix
similarity index 100%
rename from home-manager/tuiapps/ncmpcpp.nix
rename to home/tuiapps/ncmpcpp.nix
diff --git a/home-manager/tuiapps/neovim.nix b/home/tuiapps/neovim.nix
similarity index 100%
rename from home-manager/tuiapps/neovim.nix
rename to home/tuiapps/neovim.nix
diff --git a/home-manager/tuiapps/ranger.nix b/home/tuiapps/ranger.nix
similarity index 100%
rename from home-manager/tuiapps/ranger.nix
rename to home/tuiapps/ranger.nix
diff --git a/home-manager/tuiapps/tmux.nix b/home/tuiapps/tmux.nix
similarity index 100%
rename from home-manager/tuiapps/tmux.nix
rename to home/tuiapps/tmux.nix
diff --git a/home-manager/tuiapps/zsh.nix b/home/tuiapps/zsh.nix
similarity index 100%
rename from home-manager/tuiapps/zsh.nix
rename to home/tuiapps/zsh.nix
diff --git a/home-manager/users/jimbo.nix b/home/users/jimbo.nix
similarity index 100%
rename from home-manager/users/jimbo.nix
rename to home/users/jimbo.nix
diff --git a/system/desktop/wireguard.nix b/system/desktop/wireguard.nix
index 67d9809..639a33f 100644
--- a/system/desktop/wireguard.nix
+++ b/system/desktop/wireguard.nix
@@ -1,12 +1,10 @@
-{outputs, ...}: let
-  ips = import ../modules/ips.nix;
-in {
+{outputs, ...}: {
   networking.firewall = {
     allowedUDPPorts = [ 51820 ];
   };
 
   networking.wireguard.interfaces = {
-    "${ips.wgInt}" = {
+    "${outputs.ips.wgInt}" = {
       # Define IP of client in per device config
       listenPort = 51820;
       privateKey = outputs.secrets.wgClientPriv;