diff --git a/src/borgmanager/borg/__init__.py b/src/borgmanager/borg/__init__.py
index bc71aaa..17b4087 100644
--- a/src/borgmanager/borg/__init__.py
+++ b/src/borgmanager/borg/__init__.py
@@ -1,7 +1 @@
-from .dbobject import DBObject
-from .repo import Repo
-from .archive import Archive
-from .stats import Stats
-from .error import Error
-from .label import Label
 from .outputhandler import OutputHandler
diff --git a/src/borgmanager/borg/outputhandler.py b/src/borgmanager/borg/outputhandler.py
index 14dd799..c90c962 100644
--- a/src/borgmanager/borg/outputhandler.py
+++ b/src/borgmanager/borg/outputhandler.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from borgmanager import borg
+from borgmanager.database.object import Repo, Archive, Error, Stats
 import json
 
 
@@ -15,11 +15,11 @@ class OutputHandler(object):
             self.error = True
 
     def get_borg_info(self):
-        repo = borg.Repo.from_json(self.borg_json['repository'])
-        archive = borg.Archive.from_json(self.borg_json['archive'])
-        stats = borg.Stats.from_json(self.borg_json['archive']['stats'])
+        repo = Repo.from_json(self.borg_json['repository'])
+        archive = Archive.from_json(self.borg_json['archive'])
+        stats = Stats.from_json(self.borg_json['archive']['stats'])
 
         return repo, archive, stats
 
     def get_borg_error(self):
-        return borg.Error(self.borg_output, datetime.now())
+        return Error(self.borg_output, datetime.now())
diff --git a/src/borgmanager/database/borgdatabase.py b/src/borgmanager/database/borgdatabase.py
index 094acf6..6255bc3 100644
--- a/src/borgmanager/database/borgdatabase.py
+++ b/src/borgmanager/database/borgdatabase.py
@@ -1,5 +1,5 @@
 from .connection import RepoConn, ArchiveConn, StatsConn, ErrorConn, LabelConn
-from borgmanager.borg.label import Label
+from .object.label import Label
 from pathlib import Path
 
 
diff --git a/src/borgmanager/database/connection/labelconn.py b/src/borgmanager/database/connection/labelconn.py
index e11a370..ea972d5 100644
--- a/src/borgmanager/database/connection/labelconn.py
+++ b/src/borgmanager/database/connection/labelconn.py
@@ -51,7 +51,6 @@ class LabelConn(DatabaseConnection):
             self.sql_execute(f"UPDATE {self._sql_table} SET label = ? WHERE id = ?;",
                              (record.label, primary_key))
         else:
-            print("updating record")
             self.sql_execute(f"UPDATE {self._sql_table} SET repo_id = ?, label = ? WHERE id = ?;",
                              (repo_id, record.label, primary_key))
         self.sql_commit()
diff --git a/src/borgmanager/database/object/__init__.py b/src/borgmanager/database/object/__init__.py
new file mode 100644
index 0000000..4417906
--- /dev/null
+++ b/src/borgmanager/database/object/__init__.py
@@ -0,0 +1,6 @@
+from .dbobject import DBObject
+from .repo import Repo
+from .archive import Archive
+from .stats import Stats
+from .error import Error
+from .label import Label
diff --git a/src/borgmanager/borg/archive.py b/src/borgmanager/database/object/archive.py
similarity index 100%
rename from src/borgmanager/borg/archive.py
rename to src/borgmanager/database/object/archive.py
diff --git a/src/borgmanager/borg/dbobject.py b/src/borgmanager/database/object/dbobject.py
similarity index 100%
rename from src/borgmanager/borg/dbobject.py
rename to src/borgmanager/database/object/dbobject.py
diff --git a/src/borgmanager/borg/error.py b/src/borgmanager/database/object/error.py
similarity index 100%
rename from src/borgmanager/borg/error.py
rename to src/borgmanager/database/object/error.py
diff --git a/src/borgmanager/borg/label.py b/src/borgmanager/database/object/label.py
similarity index 100%
rename from src/borgmanager/borg/label.py
rename to src/borgmanager/database/object/label.py
diff --git a/src/borgmanager/borg/repo.py b/src/borgmanager/database/object/repo.py
similarity index 100%
rename from src/borgmanager/borg/repo.py
rename to src/borgmanager/database/object/repo.py
diff --git a/src/borgmanager/borg/stats.py b/src/borgmanager/database/object/stats.py
similarity index 100%
rename from src/borgmanager/borg/stats.py
rename to src/borgmanager/database/object/stats.py
diff --git a/src/borgmanager/summary/summary.py b/src/borgmanager/summary/summary.py
index 0516e8c..1bba4a0 100644
--- a/src/borgmanager/summary/summary.py
+++ b/src/borgmanager/summary/summary.py
@@ -1,4 +1,4 @@
-from borgmanager.borg import Repo, Stats
+from borgmanager.database.object import Repo, Stats
 
 
 class Summary(object):