diff --git a/flake.nix b/flake.nix
index 52d9c8b..245d8b5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,7 +48,7 @@
             configurationNix
 
             # Common configuration
-            ./roles/common
+            ./modules/common
 
             home-manager.nixosModules.home-manager
             {
@@ -70,7 +70,7 @@
             nixos-hardware.nixosModules.common-gpu-nvidia
             ./hardware/bluetooth
             ./hardware/nvidia
-            ./modules/desktop.nix
+            ./modules/desktop
             ./modules/lockscreen
           ];
         staubfinger = mkComputer
@@ -80,13 +80,15 @@
             nixos-hardware.nixosModules.common-pc-laptop
             nixos-hardware.nixosModules.common-pc-laptop-ssd
             ./hardware/bluetooth
-            ./modules/desktop.nix
+            ./modules/desktop
             ./modules/lockscreen
           ];
         nixos-vm = mkComputer
           ./systems/vm/configuration.nix
           ./home-manager/desktop.nix
-          [ ];
+          [
+            ./modules/desktop
+          ];
         nixos-test-vm = mkComputer
           ./systems/proxmox-vm/configuration.nix
           ./home-manager/headless.nix
diff --git a/roles/common/default.nix b/modules/common/default.nix
similarity index 100%
rename from roles/common/default.nix
rename to modules/common/default.nix
diff --git a/modules/desktop.nix b/modules/desktop/default.nix
similarity index 100%
rename from modules/desktop.nix
rename to modules/desktop/default.nix
diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix
index e2106c4..88d66b6 100644
--- a/systems/vm/configuration.nix
+++ b/systems/vm/configuration.nix
@@ -4,7 +4,6 @@
   imports =
     [
       # Include the results of the hardware scan.
-      ../../modules/desktop.nix
       ./hardware-configuration.nix
     ];