diff --git a/classes/desktop/clipboard.nix b/classes/headful/clipboard.nix
similarity index 100%
rename from classes/desktop/clipboard.nix
rename to classes/headful/clipboard.nix
diff --git a/classes/desktop/cosmic.nix b/classes/headful/cosmic.nix
similarity index 100%
rename from classes/desktop/cosmic.nix
rename to classes/headful/cosmic.nix
diff --git a/classes/desktop/devenv.nix b/classes/headful/devenv.nix
similarity index 100%
rename from classes/desktop/devenv.nix
rename to classes/headful/devenv.nix
diff --git a/classes/desktop/flatpak.nix b/classes/headful/flatpak.nix
similarity index 100%
rename from classes/desktop/flatpak.nix
rename to classes/headful/flatpak.nix
diff --git a/classes/desktop/fonts.nix b/classes/headful/fonts.nix
similarity index 100%
rename from classes/desktop/fonts.nix
rename to classes/headful/fonts.nix
diff --git a/classes/desktop/fs.nix b/classes/headful/fs.nix
similarity index 100%
rename from classes/desktop/fs.nix
rename to classes/headful/fs.nix
diff --git a/classes/desktop/gamemode.nix b/classes/headful/gamemode.nix
similarity index 100%
rename from classes/desktop/gamemode.nix
rename to classes/headful/gamemode.nix
diff --git a/classes/desktop/hardware.nix b/classes/headful/hardware.nix
similarity index 100%
rename from classes/desktop/hardware.nix
rename to classes/headful/hardware.nix
diff --git a/classes/desktop/location.nix b/classes/headful/location.nix
similarity index 100%
rename from classes/desktop/location.nix
rename to classes/headful/location.nix
diff --git a/classes/desktop/mullvad.nix b/classes/headful/mullvad.nix
similarity index 100%
rename from classes/desktop/mullvad.nix
rename to classes/headful/mullvad.nix
diff --git a/classes/desktop/networking.nix b/classes/headful/networking.nix
similarity index 100%
rename from classes/desktop/networking.nix
rename to classes/headful/networking.nix
diff --git a/classes/desktop/pipewire.nix b/classes/headful/pipewire.nix
similarity index 100%
rename from classes/desktop/pipewire.nix
rename to classes/headful/pipewire.nix
diff --git a/classes/desktop/printing.nix b/classes/headful/printing.nix
similarity index 100%
rename from classes/desktop/printing.nix
rename to classes/headful/printing.nix
diff --git a/classes/desktop/syncthing.nix b/classes/headful/syncthing.nix
similarity index 100%
rename from classes/desktop/syncthing.nix
rename to classes/headful/syncthing.nix
diff --git a/classes/desktop/wayland.nix b/classes/headful/wayland.nix
similarity index 100%
rename from classes/desktop/wayland.nix
rename to classes/headful/wayland.nix
diff --git a/classes/desktop/xdg.nix b/classes/headful/xdg.nix
similarity index 100%
rename from classes/desktop/xdg.nix
rename to classes/headful/xdg.nix
diff --git a/classes/server/fs.nix b/classes/headless/fs.nix
similarity index 100%
rename from classes/server/fs.nix
rename to classes/headless/fs.nix
diff --git a/classes/server/networking.nix b/classes/headless/networking.nix
similarity index 100%
rename from classes/server/networking.nix
rename to classes/headless/networking.nix
diff --git a/classes/server/time.nix b/classes/headless/time.nix
similarity index 100%
rename from classes/server/time.nix
rename to classes/headless/time.nix
diff --git a/common/documentation.nix b/common/documentation.nix
index da6141d..26dfbbf 100644
--- a/common/documentation.nix
+++ b/common/documentation.nix
@@ -1,3 +1,12 @@
 {
-  documentation.nixos.enable = false;
+  documentation = {
+    doc.enable = false;
+    info.enable = false;
+    nixos.enable = false;
+    man = {
+      enable = true;
+      generateCaches = true;
+      mandoc.enable = true;
+    };
+  };
 }
diff --git a/common/puter/puter.nix b/common/puter.nix
similarity index 100%
rename from common/puter/puter.nix
rename to common/puter.nix
diff --git a/hosts/desktop/flamingo/hardware.nix b/hosts/headful/flamingo/hardware.nix
similarity index 100%
rename from hosts/desktop/flamingo/hardware.nix
rename to hosts/headful/flamingo/hardware.nix
diff --git a/hosts/desktop/flamingo/system.nix b/hosts/headful/flamingo/system.nix
similarity index 100%
rename from hosts/desktop/flamingo/system.nix
rename to hosts/headful/flamingo/system.nix
diff --git a/hosts/desktop/glacier/hardware.nix b/hosts/headful/glacier/hardware.nix
similarity index 100%
rename from hosts/desktop/glacier/hardware.nix
rename to hosts/headful/glacier/hardware.nix
diff --git a/hosts/desktop/glacier/system.nix b/hosts/headful/glacier/system.nix
similarity index 100%
rename from hosts/desktop/glacier/system.nix
rename to hosts/headful/glacier/system.nix
diff --git a/hosts/desktop/glacier/users.nix b/hosts/headful/glacier/users.nix
similarity index 100%
rename from hosts/desktop/glacier/users.nix
rename to hosts/headful/glacier/users.nix
diff --git a/hosts/server/abacus/acme.nix b/hosts/headless/abacus/acme.nix
similarity index 100%
rename from hosts/server/abacus/acme.nix
rename to hosts/headless/abacus/acme.nix
diff --git a/hosts/server/abacus/backup.nix b/hosts/headless/abacus/backup.nix
similarity index 100%
rename from hosts/server/abacus/backup.nix
rename to hosts/headless/abacus/backup.nix
diff --git a/hosts/server/abacus/forgejo.nix b/hosts/headless/abacus/forgejo.nix
similarity index 100%
rename from hosts/server/abacus/forgejo.nix
rename to hosts/headless/abacus/forgejo.nix
diff --git a/hosts/server/abacus/fs.nix b/hosts/headless/abacus/fs.nix
similarity index 100%
rename from hosts/server/abacus/fs.nix
rename to hosts/headless/abacus/fs.nix
diff --git a/hosts/server/abacus/hardware.nix b/hosts/headless/abacus/hardware.nix
similarity index 100%
rename from hosts/server/abacus/hardware.nix
rename to hosts/headless/abacus/hardware.nix
diff --git a/hosts/server/abacus/microbin.nix b/hosts/headless/abacus/microbin.nix
similarity index 100%
rename from hosts/server/abacus/microbin.nix
rename to hosts/headless/abacus/microbin.nix
diff --git a/hosts/server/abacus/miniflux.nix b/hosts/headless/abacus/miniflux.nix
similarity index 100%
rename from hosts/server/abacus/miniflux.nix
rename to hosts/headless/abacus/miniflux.nix
diff --git a/hosts/server/abacus/navidrome.nix b/hosts/headless/abacus/navidrome.nix
similarity index 100%
rename from hosts/server/abacus/navidrome.nix
rename to hosts/headless/abacus/navidrome.nix
diff --git a/hosts/server/abacus/networking.nix b/hosts/headless/abacus/networking.nix
similarity index 100%
rename from hosts/server/abacus/networking.nix
rename to hosts/headless/abacus/networking.nix
diff --git a/hosts/server/abacus/nginx.nix b/hosts/headless/abacus/nginx.nix
similarity index 100%
rename from hosts/server/abacus/nginx.nix
rename to hosts/headless/abacus/nginx.nix
diff --git a/hosts/server/abacus/static.nix b/hosts/headless/abacus/static.nix
similarity index 100%
rename from hosts/server/abacus/static.nix
rename to hosts/headless/abacus/static.nix
diff --git a/hosts/server/abacus/syncthing.nix b/hosts/headless/abacus/syncthing.nix
similarity index 100%
rename from hosts/server/abacus/syncthing.nix
rename to hosts/headless/abacus/syncthing.nix
diff --git a/hosts/server/abacus/system.nix b/hosts/headless/abacus/system.nix
similarity index 100%
rename from hosts/server/abacus/system.nix
rename to hosts/headless/abacus/system.nix
diff --git a/hosts/server/abacus/vaultwarden.nix b/hosts/headless/abacus/vaultwarden.nix
similarity index 100%
rename from hosts/server/abacus/vaultwarden.nix
rename to hosts/headless/abacus/vaultwarden.nix
diff --git a/hosts/server/vessel/backup.nix b/hosts/headless/vessel/backup.nix
similarity index 100%
rename from hosts/server/vessel/backup.nix
rename to hosts/headless/vessel/backup.nix
diff --git a/hosts/server/vessel/blocky.nix b/hosts/headless/vessel/blocky.nix
similarity index 100%
rename from hosts/server/vessel/blocky.nix
rename to hosts/headless/vessel/blocky.nix
diff --git a/hosts/server/vessel/fs.nix b/hosts/headless/vessel/fs.nix
similarity index 100%
rename from hosts/server/vessel/fs.nix
rename to hosts/headless/vessel/fs.nix
diff --git a/hosts/server/vessel/hardware.nix b/hosts/headless/vessel/hardware.nix
similarity index 100%
rename from hosts/server/vessel/hardware.nix
rename to hosts/headless/vessel/hardware.nix
diff --git a/hosts/server/vessel/musicomp.nix b/hosts/headless/vessel/musicomp.nix
similarity index 100%
rename from hosts/server/vessel/musicomp.nix
rename to hosts/headless/vessel/musicomp.nix
diff --git a/hosts/server/vessel/storage.nix b/hosts/headless/vessel/storage.nix
similarity index 100%
rename from hosts/server/vessel/storage.nix
rename to hosts/headless/vessel/storage.nix
diff --git a/hosts/server/vessel/syncthing.nix b/hosts/headless/vessel/syncthing.nix
similarity index 100%
rename from hosts/server/vessel/syncthing.nix
rename to hosts/headless/vessel/syncthing.nix
diff --git a/hosts/server/vessel/system.nix b/hosts/headless/vessel/system.nix
similarity index 100%
rename from hosts/server/vessel/system.nix
rename to hosts/headless/vessel/system.nix
diff --git a/modules/musicomp.nix b/modules/musicomp.nix
index 0b70377..e78ed31 100644
--- a/modules/musicomp.nix
+++ b/modules/musicomp.nix
@@ -14,7 +14,6 @@ in {
       Compression jobs to run with musicomp.
     '';
     default = {};
-    # type = types.attrsOf (types.submodule ({name, ...}: {
     type = types.attrsOf (types.submodule {
       options = {
         music = lib.mkOption {