diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 3f71f47..9545fee 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -2,20 +2,20 @@
   imports = [
     ./hardware-configuration.nix
     ./variables.nix
-    ../modules/server/security.nix
-    ../modules/server/openssh.nix
-    ../modules/server/sops.nix
-    ../modules/server/cloudflare-dyndns.nix
-    ../modules/server/nginx.nix
-    ../modules/server/nextcloud.nix
-    ../modules/server/vaultwarden.nix
-    ../modules/server/www
-    ../modules/server/adguard.nix
-    ../modules/server/ntfy-sh.nix
-    ../modules/server/tailscale.nix
-    ../modules/server/kuma.nix
-    ../modules/server/bitcoin-git.nix
-    # ../modules/server/unifi.nix # FIXME: unifi5 is deprecated
+    ./modules/security.nix
+    ./modules/openssh.nix
+    ./modules/sops.nix
+    ./modules/cloudflare-dyndns.nix
+    ./modules/nginx.nix
+    ./modules/nextcloud.nix
+    ./modules/vaultwarden.nix
+    ./modules/www
+    ./modules/adguard.nix
+    ./modules/ntfy-sh.nix
+    ./modules/tailscale.nix
+    ./modules/kuma.nix
+    ./modules/bitcoin-git.nix
+    # ./modules/unifi.nix # FIXME: unifi5 is deprecated
 
   ];
 
diff --git a/hosts/modules/server/adguard.nix b/hosts/server/modules/adguard.nix
similarity index 100%
rename from hosts/modules/server/adguard.nix
rename to hosts/server/modules/adguard.nix
diff --git a/hosts/modules/server/bitcoin-git.nix b/hosts/server/modules/bitcoin-git.nix
similarity index 63%
rename from hosts/modules/server/bitcoin-git.nix
rename to hosts/server/modules/bitcoin-git.nix
index ed43933..b2ac5b2 100644
--- a/hosts/modules/server/bitcoin-git.nix
+++ b/hosts/server/modules/bitcoin-git.nix
@@ -1,4 +1,4 @@
-{
+{ pkgs, ... }: {
   systemd.timers."bitcoin-git" = {
     wantedBy = [ "timers.target" ];
     timerConfig = {
@@ -10,17 +10,17 @@
 
   systemd.services."bitcoin-git" = {
     script = ''
-      [ ! -d "/home/hadi/btcprice" ] && git clone git@github.com:anotherhadi/btcprice /home/hadi/btcprice
+      [ ! -d "/home/hadi/btcprice" ] && ${pkgs.git}/bin/git clone git@github.com:anotherhadi/btcprice /home/hadi/btcprice
       cd "/home/hadi/btcprice"
-      price=$(curl eur.rate.sx/1BTC)
+      price=$(${pkgs.curl}/bin/curl eur.rate.sx/1BTC)
       echo "# Bitcoin Price in EURO" >README.md
       echo "" >>README.md
       echo "1 Bitcoin = $price€" >>README.md
       echo "" >>README.md
       echo "Date: $(date)" >>README.md
-      git add .
-      git commit -m "Update price (hadi)"
-      git push -u origin main
+      ${pkgs.git}/bin/git add .
+      ${pkgs.git}/bin/git commit -m "Update price (hadi)"
+      ${pkgs.git}/bin/git push -u origin main
       exit 0
     '';
     serviceConfig = {
diff --git a/hosts/modules/server/cloudflare-dyndns.nix b/hosts/server/modules/cloudflare-dyndns.nix
similarity index 100%
rename from hosts/modules/server/cloudflare-dyndns.nix
rename to hosts/server/modules/cloudflare-dyndns.nix
diff --git a/hosts/modules/server/kuma.nix b/hosts/server/modules/kuma.nix
similarity index 100%
rename from hosts/modules/server/kuma.nix
rename to hosts/server/modules/kuma.nix
diff --git a/hosts/modules/server/nextcloud.nix b/hosts/server/modules/nextcloud.nix
similarity index 100%
rename from hosts/modules/server/nextcloud.nix
rename to hosts/server/modules/nextcloud.nix
diff --git a/hosts/modules/server/nginx.nix b/hosts/server/modules/nginx.nix
similarity index 100%
rename from hosts/modules/server/nginx.nix
rename to hosts/server/modules/nginx.nix
diff --git a/hosts/modules/server/ntfy-sh.nix b/hosts/server/modules/ntfy-sh.nix
similarity index 100%
rename from hosts/modules/server/ntfy-sh.nix
rename to hosts/server/modules/ntfy-sh.nix
diff --git a/hosts/modules/server/openssh.nix b/hosts/server/modules/openssh.nix
similarity index 100%
rename from hosts/modules/server/openssh.nix
rename to hosts/server/modules/openssh.nix
diff --git a/hosts/modules/server/security.nix b/hosts/server/modules/security.nix
similarity index 100%
rename from hosts/modules/server/security.nix
rename to hosts/server/modules/security.nix
diff --git a/hosts/modules/server/sops.nix b/hosts/server/modules/sops.nix
similarity index 100%
rename from hosts/modules/server/sops.nix
rename to hosts/server/modules/sops.nix
diff --git a/hosts/modules/server/tailscale.nix b/hosts/server/modules/tailscale.nix
similarity index 100%
rename from hosts/modules/server/tailscale.nix
rename to hosts/server/modules/tailscale.nix
diff --git a/hosts/modules/server/unifi.nix b/hosts/server/modules/unifi.nix
similarity index 100%
rename from hosts/modules/server/unifi.nix
rename to hosts/server/modules/unifi.nix
diff --git a/hosts/modules/server/vaultwarden.nix b/hosts/server/modules/vaultwarden.nix
similarity index 100%
rename from hosts/modules/server/vaultwarden.nix
rename to hosts/server/modules/vaultwarden.nix
diff --git a/hosts/modules/server/www/anotherhadi.com/index.html b/hosts/server/modules/www/anotherhadi.com/index.html
similarity index 100%
rename from hosts/modules/server/www/anotherhadi.com/index.html
rename to hosts/server/modules/www/anotherhadi.com/index.html
diff --git a/hosts/modules/server/www/default.nix b/hosts/server/modules/www/default.nix
similarity index 100%
rename from hosts/modules/server/www/default.nix
rename to hosts/server/modules/www/default.nix
diff --git a/hosts/modules/server/www/homepage.nix b/hosts/server/modules/www/homepage.nix
similarity index 100%
rename from hosts/modules/server/www/homepage.nix
rename to hosts/server/modules/www/homepage.nix