diff --git a/Makefile b/Makefile
index 13592fe..5511082 100755
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,17 @@ LDFLAGS=-ldflags "-X main.buildDate=${BUILD}"
 .PHONY: build deps static
 
 build:
-	go build ${LDFLAGS}
+	go build ${LDFLAGS} -o ledcontroller-server cmd/ledcontroller-server/main.go
+
+emulator:
+	go build ${LDFLAGS} -o emulator cmd/emulator/main.go
 
 deps:
-	go get
+	cd cmd/ledcontroller-server ; go get ; cd ../..
 
+deps-emulator:
+	cd cmd/emulator ; go get ; cd ../..
+
+# Static only makes sense for the server
 static:
-	CGO_ENABLED=0 GOOS=linux go build ${LDFLAGS} -a -installsuffix cgo -o LEDController .
\ No newline at end of file
+	CGO_ENABLED=0 GOOS=linux go build ${LDFLAGS} -a -installsuffix cgo -o ledcontroller-server cmd/ledcontroller-server/main.go
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
index 3bd70b2..f4fac78 100755
--- a/build/package/Dockerfile
+++ b/build/package/Dockerfile
@@ -7,6 +7,6 @@ RUN cd /go/src/git.martyn.berlin/martyn/LEDController/; make deps ; make static
 
 FROM scratch
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY --from=builder /go/src/git.martyn.berlin/martyn/LEDController /app/
+COPY --from=builder /go/src/git.martyn.berlin/martyn/ledcontroller-server /app/
 WORKDIR /app
 CMD ["/app/LEDController"]
\ No newline at end of file
diff --git a/cmd/emulator/main.go b/cmd/emulator/main.go
new file mode 100755
index 0000000..c74afdd
--- /dev/null
+++ b/cmd/emulator/main.go
@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fyne.io/fyne/app"
+	"fyne.io/fyne/widget"
+)
+
+func main() {
+	app := app.New()
+
+	w := app.NewWindow("Hello")
+	w.SetContent(widget.NewVBox(
+		widget.NewLabel("Hello Fyne!"),
+		widget.NewButton("Quit", func() {
+			app.Quit()
+		}),
+	))
+
+	w.ShowAndRun()
+}
diff --git a/main.go b/cmd/ledcontroller-server/main.go
similarity index 100%
rename from main.go
rename to cmd/ledcontroller-server/main.go
diff --git a/deployments/kubernetes/deploy.yaml b/deployments/kubernetes/deploy.yaml
index fd88133..6a90171 100755
--- a/deployments/kubernetes/deploy.yaml
+++ b/deployments/kubernetes/deploy.yaml
@@ -35,7 +35,7 @@ spec:
         - name: PANEL_BRIGHTNESS
           value: "10"
         image: imartyn/ledcontroller:0.0-linux-amd64
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
         name: ledcontroller
         ports:
         - name: web