diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 831a87f9402a89feb75ebf1e2ac3f2f592bcef87..0f799fc4111ef718b06f66447220b41d4a00d65c 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -564,7 +564,6 @@ HEADERS += \
     src/Camera/QGCCameraManager.h \
     src/CmdLineOptParser.h \
     src/FirmwarePlugin/PX4/px4_custom_mode.h \
-    src/FlightDisplay/VideoManager.h \
     src/FlightMap/Widgets/ValuesWidgetController.h \
     src/FollowMe/FollowMe.h \
     src/Joystick/Joystick.h \
@@ -771,7 +770,6 @@ SOURCES += \
     src/Camera/QGCCameraIO.cc \
     src/Camera/QGCCameraManager.cc \
     src/CmdLineOptParser.cc \
-    src/FlightDisplay/VideoManager.cc \
     src/FlightMap/Widgets/ValuesWidgetController.cc \
     src/FollowMe/FollowMe.cc \
     src/Joystick/Joystick.cc \
@@ -1303,11 +1301,13 @@ HEADERS += \
     src/VideoStreaming/VideoReceiver.h \
     src/VideoStreaming/VideoStreaming.h \
     src/VideoStreaming/SubtitleWriter.h \
+    src/VideoStreaming/VideoManager.h
 
 SOURCES += \
     src/VideoStreaming/VideoReceiver.cc \
     src/VideoStreaming/VideoStreaming.cc \
     src/VideoStreaming/SubtitleWriter.cc \
+    src/VideoStreaming/VideoManager.cc
 
 contains (CONFIG, DISABLE_VIDEOSTREAMING) {
     message("Skipping support for video streaming (manual override from command line)")
diff --git a/src/FlightDisplay/VideoManager.cc b/src/VideoStreaming/VideoManager.cc
similarity index 100%
rename from src/FlightDisplay/VideoManager.cc
rename to src/VideoStreaming/VideoManager.cc
diff --git a/src/FlightDisplay/VideoManager.h b/src/VideoStreaming/VideoManager.h
similarity index 100%
rename from src/FlightDisplay/VideoManager.h
rename to src/VideoStreaming/VideoManager.h