diff --git a/.sops.yaml b/.sops.yaml
index 65fc548..5f13372 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -10,18 +10,18 @@ creation_rules:
     key_groups:
       - age:
         - *xun
-  - path_regex: secrets/global
+  - path_regex: profiles/secrets/global
     key_groups:
       - age:
         - *xun
         - *nixdesk
         - *hopper
-  - path_regex: secrets/nixdesk
+  - path_regex: profiles/secrets/nixdesk
     key_groups:
       - age:
         - *xun
         - *nixdesk
-  - path_regex: secrets/hopper
+  - path_regex: profiles/secrets/hopper
     key_groups:
       - age:
         - *xun
diff --git a/hosts/default.nix b/hosts/default.nix
index 560c297..1538edf 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -77,12 +77,10 @@ in {
       imports = lib.flatten [
         ./nixdesk
 
-        (rootPaths [
-          "secrets"
-          "secrets/nixdesk"
-        ])
-
         (with profiles; [
+          secrets.default
+          secrets.nixdesk.default
+
           core.default
           core.tools
           core.compat
@@ -103,7 +101,7 @@ in {
           network.tailscale
           network.goldberg
 
-          desktop.default
+          desktop.ly
           desktop.awesome
           desktop.sway
           #..desktop.hyprland
@@ -144,43 +142,19 @@ in {
       imports = lib.flatten [
         ./hopper
 
-        (rootPaths [
-          "secrets"
-          "secrets/hopper"
+        (with profiles; [
+          secrets.default
+          secrets.hopper.default
+
+          core.default
+          core.tools
+
+          network.avahi
+          network.networkd
+          network.tailscale
+
+          services.syncthing
         ])
-
-        (modulePaths [
-          "core"
-          "core/tools.nix"
-
-          #"programs"
-          #"programs/steam.nix"
-
-          #"desktop"
-          #"desktop/awesome.nix"
-
-          #"hardware/graphics.nix"
-          #"hardware/steam-hardware.nix"
-          #"hardware/bluetooth.nix"
-          #"hardware/qmk.nix"
-
-          "network/avahi.nix"
-          "network/networkd.nix"
-          "network/tailscale.nix"
-
-          #"services"
-          #"services/pipewire.nix"
-          "services/syncthing.nix"
-          #"services/containers/server"
-          # "services/containers/experimental" # TODO maybe reenable this?? or just abandon it and move fully to systemd network namespace
-        ])
-
-        #{
-        #  home-manager = {
-        #    users.xun.imports = homeImports."xun@hopper";
-        #    extraSpecialArgs = specialArgs;
-        #  };
-        #}
       ];
     };
     liveiso = {
@@ -188,11 +162,10 @@ in {
       imports = lib.flatten [
         ./liveiso
 
-        (modulePaths [
-          "/nix"
-          "/core/security.nix"
-          "/services"
-          "/desktop"
+        (with profiles; [
+          nix.default
+          core.security
+          services.default
         ])
       ];
     };
diff --git a/system/core/boot.nix b/profiles/core/boot.nix
similarity index 100%
rename from system/core/boot.nix
rename to profiles/core/boot.nix
diff --git a/system/core/compat.nix b/profiles/core/compat.nix
similarity index 100%
rename from system/core/compat.nix
rename to profiles/core/compat.nix
diff --git a/system/core/default.nix b/profiles/core/default.nix
similarity index 100%
rename from system/core/default.nix
rename to profiles/core/default.nix
diff --git a/system/core/docs.nix b/profiles/core/docs.nix
similarity index 100%
rename from system/core/docs.nix
rename to profiles/core/docs.nix
diff --git a/system/core/gvfs.nix b/profiles/core/gvfs.nix
similarity index 100%
rename from system/core/gvfs.nix
rename to profiles/core/gvfs.nix
diff --git a/system/core/harden.nix b/profiles/core/harden.nix
similarity index 100%
rename from system/core/harden.nix
rename to profiles/core/harden.nix
diff --git a/system/core/locale.nix b/profiles/core/locale.nix
similarity index 100%
rename from system/core/locale.nix
rename to profiles/core/locale.nix
diff --git a/system/core/security.nix b/profiles/core/security.nix
similarity index 100%
rename from system/core/security.nix
rename to profiles/core/security.nix
diff --git a/system/core/ssh.nix b/profiles/core/ssh.nix
similarity index 100%
rename from system/core/ssh.nix
rename to profiles/core/ssh.nix
diff --git a/system/core/tools.nix b/profiles/core/tools.nix
similarity index 100%
rename from system/core/tools.nix
rename to profiles/core/tools.nix
diff --git a/system/core/users.nix b/profiles/core/users.nix
similarity index 100%
rename from system/core/users.nix
rename to profiles/core/users.nix
diff --git a/system/desktop/awesome.nix b/profiles/desktop/awesome.nix
similarity index 100%
rename from system/desktop/awesome.nix
rename to profiles/desktop/awesome.nix
diff --git a/system/desktop/hyprland.nix b/profiles/desktop/hyprland.nix
similarity index 100%
rename from system/desktop/hyprland.nix
rename to profiles/desktop/hyprland.nix
diff --git a/system/desktop/default.nix b/profiles/desktop/ly.nix
similarity index 100%
rename from system/desktop/default.nix
rename to profiles/desktop/ly.nix
diff --git a/system/desktop/sway.nix b/profiles/desktop/sway.nix
similarity index 100%
rename from system/desktop/sway.nix
rename to profiles/desktop/sway.nix
diff --git a/system/desktop/x11/default.nix b/profiles/desktop/x11/default.nix
similarity index 100%
rename from system/desktop/x11/default.nix
rename to profiles/desktop/x11/default.nix
diff --git a/system/desktop/x11/nosleep.nix b/profiles/desktop/x11/nosleep.nix
similarity index 100%
rename from system/desktop/x11/nosleep.nix
rename to profiles/desktop/x11/nosleep.nix
diff --git a/system/desktop/x11/xclip.nix b/profiles/desktop/x11/xclip.nix
similarity index 100%
rename from system/desktop/x11/xclip.nix
rename to profiles/desktop/x11/xclip.nix
diff --git a/system/hardware/bluetooth.nix b/profiles/hardware/bluetooth.nix
similarity index 100%
rename from system/hardware/bluetooth.nix
rename to profiles/hardware/bluetooth.nix
diff --git a/system/hardware/graphics.nix b/profiles/hardware/graphics.nix
similarity index 100%
rename from system/hardware/graphics.nix
rename to profiles/hardware/graphics.nix
diff --git a/system/hardware/qmk.nix b/profiles/hardware/qmk.nix
similarity index 100%
rename from system/hardware/qmk.nix
rename to profiles/hardware/qmk.nix
diff --git a/system/hardware/steam-hardware.nix b/profiles/hardware/steam-hardware.nix
similarity index 100%
rename from system/hardware/steam-hardware.nix
rename to profiles/hardware/steam-hardware.nix
diff --git a/system/network/avahi.nix b/profiles/network/avahi.nix
similarity index 100%
rename from system/network/avahi.nix
rename to profiles/network/avahi.nix
diff --git a/system/network/goldberg.nix b/profiles/network/goldberg.nix
similarity index 100%
rename from system/network/goldberg.nix
rename to profiles/network/goldberg.nix
diff --git a/system/network/localsend.nix b/profiles/network/localsend.nix
similarity index 100%
rename from system/network/localsend.nix
rename to profiles/network/localsend.nix
diff --git a/system/network/networkd.nix b/profiles/network/networkd.nix
similarity index 100%
rename from system/network/networkd.nix
rename to profiles/network/networkd.nix
diff --git a/system/network/tailscale.nix b/profiles/network/tailscale.nix
similarity index 78%
rename from system/network/tailscale.nix
rename to profiles/network/tailscale.nix
index 9e32381..8c488ec 100644
--- a/system/network/tailscale.nix
+++ b/profiles/network/tailscale.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{
+  self,
+  super,
+  root,
+}: {config, ...}: {
   services.tailscale = {
     enable = true;
     openFirewall = true;
diff --git a/system/network/wifi.nix b/profiles/network/wifi.nix
similarity index 100%
rename from system/network/wifi.nix
rename to profiles/network/wifi.nix
diff --git a/system/nix/default.nix b/profiles/nix/default.nix
similarity index 100%
rename from system/nix/default.nix
rename to profiles/nix/default.nix
diff --git a/system/nix/gc.nix b/profiles/nix/gc.nix
similarity index 100%
rename from system/nix/gc.nix
rename to profiles/nix/gc.nix
diff --git a/system/nix/nixpkgs.nix b/profiles/nix/nixpkgs.nix
similarity index 100%
rename from system/nix/nixpkgs.nix
rename to profiles/nix/nixpkgs.nix
diff --git a/system/nix/substituters.nix b/profiles/nix/substituters.nix
similarity index 100%
rename from system/nix/substituters.nix
rename to profiles/nix/substituters.nix
diff --git a/system/programs/RE/default.nix b/profiles/programs/RE/default.nix
similarity index 100%
rename from system/programs/RE/default.nix
rename to profiles/programs/RE/default.nix
diff --git a/system/programs/RE/il2cppdumper/default.nix b/profiles/programs/RE/il2cppdumper/default.nix
similarity index 100%
rename from system/programs/RE/il2cppdumper/default.nix
rename to profiles/programs/RE/il2cppdumper/default.nix
diff --git a/system/programs/RE/il2cppdumper/deps.nix b/profiles/programs/RE/il2cppdumper/deps.nix
similarity index 100%
rename from system/programs/RE/il2cppdumper/deps.nix
rename to profiles/programs/RE/il2cppdumper/deps.nix
diff --git a/system/programs/RE/ilspy/default.nix b/profiles/programs/RE/ilspy/default.nix
similarity index 100%
rename from system/programs/RE/ilspy/default.nix
rename to profiles/programs/RE/ilspy/default.nix
diff --git a/system/programs/RE/ilspy/deps.nix b/profiles/programs/RE/ilspy/deps.nix
similarity index 100%
rename from system/programs/RE/ilspy/deps.nix
rename to profiles/programs/RE/ilspy/deps.nix
diff --git a/system/programs/adb.nix b/profiles/programs/adb.nix
similarity index 100%
rename from system/programs/adb.nix
rename to profiles/programs/adb.nix
diff --git a/system/programs/default.nix b/profiles/programs/default.nix
similarity index 100%
rename from system/programs/default.nix
rename to profiles/programs/default.nix
diff --git a/system/programs/fonts.nix b/profiles/programs/fonts.nix
similarity index 100%
rename from system/programs/fonts.nix
rename to profiles/programs/fonts.nix
diff --git a/system/programs/gamemode.nix b/profiles/programs/gamemode.nix
similarity index 100%
rename from system/programs/gamemode.nix
rename to profiles/programs/gamemode.nix
diff --git a/system/programs/gamescope.nix b/profiles/programs/gamescope.nix
similarity index 100%
rename from system/programs/gamescope.nix
rename to profiles/programs/gamescope.nix
diff --git a/system/programs/home-manager.nix b/profiles/programs/home-manager.nix
similarity index 100%
rename from system/programs/home-manager.nix
rename to profiles/programs/home-manager.nix
diff --git a/system/programs/qt.nix b/profiles/programs/qt.nix
similarity index 100%
rename from system/programs/qt.nix
rename to profiles/programs/qt.nix
diff --git a/system/programs/steam.nix b/profiles/programs/steam.nix
similarity index 100%
rename from system/programs/steam.nix
rename to profiles/programs/steam.nix
diff --git a/system/programs/tools.nix b/profiles/programs/tools.nix
similarity index 100%
rename from system/programs/tools.nix
rename to profiles/programs/tools.nix
diff --git a/system/programs/zsh.nix b/profiles/programs/zsh.nix
similarity index 100%
rename from system/programs/zsh.nix
rename to profiles/programs/zsh.nix
diff --git a/secrets/default.nix b/profiles/secrets/default.nix
similarity index 78%
rename from secrets/default.nix
rename to profiles/secrets/default.nix
index ab8fde3..ef6fd81 100644
--- a/secrets/default.nix
+++ b/profiles/secrets/default.nix
@@ -1,4 +1,4 @@
-{inputs, ...}: {
+_: {inputs, ...}: {
   imports = [
     inputs.sops-nix.nixosModules.sops
     ./global
diff --git a/secrets/global/default.nix b/profiles/secrets/global/default.nix
similarity index 100%
rename from secrets/global/default.nix
rename to profiles/secrets/global/default.nix
diff --git a/secrets/global/tailscale-auth.yaml b/profiles/secrets/global/tailscale-auth.yaml
similarity index 100%
rename from secrets/global/tailscale-auth.yaml
rename to profiles/secrets/global/tailscale-auth.yaml
diff --git a/secrets/hopper/authelia.yaml b/profiles/secrets/hopper/authelia.yaml
similarity index 100%
rename from secrets/hopper/authelia.yaml
rename to profiles/secrets/hopper/authelia.yaml
diff --git a/secrets/hopper/betanin b/profiles/secrets/hopper/betanin
similarity index 100%
rename from secrets/hopper/betanin
rename to profiles/secrets/hopper/betanin
diff --git a/secrets/hopper/brawlstars b/profiles/secrets/hopper/brawlstars
similarity index 100%
rename from secrets/hopper/brawlstars
rename to profiles/secrets/hopper/brawlstars
diff --git a/secrets/hopper/cloudflare b/profiles/secrets/hopper/cloudflare
similarity index 100%
rename from secrets/hopper/cloudflare
rename to profiles/secrets/hopper/cloudflare
diff --git a/secrets/hopper/code-server b/profiles/secrets/hopper/code-server
similarity index 100%
rename from secrets/hopper/code-server
rename to profiles/secrets/hopper/code-server
diff --git a/secrets/hopper/default.nix b/profiles/secrets/hopper/default.nix
similarity index 98%
rename from secrets/hopper/default.nix
rename to profiles/secrets/hopper/default.nix
index a0810e3..03f5c50 100644
--- a/secrets/hopper/default.nix
+++ b/profiles/secrets/hopper/default.nix
@@ -1,5 +1,5 @@
 ## TODO use defaultSopsFile mayb
-{config, ...}: let
+_: {config, ...}: let
   autheliaUser = config.services.authelia.instances.main.user;
 in {
   sops.secrets = {
diff --git a/secrets/hopper/grafana-pass b/profiles/secrets/hopper/grafana-pass
similarity index 100%
rename from secrets/hopper/grafana-pass
rename to profiles/secrets/hopper/grafana-pass
diff --git a/secrets/hopper/jackett b/profiles/secrets/hopper/jackett
similarity index 100%
rename from secrets/hopper/jackett
rename to profiles/secrets/hopper/jackett
diff --git a/secrets/hopper/lldap.yaml b/profiles/secrets/hopper/lldap.yaml
similarity index 100%
rename from secrets/hopper/lldap.yaml
rename to profiles/secrets/hopper/lldap.yaml
diff --git a/secrets/hopper/serverenv b/profiles/secrets/hopper/serverenv
similarity index 100%
rename from secrets/hopper/serverenv
rename to profiles/secrets/hopper/serverenv
diff --git a/secrets/hopper/slskd b/profiles/secrets/hopper/slskd
similarity index 100%
rename from secrets/hopper/slskd
rename to profiles/secrets/hopper/slskd
diff --git a/secrets/hopper/wakapi b/profiles/secrets/hopper/wakapi
similarity index 100%
rename from secrets/hopper/wakapi
rename to profiles/secrets/hopper/wakapi
diff --git a/secrets/hopper/wireguard b/profiles/secrets/hopper/wireguard
similarity index 100%
rename from secrets/hopper/wireguard
rename to profiles/secrets/hopper/wireguard
diff --git a/secrets/hopper/wireguard-config b/profiles/secrets/hopper/wireguard-config
similarity index 100%
rename from secrets/hopper/wireguard-config
rename to profiles/secrets/hopper/wireguard-config
diff --git a/secrets/hopper/wireguard.yaml b/profiles/secrets/hopper/wireguard.yaml
similarity index 100%
rename from secrets/hopper/wireguard.yaml
rename to profiles/secrets/hopper/wireguard.yaml
diff --git a/secrets/nixdesk/brawlstars b/profiles/secrets/nixdesk/brawlstars
similarity index 100%
rename from secrets/nixdesk/brawlstars
rename to profiles/secrets/nixdesk/brawlstars
diff --git a/secrets/nixdesk/cloudflare b/profiles/secrets/nixdesk/cloudflare
similarity index 100%
rename from secrets/nixdesk/cloudflare
rename to profiles/secrets/nixdesk/cloudflare
diff --git a/secrets/nixdesk/default.nix b/profiles/secrets/nixdesk/default.nix
similarity index 100%
rename from secrets/nixdesk/default.nix
rename to profiles/secrets/nixdesk/default.nix
diff --git a/secrets/nixdesk/samba b/profiles/secrets/nixdesk/samba
similarity index 100%
rename from secrets/nixdesk/samba
rename to profiles/secrets/nixdesk/samba
diff --git a/secrets/nixdesk/wireguard b/profiles/secrets/nixdesk/wireguard
similarity index 100%
rename from secrets/nixdesk/wireguard
rename to profiles/secrets/nixdesk/wireguard
diff --git a/secrets/nixdesk/wireguard.yaml b/profiles/secrets/nixdesk/wireguard.yaml
similarity index 100%
rename from secrets/nixdesk/wireguard.yaml
rename to profiles/secrets/nixdesk/wireguard.yaml
diff --git a/system/services/containers/experimental/beets.yaml b/profiles/services/containers/experimental/beets.yaml
similarity index 100%
rename from system/services/containers/experimental/beets.yaml
rename to profiles/services/containers/experimental/beets.yaml
diff --git a/system/services/containers/experimental/default.nix b/profiles/services/containers/experimental/default.nix
similarity index 100%
rename from system/services/containers/experimental/default.nix
rename to profiles/services/containers/experimental/default.nix
diff --git a/system/services/containers/experimental/smbshare.nix b/profiles/services/containers/experimental/smbshare.nix
similarity index 100%
rename from system/services/containers/experimental/smbshare.nix
rename to profiles/services/containers/experimental/smbshare.nix
diff --git a/system/services/containers/server/default.nix b/profiles/services/containers/server/default.nix
similarity index 100%
rename from system/services/containers/server/default.nix
rename to profiles/services/containers/server/default.nix
diff --git a/system/services/containers/server/statistics/default.nix b/profiles/services/containers/server/statistics/default.nix
similarity index 100%
rename from system/services/containers/server/statistics/default.nix
rename to profiles/services/containers/server/statistics/default.nix
diff --git a/system/services/containers/server/statistics/loki.yaml b/profiles/services/containers/server/statistics/loki.yaml
similarity index 100%
rename from system/services/containers/server/statistics/loki.yaml
rename to profiles/services/containers/server/statistics/loki.yaml
diff --git a/system/services/default.nix b/profiles/services/default.nix
similarity index 100%
rename from system/services/default.nix
rename to profiles/services/default.nix
diff --git a/system/services/flatpak.nix b/profiles/services/flatpak.nix
similarity index 100%
rename from system/services/flatpak.nix
rename to profiles/services/flatpak.nix
diff --git a/system/services/gnome-services.nix b/profiles/services/gnome-services.nix
similarity index 100%
rename from system/services/gnome-services.nix
rename to profiles/services/gnome-services.nix
diff --git a/system/services/ollama.nix b/profiles/services/ollama.nix
similarity index 100%
rename from system/services/ollama.nix
rename to profiles/services/ollama.nix
diff --git a/system/services/pipewire.nix b/profiles/services/pipewire.nix
similarity index 100%
rename from system/services/pipewire.nix
rename to profiles/services/pipewire.nix
diff --git a/system/services/syncthing.nix b/profiles/services/syncthing.nix
similarity index 100%
rename from system/services/syncthing.nix
rename to profiles/services/syncthing.nix
diff --git a/system/services/virt/distrobox.nix b/profiles/services/virt/distrobox.nix
similarity index 100%
rename from system/services/virt/distrobox.nix
rename to profiles/services/virt/distrobox.nix
diff --git a/system/services/virt/docker.nix b/profiles/services/virt/docker.nix
similarity index 100%
rename from system/services/virt/docker.nix
rename to profiles/services/virt/docker.nix
diff --git a/system/services/virt/podman.nix b/profiles/services/virt/podman.nix
similarity index 100%
rename from system/services/virt/podman.nix
rename to profiles/services/virt/podman.nix
diff --git a/system/services/virt/virt-manager.nix b/profiles/services/virt/virt-manager.nix
similarity index 100%
rename from system/services/virt/virt-manager.nix
rename to profiles/services/virt/virt-manager.nix
diff --git a/system/services/virt/waydroid.nix b/profiles/services/virt/waydroid.nix
similarity index 100%
rename from system/services/virt/waydroid.nix
rename to profiles/services/virt/waydroid.nix
diff --git a/system/services/xdg-portals.nix b/profiles/services/xdg-portals.nix
similarity index 100%
rename from system/services/xdg-portals.nix
rename to profiles/services/xdg-portals.nix