From b814a8515577fe776941da0b4e49f466afd40314 Mon Sep 17 00:00:00 2001
From: David Newhall II <david@sleepers.pro>
Date: Mon, 24 Jun 2019 01:20:35 -0700
Subject: [PATCH] move more

---
 Makefile                            | 9 ++++-----
 cmd/unifi-poller/main.go => main.go | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename cmd/unifi-poller/main.go => main.go (72%)

diff --git a/Makefile b/Makefile
index e2053896..c481c89a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ URL:=https://github.com/davidnewhall/$(BINARY)
 MAINT=David Newhall II <david at sleepers dot pro>
 DESC=This daemon polls a UniFi controller at a short interval and stores the collected measurements in an Influx Database.
 GOLANGCI_LINT_ARGS=--enable-all -D gochecknoglobals
-PACKAGE:=./cmd/$(BINARY)
 DOCKER_REPO=golift
 MD2ROFF_BIN=github.com/github/hub/md2roff-bin
 
@@ -62,23 +61,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/unifipoller.Version=$(VERSION)"
 
 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/unifipoller.Version=$(VERSION)"
 
 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/unifipoller.Version=$(VERSION)"
 
 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/unifipoller.Version=$(VERSION)"
 
 # Packages
 
diff --git a/cmd/unifi-poller/main.go b/main.go
similarity index 72%
rename from cmd/unifi-poller/main.go
rename to main.go
index cf4a1095..768d4af6 100644
--- a/cmd/unifi-poller/main.go
+++ b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/davidnewhall/unifi-poller/pkg/unifipoller"
+	"github.com/davidnewhall/unifi-poller/unifipoller"
 )
 
 // Keep it simple.