diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 11dbf8b..75d24b2 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -160,7 +160,6 @@
         "libvirtd"
         "dialout" # Necessary for serial port interactions
       ];
-      shell = pkgs.fish;
       openssh.authorizedKeys.keys = [ pubkeys.ny ];
     };
   };
diff --git a/hosts/shan/configuration.nix b/hosts/shan/configuration.nix
index d14a0da..c7c56c4 100644
--- a/hosts/shan/configuration.nix
+++ b/hosts/shan/configuration.nix
@@ -9,9 +9,7 @@
   imports = [
     (modulesPath + "/profiles/qemu-guest.nix")
     ./disk-config.nix
-    ../../modules/nix
-    ../../modules/users/ny.nix
-    ./test.nix
+    ../../modules
   ];
 
   age.secrets.navidrome.file = ../../secrets/navidrome.age;
@@ -21,10 +19,13 @@
     efiInstallAsRemovable = true;
   };
 
-  #  modules.container.paperless-ngx = {
-  #enable = true;
-  #openPort = true;
-  #};
+  modules.server.paperless = {
+    enable = true;
+    openPort = true;
+    settings = {
+      PAPERLESS_URL = "https://paperless.ccnlc.eu";
+    };
+  };
 
   modules.server.navidrome = {
     enable = true;
@@ -56,6 +57,7 @@
       #useRoutingFeatures = "both";
     };
   };
+
   environment.systemPackages = map lib.lowPrio [
     pkgs.curl
   ];
diff --git a/options/container/default.nix b/options/container/default.nix
index 2c783fa..a08a6ab 100644
--- a/options/container/default.nix
+++ b/options/container/default.nix
@@ -4,8 +4,6 @@ let
   inherit (lib) mkIf mkEnableOption;
 in
 {
-  imports = [ ./paperless-ngx ];
-
   options.modules.container = {
     enable = mkEnableOption "container support";
   };
diff --git a/options/default.nix b/options/default.nix
index 775f114..7e2254a 100644
--- a/options/default.nix
+++ b/options/default.nix
@@ -2,7 +2,7 @@
   imports = [
     ./media.nix
     ./system.nix
-    ./navidrome.nix
     ./container
+    ./server
   ];
 }
diff --git a/options/server/default.nix b/options/server/default.nix
new file mode 100644
index 0000000..378355e
--- /dev/null
+++ b/options/server/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./paperless-ngx
+    ./navidrome.nix
+  ];
+}
diff --git a/options/navidrome.nix b/options/server/navidrome.nix
similarity index 100%
rename from options/navidrome.nix
rename to options/server/navidrome.nix
diff --git a/options/container/paperless-ngx/.env b/options/server/paperless-ngx/.env
similarity index 100%
rename from options/container/paperless-ngx/.env
rename to options/server/paperless-ngx/.env
diff --git a/options/container/paperless-ngx/default.nix b/options/server/paperless-ngx/default.nix
similarity index 90%
rename from options/container/paperless-ngx/default.nix
rename to options/server/paperless-ngx/default.nix
index e0c80fb..2f19250 100644
--- a/options/container/paperless-ngx/default.nix
+++ b/options/server/paperless-ngx/default.nix
@@ -8,10 +8,10 @@
 let
   inherit (lib) mkIf mkOption mkEnableOption;
   inherit (lib.types) port bool;
-  cfg = config.modules.container.paperless;
+  cfg = config.modules.server.paperless;
 in
 {
-  options.modules.container.paperless = {
+  options.modules.server.paperless = {
     enable = mkEnableOption "paperless";
     port = mkOption {
       default = 8000;