diff --git a/Makefile b/Makefile
index a8e6762..c280699 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ deps:
 # Build steps.
 .PHONY: build
 build:
-	go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}'"
+	go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}'" cmd/*.go
 
 .PHONY: build-frontend
 build-frontend:
diff --git a/admin.go b/cmd/admin.go
similarity index 100%
rename from admin.go
rename to cmd/admin.go
diff --git a/campaigns.go b/cmd/campaigns.go
similarity index 100%
rename from campaigns.go
rename to cmd/campaigns.go
diff --git a/handlers.go b/cmd/handlers.go
similarity index 100%
rename from handlers.go
rename to cmd/handlers.go
diff --git a/import.go b/cmd/import.go
similarity index 100%
rename from import.go
rename to cmd/import.go
diff --git a/init.go b/cmd/init.go
similarity index 100%
rename from init.go
rename to cmd/init.go
diff --git a/install.go b/cmd/install.go
similarity index 100%
rename from install.go
rename to cmd/install.go
diff --git a/lists.go b/cmd/lists.go
similarity index 100%
rename from lists.go
rename to cmd/lists.go
diff --git a/main.go b/cmd/main.go
similarity index 100%
rename from main.go
rename to cmd/main.go
diff --git a/manager_db.go b/cmd/manager_db.go
similarity index 100%
rename from manager_db.go
rename to cmd/manager_db.go
diff --git a/media.go b/cmd/media.go
similarity index 100%
rename from media.go
rename to cmd/media.go
diff --git a/notifications.go b/cmd/notifications.go
similarity index 100%
rename from notifications.go
rename to cmd/notifications.go
diff --git a/public.go b/cmd/public.go
similarity index 100%
rename from public.go
rename to cmd/public.go
diff --git a/queries.go b/cmd/queries.go
similarity index 100%
rename from queries.go
rename to cmd/queries.go
diff --git a/settings.go b/cmd/settings.go
similarity index 100%
rename from settings.go
rename to cmd/settings.go
diff --git a/subscribers.go b/cmd/subscribers.go
similarity index 100%
rename from subscribers.go
rename to cmd/subscribers.go
diff --git a/templates.go b/cmd/templates.go
similarity index 100%
rename from templates.go
rename to cmd/templates.go
diff --git a/upgrade.go b/cmd/upgrade.go
similarity index 100%
rename from upgrade.go
rename to cmd/upgrade.go
diff --git a/utils.go b/cmd/utils.go
similarity index 100%
rename from utils.go
rename to cmd/utils.go