diff --git a/specific/wizdesk/hardware-configuration.nix b/specific/desktop/hardware-configuration.nix
similarity index 100%
rename from specific/wizdesk/hardware-configuration.nix
rename to specific/desktop/hardware-configuration.nix
diff --git a/specific/wizdesk/hardware.nix b/specific/desktop/hardware.nix
similarity index 100%
rename from specific/wizdesk/hardware.nix
rename to specific/desktop/hardware.nix
diff --git a/specific/wizdesk/nixos.nix b/specific/desktop/nixos.nix
similarity index 97%
rename from specific/wizdesk/nixos.nix
rename to specific/desktop/nixos.nix
index 1a8d1ed..3b59bcd 100644
--- a/specific/wizdesk/nixos.nix
+++ b/specific/desktop/nixos.nix
@@ -2,11 +2,16 @@
 
 {
   imports = [
+    ../../modules/nixos
     ./hardware-configuration.nix
     ./hardware.nix
     ./services.nix
   ];
 
+  #
+  # NIXOS #
+  #
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -15,6 +20,10 @@
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.05";
 
+  #
+  # SYSTEM #
+  #
+
   # Configure options for mounted volumes.
   fileSystems = {
     "/".options = [ "compress=zstd" ];
diff --git a/specific/wizdesk/services.nix b/specific/desktop/services.nix
similarity index 100%
rename from specific/wizdesk/services.nix
rename to specific/desktop/services.nix
diff --git a/specific/wizdesk/services/archi.nix b/specific/desktop/services/archi.nix
similarity index 100%
rename from specific/wizdesk/services/archi.nix
rename to specific/desktop/services/archi.nix
diff --git a/specific/wizdesk/services/authentication.nix b/specific/desktop/services/authentication.nix
similarity index 100%
rename from specific/wizdesk/services/authentication.nix
rename to specific/desktop/services/authentication.nix
diff --git a/specific/wizdesk/services/caddy.nix b/specific/desktop/services/caddy.nix
similarity index 100%
rename from specific/wizdesk/services/caddy.nix
rename to specific/desktop/services/caddy.nix
diff --git a/specific/wizdesk/services/forgejo.nix b/specific/desktop/services/forgejo.nix
similarity index 100%
rename from specific/wizdesk/services/forgejo.nix
rename to specific/desktop/services/forgejo.nix
diff --git a/specific/wizdesk/services/jellyfin.nix b/specific/desktop/services/jellyfin.nix
similarity index 100%
rename from specific/wizdesk/services/jellyfin.nix
rename to specific/desktop/services/jellyfin.nix
diff --git a/specific/wizdesk/services/udev/wb32dfu.nix b/specific/desktop/services/udev/wb32dfu.nix
similarity index 100%
rename from specific/wizdesk/services/udev/wb32dfu.nix
rename to specific/desktop/services/udev/wb32dfu.nix
diff --git a/specific/wizdesk/services/udev/wb32dfu.rules b/specific/desktop/services/udev/wb32dfu.rules
similarity index 100%
rename from specific/wizdesk/services/udev/wb32dfu.rules
rename to specific/desktop/services/udev/wb32dfu.rules
diff --git a/specific/wizlap/hardware.nix b/specific/laptop/hardware.nix
similarity index 100%
rename from specific/wizlap/hardware.nix
rename to specific/laptop/hardware.nix
diff --git a/specific/wizlap/nixos.nix b/specific/laptop/nixos.nix
similarity index 78%
rename from specific/wizlap/nixos.nix
rename to specific/laptop/nixos.nix
index e59db1a..4d0ce8e 100644
--- a/specific/wizlap/nixos.nix
+++ b/specific/laptop/nixos.nix
@@ -2,9 +2,25 @@
 
 {
   imports = [
+    ../../modules/nixos
     ./hardware.nix
   ];
 
+  #
+  # NIXOS #
+  #
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.05";
+
+  #
+  # SYSTEM #
+  #
   networking.hostName = "wizlap"; # Define your hostname.
 
   # Open ports in the firewall.