diff --git a/nix/wesher.nix b/os/overlays/wesher.nix
similarity index 100%
rename from nix/wesher.nix
rename to os/overlays/wesher.nix
diff --git a/deploy_nixos b/os/runners/bash/deploy_nixos
similarity index 100%
rename from deploy_nixos
rename to os/runners/bash/deploy_nixos
diff --git a/deploy_passwords b/os/runners/bash/deploy_passwords
similarity index 100%
rename from deploy_passwords
rename to os/runners/bash/deploy_passwords
diff --git a/deploy_pki b/os/runners/bash/deploy_pki
similarity index 100%
rename from deploy_pki
rename to os/runners/bash/deploy_pki
diff --git a/deploy_wesher_key b/os/runners/bash/deploy_wesher_key
similarity index 100%
rename from deploy_wesher_key
rename to os/runners/bash/deploy_wesher_key
diff --git a/gen_wesher_key b/os/runners/bash/gen_wesher_key
similarity index 100%
rename from gen_wesher_key
rename to os/runners/bash/gen_wesher_key
diff --git a/sshtool b/os/runners/bash/sshtool
similarity index 100%
rename from sshtool
rename to os/runners/bash/sshtool
diff --git a/tlsproxy b/os/runners/bash/tlsproxy
similarity index 100%
rename from tlsproxy
rename to os/runners/bash/tlsproxy
diff --git a/upgrade_nixos b/os/runners/bash/upgrade_nixos
similarity index 100%
rename from upgrade_nixos
rename to os/runners/bash/upgrade_nixos
diff --git a/gen_pki b/os/secretgen/gen_pki
similarity index 100%
rename from gen_pki
rename to os/secretgen/gen_pki
diff --git a/passwd b/os/secretgen/passwd
similarity index 100%
rename from passwd
rename to os/secretgen/passwd