diff --git a/hosts/nixos/hs/system.nix b/hosts/nixos/hs/system.nix
index 8dc4828..1b0106c 100644
--- a/hosts/nixos/hs/system.nix
+++ b/hosts/nixos/hs/system.nix
@@ -7,7 +7,7 @@
     ../../../modules/wireguard.nix
     ../../../modules/podman.nix
     ../../../modules/traefik.nix
-    ../../../modules/borg-client.nix
+    ../../../modules/borg/client.nix
     ../../../modules/login-display.nix
   ];
 
diff --git a/hosts/nixos/vps/system.nix b/hosts/nixos/vps/system.nix
index 60482ac..b2c1522 100644
--- a/hosts/nixos/vps/system.nix
+++ b/hosts/nixos/vps/system.nix
@@ -7,7 +7,7 @@
     ../../../modules/wireguard.nix
     ../../../modules/podman.nix
     ../../../modules/traefik.nix
-    ../../../modules/borg-client.nix
+    ../../../modules/borg/client.nix
     ../../../modules/login-display.nix
   ];
 
diff --git a/modules/borg-client.nix b/modules/borg/client.nix
similarity index 98%
rename from modules/borg-client.nix
rename to modules/borg/client.nix
index 4a93556..777ccc8 100644
--- a/modules/borg-client.nix
+++ b/modules/borg/client.nix
@@ -3,11 +3,12 @@
 with lib;
 
 let
-  cfg = config.services.borgbackup-custom;
+  cfg = config.services.borg-client-custom;
 in
 
 {
-  options.services.borgbackup-custom = {
+    # options.services.borgbackup-custom = {
+  options.services.borg-client-custom = {
     enable = mkEnableOption "Borg backup service";
 
     repositoryUrl = mkOption {
diff --git a/modules/borg-server.nix b/modules/borg/server.nix
similarity index 95%
rename from modules/borg-server.nix
rename to modules/borg/server.nix
index 4e6962a..e69020e 100644
--- a/modules/borg-server.nix
+++ b/modules/borg/server.nix
@@ -3,11 +3,12 @@
 with lib;
 
 let
-  cfg = config.services.borgbackup-server;
+  cfg = config.services.borg-server-custom;
 in
 
 {
-  options.services.borgbackup-server = {
+  # options.services.borgbackup-server = {
+  options.services.borg-server-custom = {
     enable = mkEnableOption "Borg backup server";
 
     dataDir = mkOption {
@@ -119,7 +120,7 @@ in
         
         echo "To add user '$USERNAME', add the following to your NixOS configuration:"
         echo ""
-        echo "services.borgbackup-server.users.$USERNAME = {"
+        echo "services.borg-server-custom.users.$USERNAME = {"
         echo "  publicKeys = [ \"$SSH_KEY\" ];"
         echo "};"
         echo ""
@@ -169,4 +170,4 @@ in
     };
 
   };
-}
\ No newline at end of file
+}