diff --git a/HaikuPorter/BuildMaster.py b/HaikuPorter/BuildMaster.py
index e63eaba1..e6658c4f 100644
--- a/HaikuPorter/BuildMaster.py
+++ b/HaikuPorter/BuildMaster.py
@@ -11,14 +11,17 @@
 from .Configuration import Configuration
 from .Options import getOption
 from .Port import Port
-from .ReporterMongo import ReporterMongo
-from .ReporterJson import ReporterJson
-from .Utils import ensureCommandIsAvailable, sysExit, warn, info
 
 from .Builders.Builder import _BuilderState
 from .Builders.LocalBuilder import LocalBuilder
 from .Builders.RemoteBuilderSSH import RemoteBuilderSSH
 
+from .Reporters.ReporterMongo import ReporterMongo
+from .Reporters.ReporterJson import ReporterJson
+
+from .Utils import ensureCommandIsAvailable, sysExit, warn, info
+
+
 import errno
 import json
 import logging
diff --git a/HaikuPorter/ReporterJson.py b/HaikuPorter/Reporters/ReporterJson.py
similarity index 100%
rename from HaikuPorter/ReporterJson.py
rename to HaikuPorter/Reporters/ReporterJson.py
diff --git a/HaikuPorter/ReporterMongo.py b/HaikuPorter/Reporters/ReporterMongo.py
similarity index 100%
rename from HaikuPorter/ReporterMongo.py
rename to HaikuPorter/Reporters/ReporterMongo.py