diff --git a/src/borgmanager/borg/__init__.py b/src/borgmanager/borg/__init__.py
index 4fc02b5..e4fc8cb 100644
--- a/src/borgmanager/borg/__init__.py
+++ b/src/borgmanager/borg/__init__.py
@@ -2,3 +2,4 @@ from .repo import Repo
 from .archive import Archive
 from .stats import Stats
 from .error import Error
+from .outputhandler import OutputHandler
diff --git a/src/borgoutputhandler.py b/src/borgmanager/borg/outputhandler.py
similarity index 95%
rename from src/borgoutputhandler.py
rename to src/borgmanager/borg/outputhandler.py
index c6a5e98..98774f7 100644
--- a/src/borgoutputhandler.py
+++ b/src/borgmanager/borg/outputhandler.py
@@ -3,7 +3,7 @@ from borgmanager import borg
 import json
 
 
-class BorgOutputHandler(object):
+class OutputHandler(object):
     def __init__(self, borg_output: str):
         self.borg_output = borg_output
         self.borg_json = None
diff --git a/src/main.py b/src/main.py
index 6bfd4fd..07201c4 100644
--- a/src/main.py
+++ b/src/main.py
@@ -3,7 +3,7 @@ from sys import stdin
 from os.path import realpath
 from pathlib import Path
 import argparse
-from borgoutputhandler import BorgOutputHandler
+from borgmanager.borg import OutputHandler
 from borgmanager.summary import Summary
 
 
@@ -15,7 +15,7 @@ def main(args, path: Path):
         summary = Summary(db, args.summary)
     else:
         borg_output = " ".join(stdin.readlines())
-        bo = BorgOutputHandler(borg_output)
+        bo = OutputHandler(borg_output)
 
         if bo.error:
             db.insert_error(bo.get_borg_error())