diff --git a/home-manager/tuiapps/git.nix b/home-manager/tuiapps/git.nix
index 6d56f17..33388fc 100644
--- a/home-manager/tuiapps/git.nix
+++ b/home-manager/tuiapps/git.nix
@@ -1,7 +1,7 @@
 {
   # Enable git and config
   programs.git = let
-    secrets = import ../../nixos/common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     lfs.enable = true;
diff --git a/nixos/common/ips.nix b/nixos/modules/ips.nix
similarity index 100%
rename from nixos/common/ips.nix
rename to nixos/modules/ips.nix
diff --git a/nixos/server/acme.nix b/nixos/server/acme.nix
index c217655..28d2fcb 100644
--- a/nixos/server/acme.nix
+++ b/nixos/server/acme.nix
@@ -1,6 +1,6 @@
 {
   security.acme = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in { 
     acceptTerms = true;
     defaults.email = secrets.jimEmail;
diff --git a/nixos/server/ddclient.nix b/nixos/server/ddclient.nix
index c66d5cb..3f39a73 100644
--- a/nixos/server/ddclient.nix
+++ b/nixos/server/ddclient.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
   # DDClient for Dynamic IPs
   services.ddclient = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     protocol = "cloudflare";
diff --git a/nixos/server/element.nix b/nixos/server/element.nix
index a0e03dc..3023b40 100644
--- a/nixos/server/element.nix
+++ b/nixos/server/element.nix
@@ -1,7 +1,7 @@
 {
   # Configure the Element web server
   nixpkgs.config.element-web.conf = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     default_server_config = {
       "m.homeserver" = {
diff --git a/nixos/server/firewall.nix b/nixos/server/firewall.nix
index 39cec06..a94b56a 100644
--- a/nixos/server/firewall.nix
+++ b/nixos/server/firewall.nix
@@ -4,8 +4,8 @@
 
   # Configure firewall
   networking = let
-    ips = import ../common/ips.nix;
-    secrets = import ../common/secrets.nix;
+    ips = import ../modules/ips.nix;
+    secrets = import ../../../secrets.nix;
   in {
     firewall = {
       allowPing = false;
diff --git a/nixos/server/gitea.nix b/nixos/server/gitea.nix
index ab910ce..6a95f8e 100644
--- a/nixos/server/gitea.nix
+++ b/nixos/server/gitea.nix
@@ -1,6 +1,6 @@
 {
   services.gitea = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     settings = {
diff --git a/nixos/server/lemmy.nix b/nixos/server/lemmy.nix
index 2b713bf..229774a 100644
--- a/nixos/server/lemmy.nix
+++ b/nixos/server/lemmy.nix
@@ -1,6 +1,6 @@
 {
   services.lemmy = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     nginx.enable = true;
diff --git a/nixos/server/mailserver.nix b/nixos/server/mailserver.nix
index c2e13f7..60cdd23 100644
--- a/nixos/server/mailserver.nix
+++ b/nixos/server/mailserver.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: let
-  secrets = import ../common/secrets.nix;
+  secrets = import ../../../secrets.nix;
 in rec {
   # Mail server
   mailserver = rec {
diff --git a/nixos/server/mastodon.nix b/nixos/server/mastodon.nix
index 16f1819..258eda4 100644
--- a/nixos/server/mastodon.nix
+++ b/nixos/server/mastodon.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   services.mastodon = let 
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     localDomain = "social.${secrets.jimDomain}";
diff --git a/nixos/server/nextcloud.nix b/nixos/server/nextcloud.nix
index 86e0b7f..cc2bb62 100644
--- a/nixos/server/nextcloud.nix
+++ b/nixos/server/nextcloud.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: let
-  secrets = import ../common/secrets.nix;
+  secrets = import ../../../secrets.nix;
 in {
   services.nextcloud = {
     enable = true;
diff --git a/nixos/server/nfs.nix b/nixos/server/nfs.nix
index 6d017de..6b2e95d 100644
--- a/nixos/server/nfs.nix
+++ b/nixos/server/nfs.nix
@@ -1,7 +1,7 @@
 {
   # NFS server
   services.nfs.server = let 
-    ips = import ../common/ips.nix;
+    ips = import ../modules/ips.nix;
   in {
     enable = true;
     exports = ''
diff --git a/nixos/server/nginx.nix b/nixos/server/nginx.nix
index f487d0b..f8867a0 100644
--- a/nixos/server/nginx.nix
+++ b/nixos/server/nginx.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   services.nginx = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     package = (pkgs.nginx.override {
diff --git a/nixos/server/pufferpanel.nix b/nixos/server/pufferpanel.nix
index 33689ea..e911f1a 100644
--- a/nixos/server/pufferpanel.nix
+++ b/nixos/server/pufferpanel.nix
@@ -1,6 +1,6 @@
 {pkgs, lib, ...}: {
   services.pufferpanel = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     environment = {
diff --git a/nixos/server/synapse.nix b/nixos/server/synapse.nix
index fc95bf0..0810145 100644
--- a/nixos/server/synapse.nix
+++ b/nixos/server/synapse.nix
@@ -1,6 +1,6 @@
 {pkgs, config, ...}: {
   services = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     # Synapse Matrix server
     matrix-synapse = with config.services.coturn; {
diff --git a/nixos/server/vaultwarden.nix b/nixos/server/vaultwarden.nix
index 44a9e73..119c5ac 100644
--- a/nixos/server/vaultwarden.nix
+++ b/nixos/server/vaultwarden.nix
@@ -1,6 +1,6 @@
 {
   services.vaultwarden = let
-    secrets = import ../common/secrets.nix;
+    secrets = import ../../../secrets.nix;
   in {
     enable = true;
     config = {