diff --git a/.goreleaser.yml b/.goreleaser.yml
index f92466a..cdb1763 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -40,6 +40,12 @@ nfpms:
       "bundle/debian/server.yaml": "/etc/nano-run/server.yaml"
     files:
       "bundle/debian/nano-run.service": "/etc/systemd/system/nano-run.service"
+      "templates/**": "/var/nano-run/ui"
+archives:
+  - files:
+      - "templates/**"
+    wrap_in_directory: true
+
 uploads:
   - name: bintray
     method: PUT
@@ -55,6 +61,7 @@ dockers:
     dockerfile: Dockerfile
     extra_files:
       - bundle/docker/server.yaml
+      - templates
     build_flag_templates:
       - "--label=org.opencontainers.image.created={{.Date}}"
       - "--label=org.opencontainers.image.title={{.ProjectName}}"
diff --git a/bundle/debian/server.yaml b/bundle/debian/server.yaml
index 72c01a4..0305a9e 100755
--- a/bundle/debian/server.yaml
+++ b/bundle/debian/server.yaml
@@ -1,5 +1,6 @@
 # Location to store tasks, blobs and queues
 working_directory: /var/nano-run
+ui_directory: /var/nano-run/ui
 config_directory: /etc/nano-run/conf.d
 bind: 127.0.0.1:8989
 graceful_shutdown: 5s
diff --git a/cmd/nano-run/run_cmd.go b/cmd/nano-run/run_cmd.go
index c542439..e0240a8 100644
--- a/cmd/nano-run/run_cmd.go
+++ b/cmd/nano-run/run_cmd.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"nano-run/server"
+	"nano-run/server/runner"
 )
 
 type runCmd struct {
@@ -31,7 +32,7 @@ func (cfg *runCmd) Execute([]string) error {
 		return err
 	}
 	defer os.RemoveAll(tmpDir)
-	srv := server.DefaultConfig()
+	srv := runner.DefaultConfig()
 	srv.Bind = cfg.Bind
 	srv.WorkingDirectory = cfg.Directory
 	srv.ConfigDirectory = tmpDir
diff --git a/cmd/nano-run/server_cmd.go b/cmd/nano-run/server_cmd.go
index 3eb8c6b..4384a77 100644
--- a/cmd/nano-run/server_cmd.go
+++ b/cmd/nano-run/server_cmd.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 
 	"nano-run/server"
+	"nano-run/server/runner"
 )
 
 type serverCmd struct {
@@ -24,7 +25,7 @@ func (cmd *serverInitCmd) Execute([]string) error {
 	if err != nil {
 		return err
 	}
-	cfg := server.DefaultConfig()
+	cfg := runner.DefaultConfig()
 	err = cfg.SaveFile(filepath.Join(cmd.Directory, cmd.ConfigFile))
 	if err != nil {
 		return err
@@ -53,7 +54,7 @@ type serverRunCmd struct {
 }
 
 func (cmd *serverRunCmd) Execute([]string) error {
-	cfg := server.DefaultConfig()
+	cfg := runner.DefaultConfig()
 	err := cfg.LoadFile(cmd.Config)
 	if os.IsNotExist(err) && !cmd.Fail {
 		log.Println("no config file found - using transient default configuration")