diff --git a/configuration.nix b/configuration.nix
index 2dc38ac..2ca7a71 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -5,7 +5,7 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./nix-bitcoin.nix
+    ./modules/nix-bitcoin.nix
     # FIXME: Uncomment next line to import your hardware configuration. If so,
     # add the hardware configuration file to the same directory as this file.
     # This is not needed when deploying to a virtual box.
diff --git a/nix-bitcoin.nix b/modules/nix-bitcoin-pkgs.nix
similarity index 61%
rename from nix-bitcoin.nix
rename to modules/nix-bitcoin-pkgs.nix
index 63f7205..3306e8d 100644
--- a/nix-bitcoin.nix
+++ b/modules/nix-bitcoin-pkgs.nix
@@ -1,19 +1,18 @@
 { config, pkgs, ... }:
  let
-   nixpkgs-pinned = import ./nixpkgs-pinned.nix;
+   nixpkgs-pinned = import ../nixpkgs-pinned.nix;
    nixpkgs-unstable = import nixpkgs-pinned.nixpkgs-unstable { };
 
    # Custom packages
-   nodeinfo = (import pkgs/nodeinfo.nix) { inherit pkgs; };
-   lightning-charge = import pkgs/lightning-charge.nix { inherit pkgs; };
-   nanopos = import pkgs/nanopos.nix { inherit pkgs; };
-   spark-wallet = import pkgs/spark-wallet.nix  { inherit pkgs; };
-   electrs = pkgs.callPackage (import pkgs/electrs.nix) { };
-   liquidd = pkgs.callPackage (import pkgs/liquidd.nix) { };
+   nodeinfo = (import ../pkgs/nodeinfo.nix) { inherit pkgs; };
+   lightning-charge = import ../pkgs/lightning-charge.nix { inherit pkgs; };
+   nanopos = import ../pkgs/nanopos.nix { inherit pkgs; };
+   spark-wallet = import ../pkgs/spark-wallet.nix  { inherit pkgs; };
+   electrs = pkgs.callPackage (import ../pkgs/electrs.nix) { };
+   liquidd = pkgs.callPackage (import ../pkgs/liquidd.nix) { };
 in {
   disabledModules = [ "services/security/tor.nix" ];
   imports = [
-    ./modules/nix-bitcoin.nix
     (nixpkgs-pinned.nixpkgs-unstable + "/nixos/modules/services/security/tor.nix")
   ];
 
diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix
index b61dbe0..ea276a0 100644
--- a/modules/nix-bitcoin.nix
+++ b/modules/nix-bitcoin.nix
@@ -33,6 +33,7 @@ let
   '';
 in {
   imports = [
+    ./nix-bitcoin-pkgs.nix
     ./bitcoind.nix
     ./clightning.nix
     ./lightning-charge.nix