diff --git a/common/secret/default.nix b/common/secret/default.nix
index ccad819d..b6e0ff59 100644
Binary files a/common/secret/default.nix and b/common/secret/default.nix differ
diff --git a/home-manager/games.nix b/home-manager/games.nix
index ecd0ff33..dca24838 100644
--- a/home-manager/games.nix
+++ b/home-manager/games.nix
@@ -15,7 +15,7 @@
     inherit (pkgs) minetest;
     inherit (pkgs.wineWowPackages) staging;
     gw2 = pkgs.writeShellScriptBin "gw2" ''
-      cd /home/maralorn/GW2
+      cd /home/maralorn/volatile/GW2
 
       # Intel/AMD Mesa Specific Env_vars
       # export vblank_mode=0
diff --git a/home-manager/machines.nix b/home-manager/machines.nix
index 989da30f..1eb4855a 100644
--- a/home-manager/machines.nix
+++ b/home-manager/machines.nix
@@ -101,8 +101,8 @@ in {
     default = makeConfig "hera" [
       ./on-my-machine.nix
       ./headless.nix
-      ../hosts/hera/weechat
-      ../hosts/hera/secret
+      ..nixos/machineshera/weechat
+      ..nixos/machineshera/secret
       ./kassandra-server.nix
       ./headless-mpd.nix
       ./mail.nix
diff --git a/home-manager/mpd.nix b/home-manager/mpd.nix
index afbed473..ffd85b3d 100644
--- a/home-manager/mpd.nix
+++ b/home-manager/mpd.nix
@@ -1,8 +1,26 @@
 { pkgs, config, ... }: {
+  home.file.".config/beets/config.yaml".text = builtins.toJSON {
+    directory = "~/media/audio";
+    library = "~/.config/beets/musiclibrary.db";
+    import = { move = true; };
+    paths = {
+      default = "$genre/%the{$albumartist}/$album%aunique{}/$track $title";
+      singleton = "$genre/%the{$artist}/singles/$title";
+      comp = "$genre/%the{$artist}/$album%aunique{}/$track $title";
+      "genre:soundtrack" = "Soundtrack/$album%aunique{}/$track $title";
+      "genre::classical" = "$genre/%the{$composer}/$album%aunique{}/$track $title";
+    };
+    plugins = "convert web mpdstats mpdupdate fromfilename the";
+    convert = {
+      auto = true;
+      format = "opus";
+      never_convert_lossy_files = true;
+    };
+  };
   services = {
     mpd = {
       enable = true;
-      network.listenAddress = "::1";
+      #network.listenAddress = "::1";
       musicDirectory = "${config.home.homeDirectory}/media/audio";
       extraConfig = ''
         audio_output {
diff --git a/hosts/apollo/configuration.nix b/nixos/machines/apollo/configuration.nix
similarity index 78%
rename from hosts/apollo/configuration.nix
rename to nixos/machines/apollo/configuration.nix
index e4345681..36369c72 100644
--- a/hosts/apollo/configuration.nix
+++ b/nixos/machines/apollo/configuration.nix
@@ -5,8 +5,8 @@
 let
   inherit (config.m-0) hosts prefix private;
   inherit (private) me wireguard;
-  nixos-hardware = (import ../../nix/sources.nix).nixos-hardware;
-  inherit (import ../../common/common.nix { inherit pkgs; }) syncthing;
+  nixos-hardware = (import ../../../nix/sources.nix).nixos-hardware;
+  inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing;
 in {
 
   imports = [
@@ -14,11 +14,11 @@ in {
     "${nixos-hardware}/common/pc/ssd"
     "${(builtins.fetchGit "ssh://git@git.darmstadt.ccc.de/cdark.net/nixdark")}"
     ./hardware-configuration.nix
-    ../../system
-    ../../system/fonts.nix
-    ../../system/boot-key.nix
-    ../../system/standalone
-    ../../system/use-cache.nix
+    ../../roles
+    ../../roles/fonts.nix
+    ../../roles/boot-key.nix
+    ../../roles/standalone
+    ../../roles/use-cache.nix
   ];
 
   networking = {
@@ -28,7 +28,7 @@ in {
       m0wire = {
         allowedIPsAsRoutes = false;
         ips = [ "${hosts.apollo-wg}/112" ];
-        privateKeyFile = "/etc/nixos/hosts/apollo/secret/wireguard-private";
+        privateKeyFile = "/etc/nixosnixos/machinesapollo/secret/wireguard-private";
         peers = [{
           publicKey = wireguard.pub.hera;
           allowedIPs = [ "::/0" ];
@@ -45,6 +45,12 @@ in {
   m-0 = { laptop.enable = true; };
 
   services = {
+    beesd.filesystems.root = {
+      spec = "LABEL=root";
+      hashTableSizeMB = 2048;
+      verbosity = "crit";
+      extraOptions = [ "--loadavg-target" "4.0" ];
+    };
     snapper = {
       configs.home = {
         subvolume = "/home";
@@ -71,8 +77,8 @@ in {
       openDefaultPorts = true;
       declarative = syncthing.declarativeWith [ "hera" ] "/home/maralorn/media"
         // {
-          cert = "/etc/nixos/hosts/apollo/secret/syncthing/cert.pem";
-          key = "/etc/nixos/hosts/apollo/secret/syncthing/key.pem";
+          cert = "/etc/nixosnixos/machinesapollo/secret/syncthing/cert.pem";
+          key = "/etc/nixosnixos/machinesapollo/secret/syncthing/key.pem";
         };
     };
     gnome3.chrome-gnome-shell.enable = true;
diff --git a/hosts/apollo/hardware-configuration.nix b/nixos/machines/apollo/hardware-configuration.nix
similarity index 95%
rename from hosts/apollo/hardware-configuration.nix
rename to nixos/machines/apollo/hardware-configuration.nix
index 6bbe33f1..0f2de9da 100644
--- a/hosts/apollo/hardware-configuration.nix
+++ b/nixos/machines/apollo/hardware-configuration.nix
@@ -32,6 +32,7 @@
     "/" = {
       device = "/dev/disk/by-uuid/ce5b0ac6-6eaf-45a6-b6c8-bd4958caf335";
       fsType = "btrfs";
+      options = ["compress=zstd" "autodefrag" "noatime"];
     };
     "/boot/EFI" = {
       device = "/dev/disk/by-uuid/C4A6-3DB5";
diff --git a/hosts/apollo/secret/.gitattributes b/nixos/machines/apollo/secret/.gitattributes
similarity index 100%
rename from hosts/apollo/secret/.gitattributes
rename to nixos/machines/apollo/secret/.gitattributes
diff --git a/hosts/apollo/secret/default.nix b/nixos/machines/apollo/secret/default.nix
similarity index 100%
rename from hosts/apollo/secret/default.nix
rename to nixos/machines/apollo/secret/default.nix
diff --git a/hosts/apollo/secret/jaliconfig.py b/nixos/machines/apollo/secret/jaliconfig.py
similarity index 100%
rename from hosts/apollo/secret/jaliconfig.py
rename to nixos/machines/apollo/secret/jaliconfig.py
diff --git a/hosts/apollo/secret/pw-me b/nixos/machines/apollo/secret/pw-me
similarity index 100%
rename from hosts/apollo/secret/pw-me
rename to nixos/machines/apollo/secret/pw-me
diff --git a/hosts/apollo/secret/syncthing/cert.pem b/nixos/machines/apollo/secret/syncthing/cert.pem
similarity index 100%
rename from hosts/apollo/secret/syncthing/cert.pem
rename to nixos/machines/apollo/secret/syncthing/cert.pem
diff --git a/hosts/apollo/secret/syncthing/key.pem b/nixos/machines/apollo/secret/syncthing/key.pem
similarity index 100%
rename from hosts/apollo/secret/syncthing/key.pem
rename to nixos/machines/apollo/secret/syncthing/key.pem
diff --git a/hosts/apollo/secret/tinc/ed25519_key.priv b/nixos/machines/apollo/secret/tinc/ed25519_key.priv
similarity index 100%
rename from hosts/apollo/secret/tinc/ed25519_key.priv
rename to nixos/machines/apollo/secret/tinc/ed25519_key.priv
diff --git a/hosts/apollo/secret/wireguard-private b/nixos/machines/apollo/secret/wireguard-private
similarity index 100%
rename from hosts/apollo/secret/wireguard-private
rename to nixos/machines/apollo/secret/wireguard-private
diff --git a/hosts/hera/boot.nix b/nixos/machines/hera/boot.nix
similarity index 100%
rename from hosts/hera/boot.nix
rename to nixos/machines/hera/boot.nix
diff --git a/hosts/hera/cloud.nix b/nixos/machines/hera/cloud.nix
similarity index 99%
rename from hosts/hera/cloud.nix
rename to nixos/machines/hera/cloud.nix
index 90cee7cd..f970d5ca 100644
--- a/hosts/hera/cloud.nix
+++ b/nixos/machines/hera/cloud.nix
@@ -20,7 +20,7 @@ let
     privateNetwork = true;
     hostBridge = "bridge";
     config = { pkgs, ... }: {
-      imports = [ ../../system ];
+      imports = [ ../../roles ];
 
       networking = {
         interfaces.eth0 = {
diff --git a/hosts/hera/configuration.nix b/nixos/machines/hera/configuration.nix
similarity index 80%
rename from hosts/hera/configuration.nix
rename to nixos/machines/hera/configuration.nix
index 1f24b34d..0f0e280c 100644
--- a/hosts/hera/configuration.nix
+++ b/nixos/machines/hera/configuration.nix
@@ -1,29 +1,29 @@
 { config, pkgs, ... }:
 
 # You need pw-files for every configured user in ./secret/pw-useralias for login to work.
-# dropbearkey -t rsa -f /etc/nixos/hosts/<hostname>/secret/boot_rsa
+# dropbearkey -t rsa -f /etc/nixosnixos/machines<hostname>/secret/boot_rsa
 
 let
   inherit (config.m-0.private) me;
-  inherit (import ../../common/common.nix { inherit pkgs; }) syncthing;
+  inherit (import ../../../common/common.nix { inherit pkgs; }) syncthing;
 in {
 
   imports = [
     ./hardware-configuration.nix
-    ../../system
-    ../../system/test-timer.nix
-    ../../system/standalone
-    ../../system/server
-    ../../system/git.nix
-    ../../system/riot.nix
-    ../../system/mathechor.de.nix
-    ../../system/monitoring
-    ../../system/blog.nix
-    ../../system/email2matrix.nix
-    ../../system/matrix-synapse.nix
-    ../../system/coturn.nix
-    ../../system/serve-store.nix
-    ../../system/go-neb.nix
+    ../../roles
+    ../../roles/test-timer.nix
+    ../../roles/standalone
+    ../../roles/server
+    ../../roles/git.nix
+    ../../roles/riot.nix
+    ../../roles/mathechor.de.nix
+    ../../roles/monitoring
+    ../../roles/blog.nix
+    ../../roles/email2matrix.nix
+    ../../roles/matrix-synapse.nix
+    ../../roles/coturn.nix
+    ../../roles/serve-store.nix
+    ../../roles/go-neb.nix
     ./web.nix
     ./mail.nix
     ./boot.nix
@@ -103,8 +103,8 @@ in {
       user = "maralorn";
       openDefaultPorts = true;
       declarative = syncthing.declarativeWith [ "apollo" ] "/media" // {
-        cert = "/etc/nixos/hosts/hera/secret/syncthing/cert.pem";
-        key = "/etc/nixos/hosts/hera/secret/syncthing/key.pem";
+        cert = "/etc/nixosnixos/machineshera/secret/syncthing/cert.pem";
+        key = "/etc/nixosnixos/machineshera/secret/syncthing/key.pem";
       };
     };
   };
@@ -117,7 +117,7 @@ in {
     isNormalUser = true;
     uid = 1001;
     extraGroups = [ "wheel" "systemd-journal" ];
-    passwordFile = "/etc/nixos/hosts/hera/secret/pw-choreutes";
+    passwordFile = "/etc/nixosnixos/machineshera/secret/pw-choreutes";
   };
 
   # This value determines the NixOS release with which your system is to be
diff --git a/hosts/hera/hardware-configuration.nix b/nixos/machines/hera/hardware-configuration.nix
similarity index 100%
rename from hosts/hera/hardware-configuration.nix
rename to nixos/machines/hera/hardware-configuration.nix
diff --git a/hosts/hera/mail.nix b/nixos/machines/hera/mail.nix
similarity index 97%
rename from hosts/hera/mail.nix
rename to nixos/machines/hera/mail.nix
index 2da103a3..1726e2d9 100644
--- a/hosts/hera/mail.nix
+++ b/nixos/machines/hera/mail.nix
@@ -25,7 +25,7 @@ in {
     autoStart = true;
     config = { pkgs, lib, ... }: {
       imports =
-        [ ../../system "${(import ../../nix/sources.nix).nixos-mailserver}" ];
+        [ ../../roles "${(import ../../../nix/sources.nix).nixos-mailserver}" ];
       services.prometheus.exporters = {
         node.port = 9101;
         postfix = {
diff --git a/hosts/hera/network.nix b/nixos/machines/hera/network.nix
similarity index 96%
rename from hosts/hera/network.nix
rename to nixos/machines/hera/network.nix
index 20e8c5ad..35ae6836 100644
--- a/hosts/hera/network.nix
+++ b/nixos/machines/hera/network.nix
@@ -54,7 +54,7 @@ in {
     wireguard.interfaces = {
       m0wire = {
         ips = [ "${hosts.hera-wg}/112" ];
-        privateKeyFile = "/etc/nixos/hosts/hera/secret/wireguard-private";
+        privateKeyFile = "/etc/nixosnixos/machineshera/secret/wireguard-private";
         listenPort = wireguard.port;
         peers = [{
           publicKey = wireguard.pub.apollo;
diff --git a/hosts/hera/secret/.gitattributes b/nixos/machines/hera/secret/.gitattributes
similarity index 100%
rename from hosts/hera/secret/.gitattributes
rename to nixos/machines/hera/secret/.gitattributes
diff --git a/hosts/hera/secret/boot_rsa b/nixos/machines/hera/secret/boot_rsa
similarity index 100%
rename from hosts/hera/secret/boot_rsa
rename to nixos/machines/hera/secret/boot_rsa
diff --git a/hosts/hera/secret/default.nix b/nixos/machines/hera/secret/default.nix
similarity index 100%
rename from hosts/hera/secret/default.nix
rename to nixos/machines/hera/secret/default.nix
diff --git a/hosts/hera/secret/kassandra.nix b/nixos/machines/hera/secret/kassandra.nix
similarity index 100%
rename from hosts/hera/secret/kassandra.nix
rename to nixos/machines/hera/secret/kassandra.nix
diff --git a/hosts/hera/secret/maralorn.sieve b/nixos/machines/hera/secret/maralorn.sieve
similarity index 100%
rename from hosts/hera/secret/maralorn.sieve
rename to nixos/machines/hera/secret/maralorn.sieve
diff --git a/hosts/hera/secret/pw-choreutes b/nixos/machines/hera/secret/pw-choreutes
similarity index 100%
rename from hosts/hera/secret/pw-choreutes
rename to nixos/machines/hera/secret/pw-choreutes
diff --git a/hosts/hera/secret/pw-me b/nixos/machines/hera/secret/pw-me
similarity index 100%
rename from hosts/hera/secret/pw-me
rename to nixos/machines/hera/secret/pw-me
diff --git a/hosts/hera/secret/secrets.nix b/nixos/machines/hera/secret/secrets.nix
similarity index 100%
rename from hosts/hera/secret/secrets.nix
rename to nixos/machines/hera/secret/secrets.nix
diff --git a/hosts/hera/secret/syncthing/cert.pem b/nixos/machines/hera/secret/syncthing/cert.pem
similarity index 100%
rename from hosts/hera/secret/syncthing/cert.pem
rename to nixos/machines/hera/secret/syncthing/cert.pem
diff --git a/hosts/hera/secret/syncthing/key.pem b/nixos/machines/hera/secret/syncthing/key.pem
similarity index 100%
rename from hosts/hera/secret/syncthing/key.pem
rename to nixos/machines/hera/secret/syncthing/key.pem
diff --git a/hosts/hera/secret/weechat.nix b/nixos/machines/hera/secret/weechat.nix
similarity index 100%
rename from hosts/hera/secret/weechat.nix
rename to nixos/machines/hera/secret/weechat.nix
diff --git a/hosts/hera/secret/wireguard-private b/nixos/machines/hera/secret/wireguard-private
similarity index 100%
rename from hosts/hera/secret/wireguard-private
rename to nixos/machines/hera/secret/wireguard-private
diff --git a/hosts/hera/web.nix b/nixos/machines/hera/web.nix
similarity index 100%
rename from hosts/hera/web.nix
rename to nixos/machines/hera/web.nix
diff --git a/hosts/hera/weechat/default-keys.conf b/nixos/machines/hera/weechat/default-keys.conf
similarity index 100%
rename from hosts/hera/weechat/default-keys.conf
rename to nixos/machines/hera/weechat/default-keys.conf
diff --git a/hosts/hera/weechat/default.nix b/nixos/machines/hera/weechat/default.nix
similarity index 100%
rename from hosts/hera/weechat/default.nix
rename to nixos/machines/hera/weechat/default.nix
diff --git a/hosts/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl b/nixos/machines/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl
similarity index 100%
rename from hosts/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl
rename to nixos/machines/hera/weechat/plugins/perl/autoload/mass_hl_blocker.pl
diff --git a/hosts/hera/weechat/plugins/perl/mass_hl_blocker.pl b/nixos/machines/hera/weechat/plugins/perl/mass_hl_blocker.pl
similarity index 100%
rename from hosts/hera/weechat/plugins/perl/mass_hl_blocker.pl
rename to nixos/machines/hera/weechat/plugins/perl/mass_hl_blocker.pl
diff --git a/hosts/hera/weechat/plugins/python/autojoin_on_invite.py b/nixos/machines/hera/weechat/plugins/python/autojoin_on_invite.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/autojoin_on_invite.py
rename to nixos/machines/hera/weechat/plugins/python/autojoin_on_invite.py
diff --git a/hosts/hera/weechat/plugins/python/autoload/autojoin_on_invite.py b/nixos/machines/hera/weechat/plugins/python/autoload/autojoin_on_invite.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/autoload/autojoin_on_invite.py
rename to nixos/machines/hera/weechat/plugins/python/autoload/autojoin_on_invite.py
diff --git a/hosts/hera/weechat/plugins/python/autoload/buffer_autoset.py b/nixos/machines/hera/weechat/plugins/python/autoload/buffer_autoset.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/autoload/buffer_autoset.py
rename to nixos/machines/hera/weechat/plugins/python/autoload/buffer_autoset.py
diff --git a/hosts/hera/weechat/plugins/python/autoload/go.py b/nixos/machines/hera/weechat/plugins/python/autoload/go.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/autoload/go.py
rename to nixos/machines/hera/weechat/plugins/python/autoload/go.py
diff --git a/hosts/hera/weechat/plugins/python/autoload/grep.py b/nixos/machines/hera/weechat/plugins/python/autoload/grep.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/autoload/grep.py
rename to nixos/machines/hera/weechat/plugins/python/autoload/grep.py
diff --git a/hosts/hera/weechat/plugins/python/autoload/sortlatest.py b/nixos/machines/hera/weechat/plugins/python/autoload/sortlatest.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/autoload/sortlatest.py
rename to nixos/machines/hera/weechat/plugins/python/autoload/sortlatest.py
diff --git a/hosts/hera/weechat/plugins/python/autoload/topicdiff.py b/nixos/machines/hera/weechat/plugins/python/autoload/topicdiff.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/autoload/topicdiff.py
rename to nixos/machines/hera/weechat/plugins/python/autoload/topicdiff.py
diff --git a/hosts/hera/weechat/plugins/python/buffer_autoset.py b/nixos/machines/hera/weechat/plugins/python/buffer_autoset.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/buffer_autoset.py
rename to nixos/machines/hera/weechat/plugins/python/buffer_autoset.py
diff --git a/hosts/hera/weechat/plugins/python/go.py b/nixos/machines/hera/weechat/plugins/python/go.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/go.py
rename to nixos/machines/hera/weechat/plugins/python/go.py
diff --git a/hosts/hera/weechat/plugins/python/grep.py b/nixos/machines/hera/weechat/plugins/python/grep.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/grep.py
rename to nixos/machines/hera/weechat/plugins/python/grep.py
diff --git a/hosts/hera/weechat/plugins/python/sortlatest.py b/nixos/machines/hera/weechat/plugins/python/sortlatest.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/sortlatest.py
rename to nixos/machines/hera/weechat/plugins/python/sortlatest.py
diff --git a/hosts/hera/weechat/plugins/python/topicdiff.py b/nixos/machines/hera/weechat/plugins/python/topicdiff.py
similarity index 100%
rename from hosts/hera/weechat/plugins/python/topicdiff.py
rename to nixos/machines/hera/weechat/plugins/python/topicdiff.py
diff --git a/system/blog.nix b/nixos/roles/blog.nix
similarity index 100%
rename from system/blog.nix
rename to nixos/roles/blog.nix
diff --git a/system/boot-key.nix b/nixos/roles/boot-key.nix
similarity index 100%
rename from system/boot-key.nix
rename to nixos/roles/boot-key.nix
diff --git a/system/coturn.nix b/nixos/roles/coturn.nix
similarity index 100%
rename from system/coturn.nix
rename to nixos/roles/coturn.nix
diff --git a/system/default.nix b/nixos/roles/default.nix
similarity index 96%
rename from system/default.nix
rename to nixos/roles/default.nix
index b151e5de..5abe2204 100644
--- a/system/default.nix
+++ b/nixos/roles/default.nix
@@ -2,7 +2,7 @@
 let me = config.m-0.private.me;
 in {
   imports = [
-    ../common
+    ../../common
     ./modules/laptop.nix
     ./modules/loginctl-linger.nix
   ];
@@ -10,7 +10,7 @@ in {
   i18n = { defaultLocale = "en_US.UTF-8"; };
 
   # For nixos-rebuild
-  nixpkgs.overlays = import ../overlays { inherit lib; };
+  nixpkgs.overlays = import ../../overlays { inherit lib; };
 
   time.timeZone = "Europe/Berlin";
 
diff --git a/system/email2matrix.nix b/nixos/roles/email2matrix.nix
similarity index 100%
rename from system/email2matrix.nix
rename to nixos/roles/email2matrix.nix
diff --git a/system/fonts.nix b/nixos/roles/fonts.nix
similarity index 100%
rename from system/fonts.nix
rename to nixos/roles/fonts.nix
diff --git a/system/git.nix b/nixos/roles/git.nix
similarity index 100%
rename from system/git.nix
rename to nixos/roles/git.nix
diff --git a/system/go-neb.nix b/nixos/roles/go-neb.nix
similarity index 100%
rename from system/go-neb.nix
rename to nixos/roles/go-neb.nix
diff --git a/system/local-nix-cache.nix b/nixos/roles/local-nix-cache.nix
similarity index 93%
rename from system/local-nix-cache.nix
rename to nixos/roles/local-nix-cache.nix
index ab90380c..e0e3c748 100644
--- a/system/local-nix-cache.nix
+++ b/nixos/roles/local-nix-cache.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ... }:
-let inherit (import ../lib) sources;
+let inherit (import ../../lib) sources;
   local-nix-cache = import sources.local-nix-cache { };
 in {
   imports = [ (local-nix-cache.path + "/module.nix") ];
diff --git a/system/mathechor.de.nix b/nixos/roles/mathechor.de.nix
similarity index 100%
rename from system/mathechor.de.nix
rename to nixos/roles/mathechor.de.nix
diff --git a/system/matrix-synapse.nix b/nixos/roles/matrix-synapse.nix
similarity index 100%
rename from system/matrix-synapse.nix
rename to nixos/roles/matrix-synapse.nix
diff --git a/system/modules/go-neb.nix b/nixos/roles/modules/go-neb.nix
similarity index 100%
rename from system/modules/go-neb.nix
rename to nixos/roles/modules/go-neb.nix
diff --git a/system/modules/laptop.nix b/nixos/roles/modules/laptop.nix
similarity index 100%
rename from system/modules/laptop.nix
rename to nixos/roles/modules/laptop.nix
diff --git a/system/modules/loginctl-linger.nix b/nixos/roles/modules/loginctl-linger.nix
similarity index 100%
rename from system/modules/loginctl-linger.nix
rename to nixos/roles/modules/loginctl-linger.nix
diff --git a/system/monitoring/alertmanager.nix b/nixos/roles/monitoring/alertmanager.nix
similarity index 100%
rename from system/monitoring/alertmanager.nix
rename to nixos/roles/monitoring/alertmanager.nix
diff --git a/system/monitoring/blackbox_rules.yml b/nixos/roles/monitoring/blackbox_rules.yml
similarity index 100%
rename from system/monitoring/blackbox_rules.yml
rename to nixos/roles/monitoring/blackbox_rules.yml
diff --git a/system/monitoring/default.nix b/nixos/roles/monitoring/default.nix
similarity index 100%
rename from system/monitoring/default.nix
rename to nixos/roles/monitoring/default.nix
diff --git a/system/monitoring/grafana-dashboards/health-status.json b/nixos/roles/monitoring/grafana-dashboards/health-status.json
similarity index 100%
rename from system/monitoring/grafana-dashboards/health-status.json
rename to nixos/roles/monitoring/grafana-dashboards/health-status.json
diff --git a/system/monitoring/grafana-dashboards/node-exporter.json b/nixos/roles/monitoring/grafana-dashboards/node-exporter.json
similarity index 100%
rename from system/monitoring/grafana-dashboards/node-exporter.json
rename to nixos/roles/monitoring/grafana-dashboards/node-exporter.json
diff --git a/system/monitoring/grafana.nix b/nixos/roles/monitoring/grafana.nix
similarity index 100%
rename from system/monitoring/grafana.nix
rename to nixos/roles/monitoring/grafana.nix
diff --git a/system/monitoring/nixpkgs.nix b/nixos/roles/monitoring/nixpkgs.nix
similarity index 100%
rename from system/monitoring/nixpkgs.nix
rename to nixos/roles/monitoring/nixpkgs.nix
diff --git a/system/monitoring/probes.nix b/nixos/roles/monitoring/probes.nix
similarity index 100%
rename from system/monitoring/probes.nix
rename to nixos/roles/monitoring/probes.nix
diff --git a/system/monitoring/prometheus.nix b/nixos/roles/monitoring/prometheus.nix
similarity index 100%
rename from system/monitoring/prometheus.nix
rename to nixos/roles/monitoring/prometheus.nix
diff --git a/system/monitoring/rules.yml b/nixos/roles/monitoring/rules.yml
similarity index 100%
rename from system/monitoring/rules.yml
rename to nixos/roles/monitoring/rules.yml
diff --git a/system/riot.nix b/nixos/roles/riot.nix
similarity index 100%
rename from system/riot.nix
rename to nixos/roles/riot.nix
diff --git a/system/serve-store.nix b/nixos/roles/serve-store.nix
similarity index 100%
rename from system/serve-store.nix
rename to nixos/roles/serve-store.nix
diff --git a/system/server/default.nix b/nixos/roles/server/default.nix
similarity index 100%
rename from system/server/default.nix
rename to nixos/roles/server/default.nix
diff --git a/system/server/init_ssh.nix b/nixos/roles/server/init_ssh.nix
similarity index 100%
rename from system/server/init_ssh.nix
rename to nixos/roles/server/init_ssh.nix
diff --git a/system/standalone/admin.nix b/nixos/roles/standalone/admin.nix
similarity index 100%
rename from system/standalone/admin.nix
rename to nixos/roles/standalone/admin.nix
diff --git a/system/standalone/default.nix b/nixos/roles/standalone/default.nix
similarity index 95%
rename from system/standalone/default.nix
rename to nixos/roles/standalone/default.nix
index 3d2b7c99..da692769 100644
--- a/system/standalone/default.nix
+++ b/nixos/roles/standalone/default.nix
@@ -29,7 +29,7 @@
   environment = {
     # Put these into an extra file so the essential packages can also be included on non selfadminstrated systems from home-manager
     systemPackages = builtins.attrValues ({
-      inherit (import ../../lib/update-system.nix {
+      inherit (import ../../../lib/update-system.nix {
         inherit pkgs;
         nixos-rebuild = config.system.build.nixos-rebuild;
       })
diff --git a/system/test-timer.nix b/nixos/roles/test-timer.nix
similarity index 97%
rename from system/test-timer.nix
rename to nixos/roles/test-timer.nix
index 46973ef0..0d473c3a 100644
--- a/system/test-timer.nix
+++ b/nixos/roles/test-timer.nix
@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }:
 let
   user = "maralorn";
-  inherit (import ../lib/update-system.nix {
+  inherit (import ../../lib/update-system.nix {
     nixos-rebuild = config.system.build.nixos-rebuild;
     inherit pkgs;
   })
diff --git a/system/use-cache.nix b/nixos/roles/use-cache.nix
similarity index 100%
rename from system/use-cache.nix
rename to nixos/roles/use-cache.nix
diff --git a/overlays/grafana-devel/package.nix b/overlays/grafana-devel/package.nix
index 7458171a..b1500bd3 100644
--- a/overlays/grafana-devel/package.nix
+++ b/overlays/grafana-devel/package.nix
@@ -12,7 +12,7 @@ let
           providers = [{
             name = "Static dashboards";
             folder = "";
-            options.path = ../../system/monitoring/grafana-dashboards;
+            options.path = ../../nixos/roles/monitoring/grafana-dashboards;
             orgId = 1;
             type = "file";
             updateIntervalSeconds = 60;
diff --git a/overlays/pkgSets.nix b/overlays/pkgSets.nix
index fb831577..10513c19 100644
--- a/overlays/pkgSets.nix
+++ b/overlays/pkgSets.nix
@@ -11,7 +11,7 @@ self: super: {
     inherit (self)
       git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
       tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
-      entr libargon2 mblaze niv;
+      entr libargon2 mblaze niv compsize;
   };
 
   my-home-pkgs = {
diff --git a/overlays/testing.nix b/overlays/testing.nix
index 6ea36904..b60980f3 100644
--- a/overlays/testing.nix
+++ b/overlays/testing.nix
@@ -26,7 +26,7 @@ in {
     name = "test-system-config";
     inherit bins;
     inherit imports;
-  } (haskellBody "system" ''nix_build $ ["<nixpkgs/nixos>", "-A", "system"] ++ paths ++ ["-I", [i|nixos-config=#{configDir}/hosts/#{hostname}/configuration.nix|], "-o", [i|result-system-#{hostname}|]] ++ fmap toString args'');
+  } (haskellBody "system" ''nix_build $ ["<nixpkgs/nixos>", "-A", "system"] ++ paths ++ ["-I", [i|nixos-config=#{configDir}nixos/machines#{hostname}/configuration.nix|], "-o", [i|result-system-#{hostname}|]] ++ fmap toString args'');
 
   test-home-config = self.writeHaskellScript {
     name = "test-home-config";