diff --git a/cluster/prod/cluster.nix b/os/host_TOREWORK/cluster/prod/cluster.nix
similarity index 100%
rename from cluster/prod/cluster.nix
rename to os/host_TOREWORK/cluster/prod/cluster.nix
diff --git a/cluster/prod/node/celeri.nix b/os/host_TOREWORK/cluster/prod/node/celeri.nix
similarity index 100%
rename from cluster/prod/node/celeri.nix
rename to os/host_TOREWORK/cluster/prod/node/celeri.nix
diff --git a/cluster/prod/node/celeri.site.nix b/os/host_TOREWORK/cluster/prod/node/celeri.site.nix
similarity index 100%
rename from cluster/prod/node/celeri.site.nix
rename to os/host_TOREWORK/cluster/prod/node/celeri.site.nix
diff --git a/cluster/prod/node/concombre.nix b/os/host_TOREWORK/cluster/prod/node/concombre.nix
similarity index 100%
rename from cluster/prod/node/concombre.nix
rename to os/host_TOREWORK/cluster/prod/node/concombre.nix
diff --git a/cluster/prod/node/concombre.site.nix b/os/host_TOREWORK/cluster/prod/node/concombre.site.nix
similarity index 100%
rename from cluster/prod/node/concombre.site.nix
rename to os/host_TOREWORK/cluster/prod/node/concombre.site.nix
diff --git a/cluster/prod/node/courgette.nix b/os/host_TOREWORK/cluster/prod/node/courgette.nix
similarity index 100%
rename from cluster/prod/node/courgette.nix
rename to os/host_TOREWORK/cluster/prod/node/courgette.nix
diff --git a/cluster/prod/node/courgette.site.nix b/os/host_TOREWORK/cluster/prod/node/courgette.site.nix
similarity index 100%
rename from cluster/prod/node/courgette.site.nix
rename to os/host_TOREWORK/cluster/prod/node/courgette.site.nix
diff --git a/cluster/prod/site/neptune.nix b/os/host_TOREWORK/cluster/prod/site/neptune.nix
similarity index 100%
rename from cluster/prod/site/neptune.nix
rename to os/host_TOREWORK/cluster/prod/site/neptune.nix
diff --git a/cluster/prod/ssh_config b/os/host_TOREWORK/cluster/prod/ssh_config
similarity index 100%
rename from cluster/prod/ssh_config
rename to os/host_TOREWORK/cluster/prod/ssh_config
diff --git a/cluster/staging/cluster.nix b/os/host_TOREWORK/cluster/staging/cluster.nix
similarity index 100%
rename from cluster/staging/cluster.nix
rename to os/host_TOREWORK/cluster/staging/cluster.nix
diff --git a/cluster/staging/node/carcajou.nix b/os/host_TOREWORK/cluster/staging/node/carcajou.nix
similarity index 100%
rename from cluster/staging/node/carcajou.nix
rename to os/host_TOREWORK/cluster/staging/node/carcajou.nix
diff --git a/cluster/staging/node/carcajou.site.nix b/os/host_TOREWORK/cluster/staging/node/carcajou.site.nix
similarity index 100%
rename from cluster/staging/node/carcajou.site.nix
rename to os/host_TOREWORK/cluster/staging/node/carcajou.site.nix
diff --git a/cluster/staging/node/cariacou.nix b/os/host_TOREWORK/cluster/staging/node/cariacou.nix
similarity index 100%
rename from cluster/staging/node/cariacou.nix
rename to os/host_TOREWORK/cluster/staging/node/cariacou.nix
diff --git a/cluster/staging/node/cariacou.site.nix b/os/host_TOREWORK/cluster/staging/node/cariacou.site.nix
similarity index 100%
rename from cluster/staging/node/cariacou.site.nix
rename to os/host_TOREWORK/cluster/staging/node/cariacou.site.nix
diff --git a/cluster/staging/node/caribou.nix b/os/host_TOREWORK/cluster/staging/node/caribou.nix
similarity index 100%
rename from cluster/staging/node/caribou.nix
rename to os/host_TOREWORK/cluster/staging/node/caribou.nix
diff --git a/cluster/staging/node/caribou.site.nix b/os/host_TOREWORK/cluster/staging/node/caribou.site.nix
similarity index 100%
rename from cluster/staging/node/caribou.site.nix
rename to os/host_TOREWORK/cluster/staging/node/caribou.site.nix
diff --git a/cluster/staging/node/spoutnik.nix b/os/host_TOREWORK/cluster/staging/node/spoutnik.nix
similarity index 100%
rename from cluster/staging/node/spoutnik.nix
rename to os/host_TOREWORK/cluster/staging/node/spoutnik.nix
diff --git a/cluster/staging/node/spoutnik.site.nix b/os/host_TOREWORK/cluster/staging/node/spoutnik.site.nix
similarity index 100%
rename from cluster/staging/node/spoutnik.site.nix
rename to os/host_TOREWORK/cluster/staging/node/spoutnik.site.nix
diff --git a/cluster/staging/site/neptune.nix b/os/host_TOREWORK/cluster/staging/site/neptune.nix
similarity index 100%
rename from cluster/staging/site/neptune.nix
rename to os/host_TOREWORK/cluster/staging/site/neptune.nix
diff --git a/cluster/staging/site/pluton.nix b/os/host_TOREWORK/cluster/staging/site/pluton.nix
similarity index 100%
rename from cluster/staging/site/pluton.nix
rename to os/host_TOREWORK/cluster/staging/site/pluton.nix
diff --git a/cluster/staging/ssh_config b/os/host_TOREWORK/cluster/staging/ssh_config
similarity index 100%
rename from cluster/staging/ssh_config
rename to os/host_TOREWORK/cluster/staging/ssh_config
diff --git a/nix/configuration.nix b/os/host_TOREWORK/configuration.nix
similarity index 100%
rename from nix/configuration.nix
rename to os/host_TOREWORK/configuration.nix
diff --git a/nix/deuxfleurs.nix b/os/modules/deuxfleurs.nix
similarity index 100%
rename from nix/deuxfleurs.nix
rename to os/modules/deuxfleurs.nix
diff --git a/nix/remote-unlock.nix b/os/modules/remote-unlock.nix
similarity index 100%
rename from nix/remote-unlock.nix
rename to os/modules/remote-unlock.nix
diff --git a/nix/wesher_service.nix b/os/modules/wesher_service.nix
similarity index 100%
rename from nix/wesher_service.nix
rename to os/modules/wesher_service.nix