diff --git a/cmd/dkl-dir2config/main.go b/cmd/dkl-dir2config/main.go
index 83340df..ae8df5f 100644
--- a/cmd/dkl-dir2config/main.go
+++ b/cmd/dkl-dir2config/main.go
@@ -8,8 +8,9 @@ import (
 	"os"
 
 	yaml "gopkg.in/yaml.v2"
-	"novit.nc/direktil/pkg/clustersconfig"
 	"novit.nc/direktil/pkg/localconfig"
+
+	"novit.nc/direktil/local-server/pkg/clustersconfig"
 )
 
 var (
diff --git a/cmd/dkl-dir2config/render-context.go b/cmd/dkl-dir2config/render-context.go
index 346116a..1d648c1 100644
--- a/cmd/dkl-dir2config/render-context.go
+++ b/cmd/dkl-dir2config/render-context.go
@@ -7,7 +7,7 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
-	"novit.nc/direktil/pkg/clustersconfig"
+	"novit.nc/direktil/local-server/pkg/clustersconfig"
 )
 
 type renderContext struct {
diff --git a/go.mod b/go.mod
index 1dfd5d5..0b52e04 100644
--- a/go.mod
+++ b/go.mod
@@ -4,14 +4,15 @@ require (
 	github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e
 	github.com/cloudflare/cfssl v0.0.0-20181102015659-ea4033a214e7
 	github.com/gobuffalo/buffalo-plugins v1.8.3 // indirect
+	github.com/gobuffalo/flect v0.0.0-20181210151238-24a2b68e0316 // indirect
 	github.com/gobuffalo/genny v0.0.0-20181207193730-587570ab2cf7 // indirect
 	github.com/gobuffalo/packr v1.21.8 // indirect
 	github.com/google/certificate-transparency-go v1.0.21 // indirect
 	github.com/pierrec/lz4 v2.0.5+incompatible
 	github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 // indirect
 	golang.org/x/sys v0.0.0-20181210030007-2a47403f2ae5 // indirect
-	golang.org/x/tools v0.0.0-20181207222222-4c874b978acb // indirect
+	golang.org/x/tools v0.0.0-20181210202511-1d424dbce8dd // indirect
 	gopkg.in/yaml.v2 v2.2.2
 	k8s.io/apimachinery v0.0.0-20181207080347-f1a02064268b
-	novit.nc/direktil/pkg v0.0.0-20181210105214-68c87509f2eb
+	novit.nc/direktil/pkg v0.0.0-20181210211743-9dc80cd34b09
 )
diff --git a/go.sum b/go.sum
index ae728b4..e6daa77 100644
--- a/go.sum
+++ b/go.sum
@@ -97,6 +97,7 @@ github.com/gobuffalo/flect v0.0.0-20181104133451-1f6e9779237a/go.mod h1:rCiQgmAE
 github.com/gobuffalo/flect v0.0.0-20181108195648-8fe1b44cfe32/go.mod h1:rCiQgmAE4axgBNl3jZWzS5rETRYTGOsrixTRaCPzNdA=
 github.com/gobuffalo/flect v0.0.0-20181109221320-179d36177b5b/go.mod h1:0HvNbHdfh+WOvDSIASqJOSxTOWSxCCUF++k/Y53v9rI=
 github.com/gobuffalo/flect v0.0.0-20181114183036-47375f6d8328/go.mod h1:0HvNbHdfh+WOvDSIASqJOSxTOWSxCCUF++k/Y53v9rI=
+github.com/gobuffalo/flect v0.0.0-20181210151238-24a2b68e0316/go.mod h1:en58vff74S9b99Eg42Dr+/9yPu437QjlNsO/hBYPuOk=
 github.com/gobuffalo/genny v0.0.0-20180924032338-7af3a40f2252/go.mod h1:tUTQOogrr7tAQnhajMSH6rv1BVev34H2sa1xNHMy94g=
 github.com/gobuffalo/genny v0.0.0-20181003150629-3786a0744c5d/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM=
 github.com/gobuffalo/genny v0.0.0-20181005145118-318a41a134cc/go.mod h1:WAd8HmjMVrnkAZbmfgH5dLBUchsZfqzp/WS5sQz+uTM=
@@ -456,6 +457,7 @@ golang.org/x/tools v0.0.0-20181205224935-3576414c54a4/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20181206194817-bcd4e47d0288/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181207183836-8bc39b988060/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181207222222-4c874b978acb/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181210202511-1d424dbce8dd/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
@@ -482,3 +484,5 @@ novit.nc/direktil/pkg v0.0.0-20180707011528-e82b59c0324d h1:DMk2j7F+mXAQdZD5ouIx
 novit.nc/direktil/pkg v0.0.0-20180707011528-e82b59c0324d/go.mod h1:rbcL+fuxazzipTdJV8t9MW39YsdaK3pSvvhTdI9SXsc=
 novit.nc/direktil/pkg v0.0.0-20181210105214-68c87509f2eb h1:TP4vRMGiZDsL82xUmbV1cI2+mxZ2BV/3Zvl56sc/vvk=
 novit.nc/direktil/pkg v0.0.0-20181210105214-68c87509f2eb/go.mod h1:z5JgQ2ybqxBC1ZE5xC9FgH4rE9whqa7Gft+iP9J9jzo=
+novit.nc/direktil/pkg v0.0.0-20181210211743-9dc80cd34b09 h1:Y5GRTymITxgwaV5JVqKaxZ8U9qbLo+9jdhsGHxf/K2E=
+novit.nc/direktil/pkg v0.0.0-20181210211743-9dc80cd34b09/go.mod h1:z5JgQ2ybqxBC1ZE5xC9FgH4rE9whqa7Gft+iP9J9jzo=
diff --git a/vendor/novit.nc/direktil/pkg/clustersconfig/cert-request.go b/pkg/clustersconfig/cert-request.go
similarity index 100%
rename from vendor/novit.nc/direktil/pkg/clustersconfig/cert-request.go
rename to pkg/clustersconfig/cert-request.go
diff --git a/vendor/novit.nc/direktil/pkg/clustersconfig/clustersconfig.go b/pkg/clustersconfig/clustersconfig.go
similarity index 100%
rename from vendor/novit.nc/direktil/pkg/clustersconfig/clustersconfig.go
rename to pkg/clustersconfig/clustersconfig.go
diff --git a/vendor/novit.nc/direktil/pkg/clustersconfig/dir.go b/pkg/clustersconfig/dir.go
similarity index 100%
rename from vendor/novit.nc/direktil/pkg/clustersconfig/dir.go
rename to pkg/clustersconfig/dir.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0b88da9..a84f4bf 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -51,8 +51,7 @@ k8s.io/apimachinery/pkg/util/validation
 k8s.io/apimachinery/pkg/util/validation/field
 k8s.io/apimachinery/pkg/util/errors
 k8s.io/apimachinery/pkg/util/sets
-# novit.nc/direktil/pkg v0.0.0-20181210105214-68c87509f2eb
-novit.nc/direktil/pkg/clustersconfig
+# novit.nc/direktil/pkg v0.0.0-20181210211743-9dc80cd34b09
 novit.nc/direktil/pkg/localconfig
 novit.nc/direktil/pkg/cas
 novit.nc/direktil/pkg/config