diff --git a/flake.nix b/flake.nix
index 37ce78b..ca07e01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,21 +35,21 @@
         modules = [
           ./hosts/slab/configuration.nix
           ./hosts/slab/nvidia-optimus.nix
-          ./roles/remote.nix
-          ./roles/plasma.nix
+          ./system/remote.nix
+          ./system/plasma.nix
           ./fragments/opengl.nix
-          ./roles/gaming.nix
-          ./roles/hyprland.nix
+          ./system/gaming.nix
+          ./system/hyprland.nix
         ];
       };
       nullbox = lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           ./hosts/nullbox/configuration.nix
-          ./roles/remote.nix
-          ./roles/plasma.nix
+          ./system/remote.nix
+          ./system/plasma.nix
           ./fragments/hardware/nvidia-modeset.nix
-          ./roles/gaming.nix
+          ./system/gaming.nix
 
           hmModule (hmModuleDefaults // {
             home-manager.users."${username}" = import ./home.nix;
diff --git a/system/base.nix b/system/base.nix
index 4b203b3..aa55cee 100644
--- a/system/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/system/desktop-common.nix b/system/desktop-common.nix
index 60bdcf0..12fa0ae 100644
--- a/system/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.