diff --git a/frigate/app.py b/frigate/app.py
index 4455ae919..507986abc 100644
--- a/frigate/app.py
+++ b/frigate/app.py
@@ -40,8 +40,8 @@ from frigate.object_detection import ObjectDetectProcess
 from frigate.object_processing import TrackedObjectProcessor
 from frigate.output import output_frames
 from frigate.plus import PlusApi
-from frigate.ptz import OnvifController
-from frigate.ptz_autotrack import PtzAutoTrackerThread
+from frigate.ptz.autotrack import PtzAutoTrackerThread
+from frigate.ptz.onvif import OnvifController
 from frigate.record.record import manage_recordings
 from frigate.stats import StatsEmitter, stats_init
 from frigate.storage import StorageMaintainer
diff --git a/frigate/comms/dispatcher.py b/frigate/comms/dispatcher.py
index 97eb2093d..9babf38a0 100644
--- a/frigate/comms/dispatcher.py
+++ b/frigate/comms/dispatcher.py
@@ -5,7 +5,7 @@ from abc import ABC, abstractmethod
 from typing import Any, Callable
 
 from frigate.config import FrigateConfig
-from frigate.ptz import OnvifCommandEnum, OnvifController
+from frigate.ptz.onvif import OnvifCommandEnum, OnvifController
 from frigate.types import CameraMetricsTypes, FeatureMetricsTypes
 from frigate.util import restart_frigate
 
diff --git a/frigate/http.py b/frigate/http.py
index f3632a0cf..cf653ca4f 100644
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -34,7 +34,7 @@ from frigate.events.external import ExternalEventProcessor
 from frigate.models import Event, Recordings, Timeline
 from frigate.object_processing import TrackedObject
 from frigate.plus import PlusApi
-from frigate.ptz import OnvifController
+from frigate.ptz.onvif import OnvifController
 from frigate.record.export import PlaybackFactorEnum, RecordingExporter
 from frigate.stats import stats_snapshot
 from frigate.storage import StorageMaintainer
diff --git a/frigate/object_processing.py b/frigate/object_processing.py
index f9f8391cf..827c99704 100644
--- a/frigate/object_processing.py
+++ b/frigate/object_processing.py
@@ -22,7 +22,7 @@ from frigate.config import (
 )
 from frigate.const import CLIPS_DIR
 from frigate.events.maintainer import EventTypeEnum
-from frigate.ptz_autotrack import PtzAutoTrackerThread
+from frigate.ptz.autotrack import PtzAutoTrackerThread
 from frigate.util import (
     SharedMemoryFrameManager,
     area,
diff --git a/frigate/ptz_autotrack.py b/frigate/ptz/autotrack.py
similarity index 99%
rename from frigate/ptz_autotrack.py
rename to frigate/ptz/autotrack.py
index ce1ba8519..426ba905e 100644
--- a/frigate/ptz_autotrack.py
+++ b/frigate/ptz/autotrack.py
@@ -13,7 +13,7 @@ import numpy as np
 from norfair.camera_motion import MotionEstimator, TranslationTransformationGetter
 
 from frigate.config import CameraConfig, FrigateConfig
-from frigate.ptz import OnvifController
+from frigate.ptz.onvif import OnvifController
 from frigate.types import CameraMetricsTypes
 from frigate.util import SharedMemoryFrameManager, intersection_over_union
 
diff --git a/frigate/ptz.py b/frigate/ptz/onvif.py
similarity index 100%
rename from frigate/ptz.py
rename to frigate/ptz/onvif.py
diff --git a/frigate/track/norfair_tracker.py b/frigate/track/norfair_tracker.py
index 36bb2532f..b5bf35634 100644
--- a/frigate/track/norfair_tracker.py
+++ b/frigate/track/norfair_tracker.py
@@ -6,7 +6,7 @@ from norfair import Detection, Drawable, Tracker, draw_boxes
 from norfair.drawing.drawer import Drawer
 
 from frigate.config import CameraConfig
-from frigate.ptz_autotrack import PtzMotionEstimator
+from frigate.ptz.autotrack import PtzMotionEstimator
 from frigate.track import ObjectTracker
 from frigate.util import intersection_over_union