diff --git a/core/poller/Makefile b/core/poller/Makefile
index e2053896..8fc00a07 100644
--- a/core/poller/Makefile
+++ b/core/poller/Makefile
@@ -62,23 +62,23 @@ README.html: md2roff
 
 build: $(BINARY)
 $(BINARY):
-	go build -o $(BINARY) -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE)
+	go build -o $(BINARY) -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE)
 
 linux: $(BINARY).linux
 $(BINARY).linux:
 	# Building linux binary.
-	GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE)
+	GOOS=linux go build -o $(BINARY).linux -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE)
 
 macos: $(BINARY).macos
 $(BINARY).macos:
 	# Building darwin binary.
-	GOOS=darwin go build -o $(BINARY).macos -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE)
+	GOOS=darwin go build -o $(BINARY).macos -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE)
 
 exe: $(BINARY).exe
 windows: $(BINARY).exe
 $(BINARY).exe:
 	# Building windows binary.
-	GOOS=windows go build -o $(BINARY).exe -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/unifipoller.Version=$(VERSION)" $(PACKAGE)
+	GOOS=windows go build -o $(BINARY).exe -ldflags "-w -s -X github.com/davidnewhall/unifi-poller/pkg/unifi-poller.Version=$(VERSION)" $(PACKAGE)
 
 # Packages
 
diff --git a/core/poller/README.md b/core/poller/README.md
index 32058e2b..12bce32c 100644
--- a/core/poller/README.md
+++ b/core/poller/README.md
@@ -85,7 +85,7 @@ means, if you wanted to do something like make telegraf collect your data instea
 of UniFi Poller you can achieve that with a little bit of Go code. You could write
 a small app that acts as a telegraf input plugin using the [unifi](https://github.com/golift/unifi)
 library to grab the data from your controller. As a bonus, all of the code in UniFi Poller is
-[also a library](https://godoc.org/github.com/davidnewhall/unifi-poller/unifipoller)
+[also a library](https://godoc.org/github.com/davidnewhall/unifi-poller/pkg/unifi-poller)
 and can be used in other projects.
 
 # What now...
diff --git a/core/poller/cmd/unifi-poller/main.go b/core/poller/cmd/unifi-poller/main.go
index 768d4af6..8f17b276 100644
--- a/core/poller/cmd/unifi-poller/main.go
+++ b/core/poller/cmd/unifi-poller/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/davidnewhall/unifi-poller/unifipoller"
+	unifipoller "github.com/davidnewhall/unifi-poller/pkg/unifi-poller"
 )
 
 // Keep it simple.
diff --git a/core/poller/unifipoller/config.go b/core/poller/pkg/unifi-poller/config.go
similarity index 100%
rename from core/poller/unifipoller/config.go
rename to core/poller/pkg/unifi-poller/config.go
diff --git a/core/poller/unifipoller/dumper.go b/core/poller/pkg/unifi-poller/dumper.go
similarity index 100%
rename from core/poller/unifipoller/dumper.go
rename to core/poller/pkg/unifi-poller/dumper.go
diff --git a/core/poller/unifipoller/helpers.go b/core/poller/pkg/unifi-poller/helpers.go
similarity index 100%
rename from core/poller/unifipoller/helpers.go
rename to core/poller/pkg/unifi-poller/helpers.go
diff --git a/core/poller/unifipoller/worker.go b/core/poller/pkg/unifi-poller/unifi.go
similarity index 100%
rename from core/poller/unifipoller/worker.go
rename to core/poller/pkg/unifi-poller/unifi.go
diff --git a/core/poller/unifipoller/unifipoller.go b/core/poller/pkg/unifi-poller/unifipoller.go
similarity index 100%
rename from core/poller/unifipoller/unifipoller.go
rename to core/poller/pkg/unifi-poller/unifipoller.go