diff --git a/src/database/access.go b/src/database/access.go
new file mode 100644
index 0000000..6ebe3d6
--- /dev/null
+++ b/src/database/access.go
@@ -0,0 +1,5 @@
+package database
+
+func PutMany(collection string, data []Service) bool {
+	return false
+}
\ No newline at end of file
diff --git a/src/mongo.go b/src/database/client.go
similarity index 61%
rename from src/mongo.go
rename to src/database/client.go
index 3d9c07a..4a35823 100644
--- a/src/mongo.go
+++ b/src/database/client.go
@@ -1,6 +1,8 @@
-package main
+package database
 
 import (
+    "git.fjla.uk/owlboard/mq-client/helpers"
+
 	"context"
     "time"
 	"fmt"
@@ -10,25 +12,19 @@ import (
    // "go.mongodb.org/mongo-driver/mongo/readpref"
 )
 
-type Service struct {
-	id string
-}
-
-var client (*mongo.Client) = initDataAccess()
+// Provide the DB Connection to other functions
+var MongoClient (*mongo.Client) = initDataAccess()
 
+// Initialise the DB Connection
 func initDataAccess() (*mongo.Client) {
     ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
     defer cancel()
     client, err := mongo.Connect(ctx, options.Client().ApplyURI(dbUri))
     if err != nil {
 		fmt.Println(err)
-        Log("Error connecting to database", 4)
+        helpers.Log("Error connecting to database", 4)
     } else {
-        Log("Connected to Database", 1)
+        helpers.Log("Connected to Database", 1)
     }
     return client
-}
-
-func PutMany(collection string, data []Service) bool {
-	return false
 }
\ No newline at end of file
diff --git a/src/config.go b/src/helpers/config.go
similarity index 92%
rename from src/config.go
rename to src/helpers/config.go
index 5c848ab..9682659 100644
--- a/src/config.go
+++ b/src/helpers/config.go
@@ -1,4 +1,4 @@
-package main
+package helpers
 
 import (
 	"os"
@@ -8,7 +8,7 @@ import (
 // Version Constants
 const versionNum string = "2023.7.1"
 const versionSuffix string = "beta"
-const versionStr string = versionNum + "-" + versionSuffix
+const Version string = versionNum + "-" + versionSuffix
 
 // Environment Variables
 var runtime string = getRuntime()
diff --git a/src/log.go b/src/helpers/logHelper.go
similarity index 96%
rename from src/log.go
rename to src/helpers/logHelper.go
index 8ce42e7..3dc2fe4 100644
--- a/src/log.go
+++ b/src/helpers/logHelper.go
@@ -1,4 +1,4 @@
-package main
+package helpers
 
 import (
 	"fmt"
diff --git a/src/main.go b/src/main.go
index f32e4fc..9cb1c34 100644
--- a/src/main.go
+++ b/src/main.go
@@ -1,8 +1,9 @@
 package main
 
 import (
+	"git.fjla.uk/owlboard/mq-client/helpers"
 )
 
 func main() {
-	Out("Initialised OwlBoard MQ Client " + versionStr, 0)
+	helpers.Out("Initialised OwlBoard MQ Client " + helpers.Version, 0)
 }
\ No newline at end of file
diff --git a/src/types/service.go b/src/types/service.go
new file mode 100644
index 0000000..a39edc1
--- /dev/null
+++ b/src/types/service.go
@@ -0,0 +1,5 @@
+package types
+
+type Service struct {
+	id string
+}
\ No newline at end of file