diff --git a/hosts/skipper/secureboot.nix b/hosts/skipper/boot/default.nix
similarity index 52%
rename from hosts/skipper/secureboot.nix
rename to hosts/skipper/boot/default.nix
index 2e3dc6b..fc3cbb8 100644
--- a/hosts/skipper/secureboot.nix
+++ b/hosts/skipper/boot/default.nix
@@ -1,10 +1,13 @@
-{ lib
-, pkgs
-, ...
-}: {
-  environment.etc."secureboot" = {
-    mode = "symlink";
-    source = "/persist/secrets/secureboot";
+{ lib, pkgs, ... }: {
+  imports = [ ./plymouth.nix ];
+  environment = {
+    etc."secureboot" = {
+      mode = "symlink";
+      source = "/persist/secrets/secureboot";
+    };
+    systemPackages = with pkgs; [
+      sbctl
+    ];
   };
   boot = {
     bootspec.enable = true;
@@ -17,7 +20,4 @@
       pkiBundle = "/persist/secrets/secureboot";
     };
   };
-  environment.systemPackages = with pkgs; [
-    sbctl
-  ];
 }
diff --git a/hosts/skipper/plymouth.nix b/hosts/skipper/boot/plymouth.nix
similarity index 100%
rename from hosts/skipper/plymouth.nix
rename to hosts/skipper/boot/plymouth.nix
diff --git a/hosts/skipper/default.nix b/hosts/skipper/default.nix
index 9e5b803..e578bc7 100644
--- a/hosts/skipper/default.nix
+++ b/hosts/skipper/default.nix
@@ -1,13 +1,12 @@
 { pkgs, ... }: {
   imports = [
+    ./boot
     ./hardware
     ./programs
     ./services
     ./network
     ./persistence
     ./virtualisation
-    ./plymouth.nix
-    ./secureboot.nix
     ./security.nix
   ];