diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index ca9ecd88534bd7c11a0955548d7cfd75b4b862fa..b6ca3355d3383da83b6bc9537da9f08aa71b821f 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -568,7 +568,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 \
@@ -775,7 +774,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 \
@@ -1317,11 +1315,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/CMakeLists.txt b/src/CMakeLists.txt
index 0dff5582d76ec5eebe5eb3c9811bc2fad993ea08..6be6af89e178158a353033b8ebb6eb10608a698e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -157,7 +157,6 @@ target_link_libraries(qgc
 		comm
 		FactSystem
 		FirmwarePlugin
-		FlightDisplay
 		FlightMap
 		FollowMe
 		Geo
diff --git a/src/FlightDisplay/CMakeLists.txt b/src/FlightDisplay/CMakeLists.txt
index 93dc18baa2d305226dbea1ce32520c5376ed0ae5..d7a3ea2bed73b6dab80dff7c580cf617d8dd7a55 100644
--- a/src/FlightDisplay/CMakeLists.txt
+++ b/src/FlightDisplay/CMakeLists.txt
@@ -1,13 +1,4 @@
 
-add_library(FlightDisplay
-	VideoManager.cc
-)
-
-target_link_libraries(FlightDisplay
-	PRIVATE
-		qgc
-)
-
 add_custom_target(FligthDisplayQml
 SOURCES
 	FlightDisplayView.qml       
@@ -28,5 +19,3 @@ SOURCES
 	PreFlightSoundCheck.qml
 	VirtualJoystick.qml
 )
-
-target_include_directories(FlightDisplay PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/src/VideoStreaming/CMakeLists.txt b/src/VideoStreaming/CMakeLists.txt
index 45f6805449d63df529a26406f7dd03be5e47fe21..7b142574f5dbf6bb58f9b46be0f41297b45b911b 100644
--- a/src/VideoStreaming/CMakeLists.txt
+++ b/src/VideoStreaming/CMakeLists.txt
@@ -13,6 +13,8 @@ add_library(VideoStreaming
     VideoReceiver.h
     VideoStreaming.cc
     VideoStreaming.h
+    VideoManager.cc
+    VideoManager.h
 )
 
 target_link_libraries(VideoStreaming
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