diff --git a/modules/servers/setup.nix b/modules/factories/setup.nix
similarity index 100%
rename from modules/servers/setup.nix
rename to modules/factories/setup.nix
diff --git a/modules/modules.nix b/modules/modules.nix
index a4f7ff8..45a7ce2 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -15,7 +15,7 @@ let
     config.my.servers.drpp.enable
     config.my.servers.plex-discord-bot.enable
   ];
-  filterNames = file: file != "base.nix" && file != "setup.nix" && file != "librewolf.nix";
+  filterNames = file: file != "base.nix" && file != "librewolf.nix";
   autoImport =
     dir:
     builtins.readDir ./${dir}
diff --git a/modules/servers/atticd.nix b/modules/servers/atticd.nix
index ec94fef..14d351e 100644
--- a/modules/servers/atticd.nix
+++ b/modules/servers/atticd.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.atticd;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.atticd = setup.mkOptions "atticd" "cache" 2343;
diff --git a/modules/servers/audiobookshelf.nix b/modules/servers/audiobookshelf.nix
index 9cfa2ba..9108bad 100644
--- a/modules/servers/audiobookshelf.nix
+++ b/modules/servers/audiobookshelf.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.audiobookshelf;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.audiobookshelf = setup.mkOptions "audiobookshelf" "audiobooks" 5687;
diff --git a/modules/servers/bazarr.nix b/modules/servers/bazarr.nix
index 181caf2..a344496 100644
--- a/modules/servers/bazarr.nix
+++ b/modules/servers/bazarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.bazarr;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.bazarr = setup.mkOptions "bazarr" "subs" config.services.bazarr.listenPort;
diff --git a/modules/servers/drpp.nix b/modules/servers/drpp.nix
index 4dd6929..b7d4e70 100644
--- a/modules/servers/drpp.nix
+++ b/modules/servers/drpp.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.drpp;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.drpp = setup.mkOptions "drpp" "drpp" 0;
diff --git a/modules/servers/firefox-syncserver.nix b/modules/servers/firefox-syncserver.nix
index 710e9f2..045ae20 100644
--- a/modules/servers/firefox-syncserver.nix
+++ b/modules/servers/firefox-syncserver.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.firefox-syncserver;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.firefox-syncserver = setup.mkOptions "firefox-syncserver" "sync" 4233;
diff --git a/modules/servers/flame.nix b/modules/servers/flame.nix
index 188028c..2bfe0e1 100644
--- a/modules/servers/flame.nix
+++ b/modules/servers/flame.nix
@@ -3,7 +3,7 @@ let
   cfg = config.my.servers.flame;
   cfgS = config.my.servers.flameSecret;
   enable = (cfg.enable || cfgS.enable) && config.my.secureHost;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers = {
diff --git a/modules/servers/gitea.nix b/modules/servers/gitea.nix
index 44ad8c8..a885512 100644
--- a/modules/servers/gitea.nix
+++ b/modules/servers/gitea.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.gitea;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   imports = [
diff --git a/modules/servers/homepage.nix b/modules/servers/homepage.nix
index 5625fd7..21e390a 100644
--- a/modules/servers/homepage.nix
+++ b/modules/servers/homepage.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.homepage;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.homepage = setup.mkOptions "homepage" "home" 8082;
diff --git a/modules/servers/jellyfin.nix b/modules/servers/jellyfin.nix
index 1a8c984..d863057 100644
--- a/modules/servers/jellyfin.nix
+++ b/modules/servers/jellyfin.nix
@@ -19,7 +19,7 @@ let
     pkgs.gum
     sub-sync
   ];
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.jellyfin = setup.mkOptions "jellyfin" "flix" 8096;
diff --git a/modules/servers/kavita.nix b/modules/servers/kavita.nix
index 85147ff..3d78853 100644
--- a/modules/servers/kavita.nix
+++ b/modules/servers/kavita.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.kavita;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.kavita = setup.mkOptions "kavita" "library" config.services.kavita.settings.Port;
diff --git a/modules/servers/lidarr.nix b/modules/servers/lidarr.nix
index b833dec..970aae5 100644
--- a/modules/servers/lidarr.nix
+++ b/modules/servers/lidarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.lidarr;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.lidarr = setup.mkOptions "lidarr" "music" 8686;
diff --git a/modules/servers/maloja.nix b/modules/servers/maloja.nix
index 15edb02..7ba1787 100644
--- a/modules/servers/maloja.nix
+++ b/modules/servers/maloja.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.maloja;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.maloja = setup.mkOptions "maloja" "maloja" 42010;
diff --git a/modules/servers/mealie.nix b/modules/servers/mealie.nix
index 77026dd..8e7bcae 100644
--- a/modules/servers/mealie.nix
+++ b/modules/servers/mealie.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.mealie;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.mealie = setup.mkOptions "mealie" "mealie" 9925;
diff --git a/modules/servers/metube.nix b/modules/servers/metube.nix
index 6b585e2..d327dc5 100644
--- a/modules/servers/metube.nix
+++ b/modules/servers/metube.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.metube;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.metube = setup.mkOptions "metube" "bajameesta" 8881;
diff --git a/modules/servers/microbin.nix b/modules/servers/microbin.nix
index 1d10346..1cf86af 100644
--- a/modules/servers/microbin.nix
+++ b/modules/servers/microbin.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.microbin;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.microbin = setup.mkOptions "microbin" "copy" 8086;
diff --git a/modules/servers/multi-scrobbler.nix b/modules/servers/multi-scrobbler.nix
index eaab171..0bf642c 100644
--- a/modules/servers/multi-scrobbler.nix
+++ b/modules/servers/multi-scrobbler.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.multi-scrobbler;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.multi-scrobbler = setup.mkOptions "multi-scrobbler" "scrobble" 9078;
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index 92e5d11..295cb4a 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -31,7 +31,7 @@ let
   pytensorflow = pkgs.python311.withPackages (ps: [ ps.tensorflow ]);
   cfg = config.my.servers.nextcloud;
   cfgC = config.my.servers.collabora;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers = {
diff --git a/modules/servers/nix-serve.nix b/modules/servers/nix-serve.nix
index 14cb172..17572ae 100644
--- a/modules/servers/nix-serve.nix
+++ b/modules/servers/nix-serve.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.nix-serve;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.nix-serve = setup.mkOptions "nix-serve" "cache" 5000;
diff --git a/modules/servers/ombi.nix b/modules/servers/ombi.nix
index f54026c..eefb8e9 100644
--- a/modules/servers/ombi.nix
+++ b/modules/servers/ombi.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.ombi;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.ombi = setup.mkOptions "ombi" "requests" 3425;
diff --git a/modules/servers/plex-discord-bot.nix b/modules/servers/plex-discord-bot.nix
index 52ed20a..7469725 100644
--- a/modules/servers/plex-discord-bot.nix
+++ b/modules/servers/plex-discord-bot.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.plex-discord-bot;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
   name = "plex-discord-bot";
 in
 {
diff --git a/modules/servers/plex.nix b/modules/servers/plex.nix
index 2af7afa..82aea2c 100644
--- a/modules/servers/plex.nix
+++ b/modules/servers/plex.nix
@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.servers.plex;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.plex = setup.mkOptions "plex" "plex" 32400;
diff --git a/modules/servers/portfolio.nix b/modules/servers/portfolio.nix
index aa8ad65..5783754 100644
--- a/modules/servers/portfolio.nix
+++ b/modules/servers/portfolio.nix
@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.websites.portfolio;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.websites.portfolio = setup.mkOptions "portfolio" "portfolio" 0;
diff --git a/modules/servers/prowlarr.nix b/modules/servers/prowlarr.nix
index e2f2975..0f41fbc 100644
--- a/modules/servers/prowlarr.nix
+++ b/modules/servers/prowlarr.nix
@@ -5,7 +5,7 @@
 }:
 let
   cfg = config.my.servers.prowlarr;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.prowlarr = setup.mkOptions "prowlarr" "indexer" 9696;
diff --git a/modules/servers/radarr.nix b/modules/servers/radarr.nix
index 32c99de..9772bf6 100644
--- a/modules/servers/radarr.nix
+++ b/modules/servers/radarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.radarr;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.radarr = setup.mkOptions "radarr" "movies" 7878;
diff --git a/modules/servers/readeck.nix b/modules/servers/readeck.nix
index d867826..8e12e4f 100644
--- a/modules/servers/readeck.nix
+++ b/modules/servers/readeck.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.readeck;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.readeck = setup.mkOptions "readeck" "laters" 9546;
diff --git a/modules/servers/ryot.nix b/modules/servers/ryot.nix
index 6c57df6..6e59c13 100644
--- a/modules/servers/ryot.nix
+++ b/modules/servers/ryot.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.ryot;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.ryot = setup.mkOptions "ryot" "tracker" 8765;
diff --git a/modules/servers/shiori.nix b/modules/servers/shiori.nix
index 3fef157..48fe919 100644
--- a/modules/servers/shiori.nix
+++ b/modules/servers/shiori.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.shiori;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;
diff --git a/modules/servers/sonarr.nix b/modules/servers/sonarr.nix
index ebfa61f..ec89171 100644
--- a/modules/servers/sonarr.nix
+++ b/modules/servers/sonarr.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.sonarr;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.sonarr = setup.mkOptions "sonarr" "series" 8989;
diff --git a/modules/servers/stash.nix b/modules/servers/stash.nix
index c2f066b..a314f61 100644
--- a/modules/servers/stash.nix
+++ b/modules/servers/stash.nix
@@ -1,7 +1,7 @@
 { lib, config, ... }:
 let
   cfg = config.my.servers.stash;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.stash = setup.mkOptions "stash" "xxx" 9999;
diff --git a/modules/servers/synapse.nix b/modules/servers/synapse.nix
index a7bf6de..dea086a 100644
--- a/modules/servers/synapse.nix
+++ b/modules/servers/synapse.nix
@@ -8,7 +8,7 @@ let
   cfg = config.my.servers.synapse;
   cfgE = config.my.servers.element;
   domain = "wedsgk5ac2qcaf9yb.click";
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
   clientConfig."m.homeserver".base_url = cfg.url;
   serverConfig."m.server" = "${cfg.host}:443";
   mkWellKnown = data: ''
diff --git a/modules/servers/tranga.nix b/modules/servers/tranga.nix
index 7826be6..fc8576a 100644
--- a/modules/servers/tranga.nix
+++ b/modules/servers/tranga.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 let
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
   cfg = config.my.servers.tranga;
 in
 {
diff --git a/modules/servers/vaultwarden.nix b/modules/servers/vaultwarden.nix
index 07d0516..5b533fd 100644
--- a/modules/servers/vaultwarden.nix
+++ b/modules/servers/vaultwarden.nix
@@ -6,7 +6,7 @@
 }:
 let
   cfg = config.my.servers.vaultwarden;
-  setup = import ./setup.nix { inherit lib config; };
+  setup = import ../factories/setup.nix { inherit lib config; };
 in
 {
   options.my.servers.vaultwarden = setup.mkOptions "vaultwarden" "vault" 8222;