diff --git a/Dockerfile b/Dockerfile
index b85ea56..3178cfc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM golang:1.8.1-alpine as builder
 
-WORKDIR /go/src/github.com/infinityworksltd/docker-hub-exporter/
-
 COPY ./ /go/src/github.com/infinityworksltd/docker-hub-exporter/
 
+WORKDIR /go/src/github.com/infinityworksltd/docker-hub-exporter/cmd/exporter/
+
 RUN apk --update add ca-certificates \
     && apk --update add --virtual build-deps git
 
 RUN go get \
  && go test ./... \
- && GOOS=linux go build -o app .
+ && GOOS=linux go build -o exporter .
 
 FROM alpine
 
@@ -19,8 +19,8 @@ RUN addgroup exporter \
      && adduser -S -G exporter exporter \
      && apk --update --no-cache add ca-certificates
 
-COPY --from=builder /go/src/github.com/infinityworksltd/docker-hub-exporter/app .
+COPY --from=builder /go/src/github.com/infinityworksltd/docker-hub-exporter/cmd/exporter/exporter .
 
 USER exporter
 
-ENTRYPOINT ["/app"]
\ No newline at end of file
+ENTRYPOINT ["/exporter"]
\ No newline at end of file
diff --git a/main.go b/cmd/exporter/main.go
similarity index 96%
rename from main.go
rename to cmd/exporter/main.go
index d5a8ca1..ba24b8b 100644
--- a/main.go
+++ b/cmd/exporter/main.go
@@ -9,7 +9,7 @@ import (
 
 	"time"
 
-	"github.com/infinityworksltd/docker-hub-exporter/exporter"
+	exporter "github.com/infinityworksltd/docker-hub-exporter"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/exporter/exporter.go b/exporter.go
similarity index 99%
rename from exporter/exporter.go
rename to exporter.go
index 02eb683..6cbd861 100644
--- a/exporter/exporter.go
+++ b/exporter.go
@@ -1,4 +1,4 @@
-package exporter
+package docker_hub_exporter
 
 import (
 	"encoding/json"