diff --git a/flake.nix b/flake.nix
index 37ce78b..21393a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,24 +35,27 @@
         modules = [
           ./hosts/slab/configuration.nix
           ./hosts/slab/nvidia-optimus.nix
-          ./roles/remote.nix
-          ./roles/plasma.nix
-          ./fragments/opengl.nix
-          ./roles/gaming.nix
-          ./roles/hyprland.nix
+          ./system/remote.nix
+          ./system/plasma.nix
+          ./system/fragments/opengl.nix
+          ./system/gaming.nix
+          ./system/hyprland.nix
+          hmModule (hmModuleDefaults // {
+            home-manager.users."${username}" = import ./hosts/slab/home.nix;
+          })
         ];
       };
       nullbox = lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           ./hosts/nullbox/configuration.nix
-          ./roles/remote.nix
-          ./roles/plasma.nix
-          ./fragments/hardware/nvidia-modeset.nix
-          ./roles/gaming.nix
+          ./system/remote.nix
+          ./system/plasma.nix
+          ./system/fragments/hardware/nvidia-modeset.nix
+          ./system/gaming.nix
 
           hmModule (hmModuleDefaults // {
-            home-manager.users."${username}" = import ./home.nix;
+            home-manager.users."${username}" = import ./hosts/nullbox/home.nix;
           })
 
         ];
diff --git a/home.nix b/home/common.nix
similarity index 82%
rename from home.nix
rename to home/common.nix
index 37fb414..e1c70bb 100644
--- a/home.nix
+++ b/home/common.nix
@@ -7,6 +7,4 @@
   home.packages = with pkgs; [
     btop
   ];
-
-  home.stateVersion = "23.11";
 }
diff --git a/hosts/nullbox/home.nix b/hosts/nullbox/home.nix
new file mode 100644
index 0000000..d73da2c
--- /dev/null
+++ b/hosts/nullbox/home.nix
@@ -0,0 +1,8 @@
+{ lib, pkgs, osConfig, ... }:
+{
+  imports = [
+    ../../home/common.nix
+  ];
+  
+  home.stateVersion = "23.11";
+}
diff --git a/hosts/slab/home.nix b/hosts/slab/home.nix
new file mode 100644
index 0000000..d73da2c
--- /dev/null
+++ b/hosts/slab/home.nix
@@ -0,0 +1,8 @@
+{ lib, pkgs, osConfig, ... }:
+{
+  imports = [
+    ../../home/common.nix
+  ];
+  
+  home.stateVersion = "23.11";
+}
diff --git a/roles/base.nix b/system/base.nix
similarity index 50%
rename from roles/base.nix
rename to system/base.nix
index 4b203b3..aa55cee 100644
--- a/roles/base.nix
+++ b/system/base.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ...}:
 {
   imports = [
-    ../fragments/base.nix
-    ../fragments/me.nix
+    ./fragments/base.nix
+    ./fragments/me.nix
   ];
 }
diff --git a/roles/debugging.nix b/system/debugging.nix
similarity index 100%
rename from roles/debugging.nix
rename to system/debugging.nix
diff --git a/roles/desktop-common.nix b/system/desktop-common.nix
similarity index 77%
rename from roles/desktop-common.nix
rename to system/desktop-common.nix
index 60bdcf0..12fa0ae 100644
--- a/roles/desktop-common.nix
+++ b/system/desktop-common.nix
@@ -3,10 +3,10 @@
 {
   imports = [
     ./base.nix
-    ../fragments/sound.nix
-    ../fragments/multimedia.nix
-    ../fragments/software/syncthing.nix
-    ../fragments/hardware/bluetooth.nix
+    ./fragments/sound.nix
+    ./fragments/multimedia.nix
+    ./fragments/software/syncthing.nix
+    ./fragments/hardware/bluetooth.nix
   ];
   
   # Enable the X11 windowing system.
diff --git a/fragments/README.md b/system/fragments/README.md
similarity index 100%
rename from fragments/README.md
rename to system/fragments/README.md
diff --git a/fragments/base.nix b/system/fragments/base.nix
similarity index 99%
rename from fragments/base.nix
rename to system/fragments/base.nix
index d9ec293..97ced85 100644
--- a/fragments/base.nix
+++ b/system/fragments/base.nix
@@ -41,6 +41,7 @@
     inetutils
     socat
     nmap
+    hping
 
     # system utilities
     htop
diff --git a/fragments/cli-multimedia.nix b/system/fragments/cli-multimedia.nix
similarity index 100%
rename from fragments/cli-multimedia.nix
rename to system/fragments/cli-multimedia.nix
diff --git a/fragments/hardware/bluetooth.nix b/system/fragments/hardware/bluetooth.nix
similarity index 100%
rename from fragments/hardware/bluetooth.nix
rename to system/fragments/hardware/bluetooth.nix
diff --git a/fragments/hardware/nvidia-modeset.nix b/system/fragments/hardware/nvidia-modeset.nix
similarity index 100%
rename from fragments/hardware/nvidia-modeset.nix
rename to system/fragments/hardware/nvidia-modeset.nix
diff --git a/fragments/me.nix b/system/fragments/me.nix
similarity index 100%
rename from fragments/me.nix
rename to system/fragments/me.nix
diff --git a/fragments/multimedia.nix b/system/fragments/multimedia.nix
similarity index 100%
rename from fragments/multimedia.nix
rename to system/fragments/multimedia.nix
diff --git a/fragments/opengl.nix b/system/fragments/opengl.nix
similarity index 100%
rename from fragments/opengl.nix
rename to system/fragments/opengl.nix
diff --git a/fragments/software/syncthing.nix b/system/fragments/software/syncthing.nix
similarity index 100%
rename from fragments/software/syncthing.nix
rename to system/fragments/software/syncthing.nix
diff --git a/fragments/sound.nix b/system/fragments/sound.nix
similarity index 100%
rename from fragments/sound.nix
rename to system/fragments/sound.nix
diff --git a/roles/gaming.nix b/system/gaming.nix
similarity index 100%
rename from roles/gaming.nix
rename to system/gaming.nix
diff --git a/roles/hyprland.nix b/system/hyprland.nix
similarity index 100%
rename from roles/hyprland.nix
rename to system/hyprland.nix
diff --git a/roles/plasma.nix b/system/plasma.nix
similarity index 100%
rename from roles/plasma.nix
rename to system/plasma.nix
diff --git a/roles/remote.nix b/system/remote.nix
similarity index 100%
rename from roles/remote.nix
rename to system/remote.nix