diff --git a/bootstrap/initial-kube-system-bootstrap b/bootstrap/bin/initial-kube-system-bootstrap
similarity index 100%
rename from bootstrap/initial-kube-system-bootstrap
rename to bootstrap/bin/initial-kube-system-bootstrap
diff --git a/clusters/kube0/default.nix b/clusters/k0/default.nix
similarity index 100%
rename from clusters/kube0/default.nix
rename to clusters/k0/default.nix
diff --git a/clusters/kube0/k0-0.nix b/clusters/k0/k0-0.nix
similarity index 100%
rename from clusters/kube0/k0-0.nix
rename to clusters/k0/k0-0.nix
diff --git a/clusters/kube0/k0-1.nix b/clusters/k0/k0-1.nix
similarity index 100%
rename from clusters/kube0/k0-1.nix
rename to clusters/k0/k0-1.nix
diff --git a/clusters/kube0/k0-2.nix b/clusters/k0/k0-2.nix
similarity index 100%
rename from clusters/kube0/k0-2.nix
rename to clusters/k0/k0-2.nix
diff --git a/clusters/kube0/registry-auth-secret.yaml b/clusters/k0/registry-auth-secret.yaml
similarity index 100%
rename from clusters/kube0/registry-auth-secret.yaml
rename to clusters/k0/registry-auth-secret.yaml
diff --git a/clusters/kube1/default.nix b/clusters/k1/default.nix
similarity index 100%
rename from clusters/kube1/default.nix
rename to clusters/k1/default.nix
diff --git a/clusters/kube1/k1-0.nix b/clusters/k1/k1-0.nix
similarity index 100%
rename from clusters/kube1/k1-0.nix
rename to clusters/k1/k1-0.nix
diff --git a/clusters/kube1/k1-1.nix b/clusters/k1/k1-1.nix
similarity index 100%
rename from clusters/kube1/k1-1.nix
rename to clusters/k1/k1-1.nix
diff --git a/clusters/kube1/k1-2.nix b/clusters/k1/k1-2.nix
similarity index 100%
rename from clusters/kube1/k1-2.nix
rename to clusters/k1/k1-2.nix
diff --git a/clusters/kube1/k1-3.nix b/clusters/k1/k1-3.nix
similarity index 100%
rename from clusters/kube1/k1-3.nix
rename to clusters/k1/k1-3.nix
diff --git a/clusters/kube1/k1-4.nix b/clusters/k1/k1-4.nix
similarity index 100%
rename from clusters/kube1/k1-4.nix
rename to clusters/k1/k1-4.nix
diff --git a/clusters/kube1/registry-auth-secret.yaml b/clusters/k1/registry-auth-secret.yaml
similarity index 100%
rename from clusters/kube1/registry-auth-secret.yaml
rename to clusters/k1/registry-auth-secret.yaml
diff --git a/clusters/kube2/default.nix b/clusters/k2/default.nix
similarity index 100%
rename from clusters/kube2/default.nix
rename to clusters/k2/default.nix
diff --git a/clusters/kube2/k2-0.nix b/clusters/k2/k2-0.nix
similarity index 100%
rename from clusters/kube2/k2-0.nix
rename to clusters/k2/k2-0.nix
diff --git a/clusters/kube2/k2-1.nix b/clusters/k2/k2-1.nix
similarity index 100%
rename from clusters/kube2/k2-1.nix
rename to clusters/k2/k2-1.nix
diff --git a/clusters/kube2/k2-2.nix b/clusters/k2/k2-2.nix
similarity index 100%
rename from clusters/kube2/k2-2.nix
rename to clusters/k2/k2-2.nix
diff --git a/clusters/kube2/k2-3.nix b/clusters/k2/k2-3.nix
similarity index 100%
rename from clusters/kube2/k2-3.nix
rename to clusters/k2/k2-3.nix
diff --git a/clusters/kube2/k2-4.nix b/clusters/k2/k2-4.nix
similarity index 100%
rename from clusters/kube2/k2-4.nix
rename to clusters/k2/k2-4.nix
diff --git a/clusters/kube2/k2-5.nix b/clusters/k2/k2-5.nix
similarity index 100%
rename from clusters/kube2/k2-5.nix
rename to clusters/k2/k2-5.nix
diff --git a/clusters/kube2/registry-auth-secret.yaml b/clusters/k2/registry-auth-secret.yaml
similarity index 100%
rename from clusters/kube2/registry-auth-secret.yaml
rename to clusters/k2/registry-auth-secret.yaml