diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb8100dbaf2550c5ee3ae9f26d0817ae871fd333..9be8fce153d467cf571a338e8a48319261bb0cda 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,8 +26,8 @@ if(GST_FOUND)
 	)
 	if(ANDROID) # Should also be expanded to iOS
 		list(APPEND EXTRA_SRC
-			src/Taisync/TaisyncTelemetry.cc
-			src/Taisync/TaisyncVideoReceiver.cc
+			Taisync/TaisyncTelemetry.cc
+			Taisync/TaisyncVideoReceiver.cc
 		)
 	endif()
 endif()
diff --git a/src/FlightDisplay/CMakeLists.txt b/src/FlightDisplay/CMakeLists.txt
index d7a3ea2bed73b6dab80dff7c580cf617d8dd7a55..8201653a2b83f4ede035bc053781a5bca8015cc9 100644
--- a/src/FlightDisplay/CMakeLists.txt
+++ b/src/FlightDisplay/CMakeLists.txt
@@ -1,21 +1,48 @@
 
 add_custom_target(FligthDisplayQml
-SOURCES
-	FlightDisplayView.qml       
-	FlightDisplayViewDummy.qml  
-	FlightDisplayViewMap.qml    
-	FlightDisplayViewUVC.qml      
-	FlightDisplayViewVideo.qml    
-	FlightDisplayViewWidgets.qml  
-	GuidedActionConfirm.qml       
-	GuidedActionList.qml         
-	GuidedActionsController.qml  
-	GuidedAltitudeSlider.qml     
-	MultiVehicleList.qml         
-	PreFlightBatteryCheck.qml        
-	PreFlightGPSCheck.qml
-	PreFlightRCCheck.qml             
-	PreFlightSensorsHealthCheck.qml  
-	PreFlightSoundCheck.qml
-	VirtualJoystick.qml
+	SOURCES
+		DefaultChecklist.qml
+		FixedWingChecklist.qml
+		FlightDisplayViewDummy.qml
+		FlightDisplayViewUVC.qml
+		FlightDisplayViewVideo.qml
+		FlightDisplayViewWidgets.qml
+		FlyViewAirspaceIndicator.qml
+		FlyViewCustomLayer.qml
+		FlyViewInstrumentPanel.qml
+		FlyViewMap.qml
+		FlyViewMissionCompleteDialog.qml
+		FlyViewPreFlightChecklistPopup.qml
+		FlyView.qml
+		FlyViewToolStripActionList.qml
+		FlyViewToolStrip.qml
+		FlyViewVideo.qml
+		FlyViewWidgetLayer.qml
+		GuidedActionActionList.qml
+		GuidedActionConfirm.qml
+		GuidedActionLand.qml
+		GuidedActionList.qml
+		GuidedActionPause.qml
+		GuidedActionRTL.qml
+		GuidedActionsController.qml
+		GuidedActionTakeoff.qml
+		GuidedAltitudeSlider.qml
+		GuidedToolStripAction.qml
+		MultiRotorChecklist.qml
+		MultiVehicleList.qml
+		MultiVehiclePanel.qml
+		PreFlightBatteryCheck.qml
+		PreFlightCheckList.qml
+		PreFlightCheckListShowAction.qml
+		PreFlightGPSCheck.qml
+		PreFlightRCCheck.qml
+		PreFlightSensorsHealthCheck.qml
+		PreFlightSoundCheck.qml
+		RoverChecklist.qml
+		SubChecklist.qml
+		TerrainProgress.qml
+		VehicleWarnings.qml
+		VirtualJoystick.qml
+		VTOLChecklist.qml
 )
+
diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt
index 382e6dfeee463c6a2894c06bc4d9af4fd70c5111..c98eaea69c2de7f66faeae9c46ab0681065736bb 100644
--- a/src/QmlControls/CMakeLists.txt
+++ b/src/QmlControls/CMakeLists.txt
@@ -4,10 +4,12 @@ add_library(QmlControls
 	AppMessages.h
 	EditPositionDialogController.cc
 	EditPositionDialogController.h
+	FactValueGrid.cc
+	FactValueGrid.h
 	FlightPathSegment.cc
 	FlightPathSegment.h
-	InstrumentValueArea.cc
-	InstrumentValueArea.h
+	HorizontalFactValueGrid.cc
+	HorizontalFactValueGrid.h
 	InstrumentValueData.cc
 	InstrumentValueData.h
 	ParameterEditorController.cc
@@ -31,11 +33,17 @@ add_library(QmlControls
 	ScreenToolsController.h
 	TerrainProfile.cc
 	TerrainProfile.h
+	ToolStripAction.cc
+	ToolStripAction.h
+	ToolStripActionList.cc
+	ToolStripActionList.h
+	VerticalFactValueGrid.cc
+	VerticalFactValueGrid.h
 )
 
 add_custom_target(QmlControlsQml
 	SOURCES
-		APMSubMotorDisplay.qml	
+		APMSubMotorDisplay.qml
 		AppMessages.qml
 		AxisMonitor.qml
 		ClickableColor.qml
@@ -50,9 +58,18 @@ add_custom_target(QmlControlsQml
 		FlightModeMenu.qml
 		HackAndroidFileDialog.qml
 		HackFileDialog.qml
+		HeightIndicator.qml
+		HorizontalFactValueGrid.qml
 		IndicatorButton.qml
+		InstrumentValueArea.qml
+		InstrumentValueEditDialog.qml
+		InstrumentValueLabel.qml
+		InstrumentValueValue.qml
 		JoystickThumbPad.qml
+		KMLOrSHPFileDialog.qml
 		LogReplayStatusBar.qml
+		MainWindowSavedState.qml
+		MAVLinkChart.qml
 		MAVLinkMessageButton.qml
 		MissionCommandDialog.qml
 		MissionItemIndexLabel.qml
@@ -60,31 +77,38 @@ add_custom_target(QmlControlsQml
 		MultiRotorMotorDisplay.qml
 		OfflineMapButton.qml
 		PageView.qml
-		ParameterEditor.qml
 		ParameterEditorDialog.qml
+		ParameterEditor.qml
 		PIDTuning.qml
 		PreFlightCheckButton.qml
 		PreFlightCheckGroup.qml
+		PreFlightCheckList.qml
 		PreFlightCheckModel.qml
 		QGCButton.qml
 		QGCCheckBox.qml
 		QGCColoredImage.qml
 		QGCComboBox.qml
+		QGCControlDebug.qml
+		QGCDynamicObjectManager.qml
 		QGCFileDialog.qml
-		QGCFlickable.qml
 		QGCFlickableHorizontalIndicator.qml
+		QGCFlickable.qml
 		QGCFlickableVerticalIndicator.qml
 		QGCGroupBox.qml
 		QGCHoverButton.qml
 		QGCLabel.qml
 		QGCListView.qml
 		QGCMapLabel.qml
-		QGCMenu.qml
 		QGCMenuItem.qml
+		QGCMenu.qml
 		QGCMenuSeparator.qml
 		QGCMouseArea.qml
 		QGCMovableItem.qml
-		QGCPipable.qml
+		QGCOptionsComboBox.qml
+		QGCPipOverlay.qml
+		QGCPipState.qml
+		QGCPopupDialogContainer.qml
+		QGCPopupDialog.qml
 		QGCRadioButton.qml
 		QGCSlider.qml
 		QGCSwitch.qml
@@ -92,11 +116,13 @@ add_custom_target(QmlControlsQml
 		QGCTabButton.qml
 		QGCTextField.qml
 		QGCToolBarButton.qml
-		QGCViewDialog.qml
+		QGCToolInsets.qml
 		QGCViewDialogContainer.qml
+		QGCViewDialog.qml
 		QGCViewMessage.qml
 		QmlTest.qml
 		RCChannelMonitor.qml
+		RCToParamDialog.qml
 		RoundButton.qml
 		ScreenTools.qml
 		SectionHeader.qml
@@ -105,6 +131,7 @@ add_custom_target(QmlControlsQml
 		ToolStrip.qml
 		VehicleRotationCal.qml
 		VehicleSummaryRow.qml
+		VerticalFactValueGrid.qml
 )
 target_link_libraries(QmlControls
         PUBLIC