diff --git a/revid/RevidCLI.go b/RevidCLI.go
similarity index 99%
rename from revid/RevidCLI.go
rename to RevidCLI.go
index 1932b097..6fbc1afc 100644
--- a/revid/RevidCLI.go
+++ b/RevidCLI.go
@@ -30,6 +30,7 @@ package main
 import (
 	"flag"
 	"strconv"
+	"revid"
 
 	"bitbucket.org/ausocean/IoT/pi/netsender"
 )
@@ -70,8 +71,8 @@ var (
 	configReceived bool = true
 	varSum int 					= 0
 	vars 								= make(map[string]string)
-	revid Revid
-	config 							= Config{}
+	revid revid.Revid
+	config revid.Config
 )
 
 func main() {
@@ -384,7 +385,7 @@ func revidReportActions(pin int) (int, error) {
 
 func createRevidInstance(){
 	// Try to create the revid instance with the given config
-	for revid, err := NewRevid(config); err != nil; {
+	for revid, err := revid.NewRevid(config); err != nil; {
 		// If the config does have a logger, use it to output error, otherwise
 		// just output to std output
 		if config.Logger != nil {