diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..f0eccdb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "nixos"]
+	path = nixos
+	url = git@gitlab.itpartner.no:juselius/nixos-configuration.git
+[submodule "kube-system-setup"]
+	path = kube-system-setup
+	url = git@gitlab.itpartner.no:k8s/kube-system-setup.git
diff --git a/fs0/build.nix b/clusters/fs0/build.nix
similarity index 100%
rename from fs0/build.nix
rename to clusters/fs0/build.nix
diff --git a/fs0/certs.nix b/clusters/fs0/certs.nix
similarity index 100%
rename from fs0/certs.nix
rename to clusters/fs0/certs.nix
diff --git a/fs0/deployment.nix b/clusters/fs0/deployment.nix
similarity index 100%
rename from fs0/deployment.nix
rename to clusters/fs0/deployment.nix
diff --git a/nixos/hardware-configuration/fs0-0.nix b/clusters/fs0/fs0-0.nix
similarity index 100%
rename from nixos/hardware-configuration/fs0-0.nix
rename to clusters/fs0/fs0-0.nix
diff --git a/nixos/hardware-configuration/fs0-1.nix b/clusters/fs0/fs0-1.nix
similarity index 100%
rename from nixos/hardware-configuration/fs0-1.nix
rename to clusters/fs0/fs0-1.nix
diff --git a/kube0/build.nix b/clusters/kube0/build.nix
similarity index 100%
rename from kube0/build.nix
rename to clusters/kube0/build.nix
diff --git a/kube0/certs.nix b/clusters/kube0/certs.nix
similarity index 100%
rename from kube0/certs.nix
rename to clusters/kube0/certs.nix
diff --git a/kube0/deployment.nix b/clusters/kube0/deployment.nix
similarity index 100%
rename from kube0/deployment.nix
rename to clusters/kube0/deployment.nix
diff --git a/nixos/hardware-configuration/k0-0.nix b/clusters/kube0/k0-0.nix
similarity index 100%
rename from nixos/hardware-configuration/k0-0.nix
rename to clusters/kube0/k0-0.nix
diff --git a/nixos/hardware-configuration/k0-1.nix b/clusters/kube0/k0-1.nix
similarity index 100%
rename from nixos/hardware-configuration/k0-1.nix
rename to clusters/kube0/k0-1.nix
diff --git a/nixos/hardware-configuration/k0-2.nix b/clusters/kube0/k0-2.nix
similarity index 100%
rename from nixos/hardware-configuration/k0-2.nix
rename to clusters/kube0/k0-2.nix
diff --git a/nixos/hardware-configuration/k0-3.nix b/clusters/kube0/k0-3.nix
similarity index 100%
rename from nixos/hardware-configuration/k0-3.nix
rename to clusters/kube0/k0-3.nix
diff --git a/nixos/hardware-configuration/k0-4.nix b/clusters/kube0/k0-4.nix
similarity index 100%
rename from nixos/hardware-configuration/k0-4.nix
rename to clusters/kube0/k0-4.nix
diff --git a/nixos/hardware-configuration/k0-5.nix b/clusters/kube0/k0-5.nix
similarity index 100%
rename from nixos/hardware-configuration/k0-5.nix
rename to clusters/kube0/k0-5.nix
diff --git a/kube1/deployment.nix b/clusters/kube1/default.nix
similarity index 100%
rename from kube1/deployment.nix
rename to clusters/kube1/default.nix
diff --git a/kube1/deploy.sh b/clusters/kube1/deploy.sh
similarity index 100%
rename from kube1/deploy.sh
rename to clusters/kube1/deploy.sh
diff --git a/nixos/hardware-configuration/k1-0.nix b/clusters/kube1/k1-0.nix
similarity index 100%
rename from nixos/hardware-configuration/k1-0.nix
rename to clusters/kube1/k1-0.nix
diff --git a/nixos/hardware-configuration/k1-1.nix b/clusters/kube1/k1-1.nix
similarity index 100%
rename from nixos/hardware-configuration/k1-1.nix
rename to clusters/kube1/k1-1.nix
diff --git a/nixos/hardware-configuration/k1-2.nix b/clusters/kube1/k1-2.nix
similarity index 100%
rename from nixos/hardware-configuration/k1-2.nix
rename to clusters/kube1/k1-2.nix
diff --git a/kube1/k8s.nix b/clusters/kube1/k8s.nix
similarity index 100%
rename from kube1/k8s.nix
rename to clusters/kube1/k8s.nix
diff --git a/kube-system-setup b/kube-system-setup
new file mode 160000
index 0000000..c5cff09
--- /dev/null
+++ b/kube-system-setup
@@ -0,0 +1 @@
+Subproject commit c5cff093cd3b2c9aa0356cda31bb5f06f430db0e
diff --git a/kube1/build.nix b/kube1/build.nix
deleted file mode 100644
index 0961011..0000000
--- a/kube1/build.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-with import <nixpkgs> {};
-pkgs.callPackage ./certs.nix {}
diff --git a/kube1/certs.nix b/kube1/certs.nix
deleted file mode 100644
index b88b147..0000000
--- a/kube1/certs.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ pkgs, ...}:
-let
-  pki = pkgs.callPackage ../lib/pki.nix {};
-in
-{
-    # initca = pki.initca;
-    ca = pki.ca;
-    apiserver = pki.apiserver ''
-      "10.253.18.109",
-      "10.0.0.1",
-      "127.0.0.1",
-      "kubernetes",
-      "etcd0",
-      "k1-0"
-    '';
-    kube-proxy = pki.kube-proxy;
-    admin = pki.admin;
-    etcd = pki.etcd ''
-        "etcd0",
-        "etcd1",
-        "10.253.18.109",
-        "10.253.18.110",
-        "127.0.0.1"
-    '';
-    k1-0 = pki.worker { name = "k1-0"; ip = "10.253.18.109"; };
-    k1-1 = pki.worker { name = "k1-1"; ip = "10.253.18.110"; };
-    k1-2 = pki.worker { name = "k1-2"; ip = "10.253.18.111"; };
-}
-
diff --git a/kube1/configure.sh b/kube1/configure.sh
deleted file mode 100644
index 935e6e9..0000000
--- a/kube1/configure.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-helm init
-echo "Waiting for tiller"
-sleep 30
-
-
-helm install --namespace kube-system --name ifs1 -f ifs1.yaml stable/nfs-client-provisioner
-
diff --git a/nixos b/nixos
new file mode 160000
index 0000000..82d6017
--- /dev/null
+++ b/nixos
@@ -0,0 +1 @@
+Subproject commit 82d60179d2962ca0503d5e1707557c17158cf07f
diff --git a/nixos/configuration.nix b/nixos.bak/configuration.nix
similarity index 100%
rename from nixos/configuration.nix
rename to nixos.bak/configuration.nix
diff --git a/nixos/nix-home.nix b/nixos.bak/nix-home.nix
similarity index 100%
rename from nixos/nix-home.nix
rename to nixos.bak/nix-home.nix
diff --git a/nixos/packages.nix b/nixos.bak/packages.nix
similarity index 100%
rename from nixos/packages.nix
rename to nixos.bak/packages.nix
diff --git a/nixos/users.nix b/nixos.bak/users.nix
similarity index 100%
rename from nixos/users.nix
rename to nixos.bak/users.nix