diff --git a/hosts/srv-monitor/default.nix b/hosts/observer/default.nix
similarity index 100%
rename from hosts/srv-monitor/default.nix
rename to hosts/observer/default.nix
diff --git a/hosts/srv-external/disko.nix b/hosts/observer/disko.nix
similarity index 100%
rename from hosts/srv-external/disko.nix
rename to hosts/observer/disko.nix
diff --git a/hosts/srv-monitor/hardware.nix b/hosts/observer/hardware.nix
similarity index 100%
rename from hosts/srv-monitor/hardware.nix
rename to hosts/observer/hardware.nix
diff --git a/hosts/srv-monitor/secrets.json b/hosts/observer/secrets.json
similarity index 100%
rename from hosts/srv-monitor/secrets.json
rename to hosts/observer/secrets.json
diff --git a/hosts/srv-internal/default.nix b/hosts/srv-private/default.nix
similarity index 100%
rename from hosts/srv-internal/default.nix
rename to hosts/srv-private/default.nix
diff --git a/hosts/srv-internal/disko.nix b/hosts/srv-private/disko.nix
similarity index 100%
rename from hosts/srv-internal/disko.nix
rename to hosts/srv-private/disko.nix
diff --git a/hosts/srv-internal/hardware.nix b/hosts/srv-private/hardware.nix
similarity index 100%
rename from hosts/srv-internal/hardware.nix
rename to hosts/srv-private/hardware.nix
diff --git a/hosts/srv-internal/secrets.json b/hosts/srv-private/secrets.json
similarity index 100%
rename from hosts/srv-internal/secrets.json
rename to hosts/srv-private/secrets.json
diff --git a/hosts/srv-external/default.nix b/hosts/srv-public/default.nix
similarity index 100%
rename from hosts/srv-external/default.nix
rename to hosts/srv-public/default.nix
diff --git a/hosts/srv-monitor/disko.nix b/hosts/srv-public/disko.nix
similarity index 100%
rename from hosts/srv-monitor/disko.nix
rename to hosts/srv-public/disko.nix
diff --git a/hosts/srv-external/hardware.nix b/hosts/srv-public/hardware.nix
similarity index 100%
rename from hosts/srv-external/hardware.nix
rename to hosts/srv-public/hardware.nix
diff --git a/hosts/srv-external/secrets.json b/hosts/srv-public/secrets.json
similarity index 100%
rename from hosts/srv-external/secrets.json
rename to hosts/srv-public/secrets.json
diff --git a/users/seb/@srv-external/default.nix b/users/seb/@observer/default.nix
similarity index 100%
rename from users/seb/@srv-external/default.nix
rename to users/seb/@observer/default.nix
diff --git a/users/seb/@srv-internal/default.nix b/users/seb/@srv-private/default.nix
similarity index 100%
rename from users/seb/@srv-internal/default.nix
rename to users/seb/@srv-private/default.nix
diff --git a/users/seb/@srv-monitor/default.nix b/users/seb/@srv-public/default.nix
similarity index 100%
rename from users/seb/@srv-monitor/default.nix
rename to users/seb/@srv-public/default.nix