diff --git a/hosts/hackens-milieu/configuration.nix b/hosts/milieu/configuration.nix
similarity index 100%
rename from hosts/hackens-milieu/configuration.nix
rename to hosts/milieu/configuration.nix
diff --git a/hosts/hackens-milieu/hardware-configuration.nix b/hosts/milieu/hardware-configuration.nix
similarity index 100%
rename from hosts/hackens-milieu/hardware-configuration.nix
rename to hosts/milieu/hardware-configuration.nix
diff --git a/hosts/hackens-org/configuration.nix b/hosts/org/configuration.nix
similarity index 100%
rename from hosts/hackens-org/configuration.nix
rename to hosts/org/configuration.nix
diff --git a/hosts/hackens-org/hardware-configuration.nix b/hosts/org/hardware-configuration.nix
similarity index 100%
rename from hosts/hackens-org/hardware-configuration.nix
rename to hosts/org/hardware-configuration.nix
diff --git a/hosts/hackens-org/kfet2mqtt.nix b/hosts/org/kfet2mqtt.nix
similarity index 100%
rename from hosts/hackens-org/kfet2mqtt.nix
rename to hosts/org/kfet2mqtt.nix
diff --git a/hosts/hackens-org/misc/default.nix b/hosts/org/misc/default.nix
similarity index 100%
rename from hosts/hackens-org/misc/default.nix
rename to hosts/org/misc/default.nix
diff --git a/hosts/hackens-org/modules/custom-dokuwiki.nix b/hosts/org/modules/custom-dokuwiki.nix
similarity index 100%
rename from hosts/hackens-org/modules/custom-dokuwiki.nix
rename to hosts/org/modules/custom-dokuwiki.nix
diff --git a/hosts/hackens-org/modules/mqtt2prometheus/default.nix b/hosts/org/modules/mqtt2prometheus/default.nix
similarity index 100%
rename from hosts/hackens-org/modules/mqtt2prometheus/default.nix
rename to hosts/org/modules/mqtt2prometheus/default.nix
diff --git a/hosts/hackens-org/modules/mqtt2prometheus/mqtt2prometheus.nix b/hosts/org/modules/mqtt2prometheus/mqtt2prometheus.nix
similarity index 100%
rename from hosts/hackens-org/modules/mqtt2prometheus/mqtt2prometheus.nix
rename to hosts/org/modules/mqtt2prometheus/mqtt2prometheus.nix
diff --git a/hosts/hackens-org/modules/nginx.nix b/hosts/org/modules/nginx.nix
similarity index 100%
rename from hosts/hackens-org/modules/nginx.nix
rename to hosts/org/modules/nginx.nix
diff --git a/hosts/hackens-org/modules/static-website.nix b/hosts/org/modules/static-website.nix
similarity index 100%
rename from hosts/hackens-org/modules/static-website.nix
rename to hosts/org/modules/static-website.nix
diff --git a/hosts/hackens-org/monitoring/config.yaml b/hosts/org/monitoring/config.yaml
similarity index 100%
rename from hosts/hackens-org/monitoring/config.yaml
rename to hosts/org/monitoring/config.yaml
diff --git a/hosts/hackens-org/monitoring/default.nix b/hosts/org/monitoring/default.nix
similarity index 100%
rename from hosts/hackens-org/monitoring/default.nix
rename to hosts/org/monitoring/default.nix
diff --git a/hosts/hackens-org/monitoring/mqtt2prometheus.nix b/hosts/org/monitoring/mqtt2prometheus.nix
similarity index 100%
rename from hosts/hackens-org/monitoring/mqtt2prometheus.nix
rename to hosts/org/monitoring/mqtt2prometheus.nix
diff --git a/hosts/hackens-org/mosquitto.nix b/hosts/org/mosquitto.nix
similarity index 100%
rename from hosts/hackens-org/mosquitto.nix
rename to hosts/org/mosquitto.nix
diff --git a/hosts/org/orga.nix b/hosts/org/orga.nix
new file mode 100644
index 0000000..7b036d1
--- /dev/null
+++ b/hosts/org/orga.nix
@@ -0,0 +1,3 @@
+{ pkgs, lib, config, ... }:
+let
+  sources
diff --git a/hosts/hackens-org/physical.nix b/hosts/org/physical.nix
similarity index 100%
rename from hosts/hackens-org/physical.nix
rename to hosts/org/physical.nix
diff --git a/hosts/hackens-org/webpass.nix b/hosts/org/webpass.nix
similarity index 100%
rename from hosts/hackens-org/webpass.nix
rename to hosts/org/webpass.nix
diff --git a/hosts/hackens-org/wiki/default.nix b/hosts/org/wiki/default.nix
similarity index 100%
rename from hosts/hackens-org/wiki/default.nix
rename to hosts/org/wiki/default.nix
diff --git a/hosts/hackens-org/wiki/media/favicon.ico b/hosts/org/wiki/media/favicon.ico
similarity index 100%
rename from hosts/hackens-org/wiki/media/favicon.ico
rename to hosts/org/wiki/media/favicon.ico
diff --git a/hosts/hackens-org/wiki/media/logo.png b/hosts/org/wiki/media/logo.png
similarity index 100%
rename from hosts/hackens-org/wiki/media/logo.png
rename to hosts/org/wiki/media/logo.png