diff --git a/hosts/darwin/shared.nix b/hosts/darwin/shared.nix
index a2ebc95..c2e65e1 100644
--- a/hosts/darwin/shared.nix
+++ b/hosts/darwin/shared.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    ../../profiles/base
-    ../../profiles/darwin
+    ../../modules/base
+    ../../modules/darwin
   ];
 }
diff --git a/hosts/nixos/tahani/default.nix b/hosts/nixos/tahani/default.nix
index c620080..eb1ada8 100644
--- a/hosts/nixos/tahani/default.nix
+++ b/hosts/nixos/tahani/default.nix
@@ -5,8 +5,8 @@
   ...
 }: {
   imports = [
-    ../../../profiles/base
-    ../../../profiles/nixos
+    ../../../modules/base
+    ../../../modules/nixos
   ];
 
   boot = {
@@ -41,10 +41,12 @@
   networking = {
     hostName = hostname;
     useDHCP = false;
-    interfaces.eno1.ipv4.addresses = [{
-      address = "192.168.1.10";
-      prefixLength = 24;
-    }];
+    interfaces.eno1.ipv4.addresses = [
+      {
+        address = "192.168.1.10";
+        prefixLength = 24;
+      }
+    ];
     defaultGateway = "192.168.1.1";
     nameservers = ["1.1.1.1"];
   };
diff --git a/profiles/base/default.nix b/modules/base/default.nix
similarity index 100%
rename from profiles/base/default.nix
rename to modules/base/default.nix
diff --git a/profiles/base/home-manager/atuin.nix b/modules/base/home-manager/atuin.nix
similarity index 100%
rename from profiles/base/home-manager/atuin.nix
rename to modules/base/home-manager/atuin.nix
diff --git a/profiles/base/home-manager/bat.nix b/modules/base/home-manager/bat.nix
similarity index 100%
rename from profiles/base/home-manager/bat.nix
rename to modules/base/home-manager/bat.nix
diff --git a/profiles/base/home-manager/default.nix b/modules/base/home-manager/default.nix
similarity index 100%
rename from profiles/base/home-manager/default.nix
rename to modules/base/home-manager/default.nix
diff --git a/profiles/base/home-manager/eza.nix b/modules/base/home-manager/eza.nix
similarity index 100%
rename from profiles/base/home-manager/eza.nix
rename to modules/base/home-manager/eza.nix
diff --git a/profiles/base/home-manager/fish.nix b/modules/base/home-manager/fish.nix
similarity index 100%
rename from profiles/base/home-manager/fish.nix
rename to modules/base/home-manager/fish.nix
diff --git a/profiles/base/home-manager/git.nix b/modules/base/home-manager/git.nix
similarity index 100%
rename from profiles/base/home-manager/git.nix
rename to modules/base/home-manager/git.nix
diff --git a/profiles/base/home-manager/lazygit.nix b/modules/base/home-manager/lazygit.nix
similarity index 100%
rename from profiles/base/home-manager/lazygit.nix
rename to modules/base/home-manager/lazygit.nix
diff --git a/profiles/base/home-manager/mise.nix b/modules/base/home-manager/mise.nix
similarity index 100%
rename from profiles/base/home-manager/mise.nix
rename to modules/base/home-manager/mise.nix
diff --git a/profiles/base/home-manager/neovim/autocmd.nix b/modules/base/home-manager/neovim/autocmd.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/autocmd.nix
rename to modules/base/home-manager/neovim/autocmd.nix
diff --git a/profiles/base/home-manager/neovim/default.nix b/modules/base/home-manager/neovim/default.nix
similarity index 99%
rename from profiles/base/home-manager/neovim/default.nix
rename to modules/base/home-manager/neovim/default.nix
index 013b56d..ce7f2ea 100644
--- a/profiles/base/home-manager/neovim/default.nix
+++ b/modules/base/home-manager/neovim/default.nix
@@ -22,6 +22,5 @@
         flavour = "latte";
       };
     };
-
   };
 }
diff --git a/profiles/base/home-manager/neovim/mappings.nix b/modules/base/home-manager/neovim/mappings.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/mappings.nix
rename to modules/base/home-manager/neovim/mappings.nix
diff --git a/profiles/base/home-manager/neovim/options.nix b/modules/base/home-manager/neovim/options.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/options.nix
rename to modules/base/home-manager/neovim/options.nix
diff --git a/profiles/base/home-manager/neovim/plugins/conform.nix b/modules/base/home-manager/neovim/plugins/conform.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/plugins/conform.nix
rename to modules/base/home-manager/neovim/plugins/conform.nix
diff --git a/profiles/base/home-manager/neovim/plugins/grug-far.nix b/modules/base/home-manager/neovim/plugins/grug-far.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/plugins/grug-far.nix
rename to modules/base/home-manager/neovim/plugins/grug-far.nix
diff --git a/profiles/base/home-manager/neovim/plugins/lazygit.nix b/modules/base/home-manager/neovim/plugins/lazygit.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/plugins/lazygit.nix
rename to modules/base/home-manager/neovim/plugins/lazygit.nix
diff --git a/profiles/base/home-manager/neovim/plugins/lsp.nix b/modules/base/home-manager/neovim/plugins/lsp.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/plugins/lsp.nix
rename to modules/base/home-manager/neovim/plugins/lsp.nix
diff --git a/profiles/base/home-manager/neovim/plugins/mini.nix b/modules/base/home-manager/neovim/plugins/mini.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/plugins/mini.nix
rename to modules/base/home-manager/neovim/plugins/mini.nix
diff --git a/profiles/base/home-manager/neovim/plugins/treesitter.nix b/modules/base/home-manager/neovim/plugins/treesitter.nix
similarity index 100%
rename from profiles/base/home-manager/neovim/plugins/treesitter.nix
rename to modules/base/home-manager/neovim/plugins/treesitter.nix
diff --git a/profiles/base/home-manager/ssh.nix b/modules/base/home-manager/ssh.nix
similarity index 100%
rename from profiles/base/home-manager/ssh.nix
rename to modules/base/home-manager/ssh.nix
diff --git a/profiles/base/home-manager/starship.nix b/modules/base/home-manager/starship.nix
similarity index 100%
rename from profiles/base/home-manager/starship.nix
rename to modules/base/home-manager/starship.nix
diff --git a/profiles/base/home-manager/zellij.nix b/modules/base/home-manager/zellij.nix
similarity index 100%
rename from profiles/base/home-manager/zellij.nix
rename to modules/base/home-manager/zellij.nix
diff --git a/profiles/base/home-manager/zoxide.nix b/modules/base/home-manager/zoxide.nix
similarity index 100%
rename from profiles/base/home-manager/zoxide.nix
rename to modules/base/home-manager/zoxide.nix
diff --git a/profiles/base/home-manager/zsh.nix b/modules/base/home-manager/zsh.nix
similarity index 100%
rename from profiles/base/home-manager/zsh.nix
rename to modules/base/home-manager/zsh.nix
diff --git a/profiles/base/packages.nix b/modules/base/packages.nix
similarity index 100%
rename from profiles/base/packages.nix
rename to modules/base/packages.nix
diff --git a/profiles/darwin/default.nix b/modules/darwin/default.nix
similarity index 100%
rename from profiles/darwin/default.nix
rename to modules/darwin/default.nix
diff --git a/profiles/darwin/dock/default.nix b/modules/darwin/dock/default.nix
similarity index 100%
rename from profiles/darwin/dock/default.nix
rename to modules/darwin/dock/default.nix
diff --git a/profiles/darwin/home-manager/ghostty.nix b/modules/darwin/home-manager/ghostty.nix
similarity index 100%
rename from profiles/darwin/home-manager/ghostty.nix
rename to modules/darwin/home-manager/ghostty.nix
diff --git a/profiles/darwin/homebrew.nix b/modules/darwin/homebrew.nix
similarity index 100%
rename from profiles/darwin/homebrew.nix
rename to modules/darwin/homebrew.nix
diff --git a/profiles/darwin/packages.nix b/modules/darwin/packages.nix
similarity index 100%
rename from profiles/darwin/packages.nix
rename to modules/darwin/packages.nix
diff --git a/profiles/darwin/secrets.nix b/modules/darwin/secrets.nix
similarity index 100%
rename from profiles/darwin/secrets.nix
rename to modules/darwin/secrets.nix
diff --git a/profiles/darwin/system.nix b/modules/darwin/system.nix
similarity index 100%
rename from profiles/darwin/system.nix
rename to modules/darwin/system.nix
diff --git a/profiles/nixos/default.nix b/modules/nixos/default.nix
similarity index 93%
rename from profiles/nixos/default.nix
rename to modules/nixos/default.nix
index b99909b..c8dd207 100644
--- a/profiles/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -27,10 +27,6 @@ in {
   networking.firewall = {
     enable = true;
     trustedInterfaces = ["eno1" "tailscale0"];
-    allowPing = true;
-    allowedUDPPorts = [53 10000 config.services.tailscale.port];
-    allowedTCPPorts = [22 53];
-    checkReversePath = "loose";
   };
 
   services = {
@@ -44,6 +40,8 @@ in {
     tailscale = {
       enable = true;
       port = 41641;
+      useRoutingFeatures = "server";
+      openFirewall = true;
     };
     adguardhome = {
       enable = true;
diff --git a/profiles/nixos/home-manager/zellij.nix b/modules/nixos/home-manager/zellij.nix
similarity index 100%
rename from profiles/nixos/home-manager/zellij.nix
rename to modules/nixos/home-manager/zellij.nix
diff --git a/profiles/nixos/packages.nix b/modules/nixos/packages.nix
similarity index 100%
rename from profiles/nixos/packages.nix
rename to modules/nixos/packages.nix