diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index 5b892d5..a813049 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -18,9 +18,9 @@
         sha256 = "0j76ar4qz320fakdii4659w5lww8wiz6yb7g47npywqvf2lbp388";
       }
     }/module.nix"
-    ./boot.nix
-    ./zfs.nix
-    ./network.nix
+    ./roles/boot
+    ./roles/zfs
+    ./roles/network
     ./roles/firewall
     ./roles/zsh
     ./roles/graphics
diff --git a/nix/configuration/boot.nix b/nix/configuration/roles/boot/default.nix
similarity index 100%
rename from nix/configuration/boot.nix
rename to nix/configuration/roles/boot/default.nix
diff --git a/nix/configuration/roles/gpg/default.nix b/nix/configuration/roles/gpg/default.nix
index 80fcc25..3290497 100644
--- a/nix/configuration/roles/gpg/default.nix
+++ b/nix/configuration/roles/gpg/default.nix
@@ -89,11 +89,11 @@
     pcsctools
   ];
 
-  nixpkgs.overlays = [
-    (final: prev: {
-      gnupg = pkgs-unstable.gnupg;
-      scdaemon = pkgs-unstable.scdaemon;
-    })
-  ];
+  # nixpkgs.overlays = [
+  #   (final: prev: {
+  #     gnupg = pkgs-unstable.gnupg;
+  #     scdaemon = pkgs-unstable.scdaemon;
+  #   })
+  # ];
 
 }
diff --git a/nix/configuration/network.nix b/nix/configuration/roles/network/default.nix
similarity index 100%
rename from nix/configuration/network.nix
rename to nix/configuration/roles/network/default.nix
diff --git a/nix/configuration/zfs.nix b/nix/configuration/roles/zfs/default.nix
similarity index 100%
rename from nix/configuration/zfs.nix
rename to nix/configuration/roles/zfs/default.nix