diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 4291c82652c4d8d9345cf9197c9888a6382b8c60..5d90fb8f6e114469fb94adda7de53547454baf43 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -43,22 +43,22 @@
         <file alias="PowerComponentBattery_04cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg</file>
         <file alias="PowerComponentBattery_05cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg</file>
         <file alias="PowerComponentBattery_06cell.svg">src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg</file>
-        <file alias="attitudeDial.svg">src/ui/qmlcommon/attitudeDial.svg</file>
-        <file alias="attitudeInstrument.svg">src/ui/qmlcommon/attitudeInstrument.svg</file>
-        <file alias="attitudePointer.svg">src/ui/qmlcommon/attitudePointer.svg</file>
-        <file alias="buttonHome.svg">src/ui/qmlcommon/buttonHome.svg</file>
-        <file alias="buttonLeft.svg">src/ui/qmlcommon/buttonLeft.svg</file>
-        <file alias="buttonMore.svg">src/ui/qmlcommon/buttonMore.svg</file>
-        <file alias="buttonRight.svg">src/ui/qmlcommon/buttonRight.svg</file>
-        <file alias="compass.svg">src/ui/qmlcommon/compass.svg</file>
-        <file alias="compassInstrumentAirplane.svg">src/ui/qmlcommon/compassInstrumentAirplane.svg</file>
-        <file alias="compassInstrumentDial.svg">src/ui/qmlcommon/compassInstrumentDial.svg</file>
-        <file alias="compassNeedle.svg">src/ui/qmlcommon/compassNeedle.svg</file>
-        <file alias="crossHair.svg">src/ui/qmlcommon/crossHair.svg</file>
-        <file alias="rollDialWhite.svg">src/ui/qmlcommon/rollDialWhite.svg</file>
-        <file alias="rollPointerWhite.svg">src/ui/qmlcommon/rollPointerWhite.svg</file>
-        <file alias="scale.png">src/ui/qmlcommon/scale.png</file>
-        <file alias="scale_end.png">src/ui/qmlcommon/scale_end.png</file>
+        <file alias="attitudeDial.svg">src/FlightMap/Images/attitudeDial.svg</file>
+        <file alias="attitudeInstrument.svg">src/FlightMap/Images/attitudeInstrument.svg</file>
+        <file alias="attitudePointer.svg">src//FlightMap/Images/attitudePointer.svg</file>
+        <file alias="buttonHome.svg">src/FlightMap/Images/buttonHome.svg</file>
+        <file alias="buttonLeft.svg">src/FlightMap/Images/buttonLeft.svg</file>
+        <file alias="buttonMore.svg">src/FlightMap/Images/buttonMore.svg</file>
+        <file alias="buttonRight.svg">src/FlightMap/Images/buttonRight.svg</file>
+        <file alias="compass.svg">src/FlightMap/Images/compass.svg</file>
+        <file alias="compassInstrumentAirplane.svg">src/FlightMap/Images/compassInstrumentAirplane.svg</file>
+        <file alias="compassInstrumentDial.svg">src/FlightMap/Images/compassInstrumentDial.svg</file>
+        <file alias="compassNeedle.svg">src/FlightMap/Images/compassNeedle.svg</file>
+        <file alias="crossHair.svg">src/FlightMap/Images/crossHair.svg</file>
+        <file alias="rollDialWhite.svg">src/FlightMap/Images/rollDialWhite.svg</file>
+        <file alias="rollPointerWhite.svg">src/FlightMap/Images/rollPointerWhite.svg</file>
+        <file alias="scale.png">src/FlightMap/Images/scale.png</file>
+        <file alias="scale_end.png">src/FlightMap/Images/scale_end.png</file>
     </qresource>
     <qresource prefix="/qml">
         <file alias="test.qml">src/test.qml</file>
@@ -118,25 +118,28 @@
         <file alias="MainToolBar.qml">src/ui/toolbar/MainToolBar.qml</file>
         <file alias="FlightDisplay.qml">src/ui/flightdisplay/FlightDisplay.qml</file>
         <file alias="MapDisplay.qml">src/ui/mapdisplay/MapDisplay.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCAltitudeWidget.qml">src/ui/qmlcommon/QGCAltitudeWidget.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCArtificialHorizon.qml">src/ui/qmlcommon/QGCArtificialHorizon.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCAttitudeWidget.qml">src/ui/qmlcommon/QGCAttitudeWidget.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCAttitudeHUD.qml">src/ui/qmlcommon/QGCAttitudeHUD.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCCompassWidget.qml">src/ui/qmlcommon/QGCCompassWidget.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCCompassHUD.qml">src/ui/qmlcommon/QGCCompassHUD.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCCurrentAltitude.qml">src/ui/qmlcommon/QGCCurrentAltitude.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCCurrentSpeed.qml">src/ui/qmlcommon/QGCCurrentSpeed.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCHudMessage.qml">src/ui/qmlcommon/QGCHudMessage.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCMapBackground.qml">src/ui/qmlcommon/QGCMapBackground.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCMapToolButton.qml">src/ui/qmlcommon/QGCMapToolButton.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCPitchIndicator.qml">src/ui/qmlcommon/QGCPitchIndicator.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCSlider.qml">src/ui/qmlcommon/QGCSlider.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCSpeedWidget.qml">src/ui/qmlcommon/QGCSpeedWidget.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCVideoBackground.qml">src/ui/qmlcommon/QGCVideoBackground.qml</file>
-        <file alias="QGroundControl/FlightControls/QGCWaypointEditor.qml">src/ui/qmlcommon/QGCWaypointEditor.qml</file>
-        <file alias="QGroundControl/FlightControls/qmldir">src/ui/qmlcommon/qmldir</file>
-        <file alias="QGroundControl/FlightControls/QGCWaypoint.qml">src/ui/qmlcommon/QGCWaypoint.qml</file>
-        <file alias="QGroundControl/FlightControls/VehicleMapItem.qml">src/ui/qmlcommon/VehicleMapItem.qml</file>
+
+        <!-- FlightMap module -->
+        <file alias="QGroundControl/FlightMap/qmldir">src/FlightMap/qmldir</file>
+        <file alias="QGroundControl/FlightMap/FlightMap.qml">src/FlightMap/FlightMap.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCVideoBackground.qml">src/FlightMap/QGCVideoBackground.qml</file>
+
+        <file alias="QGroundControl/FlightMap/QGCAltitudeWidget.qml">src/FlightMap/Widgets/QGCAltitudeWidget.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCArtificialHorizon.qml">src/FlightMap/Widgets/QGCArtificialHorizon.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCAttitudeWidget.qml">src/FlightMap/Widgets/QGCAttitudeWidget.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCAttitudeHUD.qml">src/FlightMap/Widgets/QGCAttitudeHUD.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCCompassWidget.qml">src/FlightMap/Widgets/QGCCompassWidget.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCCompassHUD.qml">src/FlightMap/Widgets/QGCCompassHUD.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCCurrentAltitude.qml">src/FlightMap/Widgets/QGCCurrentAltitude.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCCurrentSpeed.qml">src/FlightMap/Widgets/QGCCurrentSpeed.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCHudMessage.qml">src/FlightMap/Widgets/QGCHudMessage.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCMapToolButton.qml">src/FlightMap/Widgets/QGCMapToolButton.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCPitchIndicator.qml">src/FlightMap/Widgets/QGCPitchIndicator.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCSlider.qml">src/FlightMap/Widgets/QGCSlider.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCSpeedWidget.qml">src/FlightMap/Widgets/QGCSpeedWidget.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCWaypointEditor.qml">src/FlightMap/Widgets/QGCWaypointEditor.qml</file>
+        <file alias="QGroundControl/FlightMap/QGCWaypoint.qml">src/FlightMap/MapItems/QGCWaypoint.qml</file>
+        <file alias="QGroundControl/FlightMap/VehicleMapItem.qml">src/FlightMap/MapItems/VehicleMapItem.qml</file>
     </qresource>
     <qresource prefix="/res">
         <file alias="LeftArrow">resources/LeftArrow.svg</file>
diff --git a/src/ui/qmlcommon/QGCMapBackground.qml b/src/FlightMap/FlightMap.qml
similarity index 99%
rename from src/ui/qmlcommon/QGCMapBackground.qml
rename to src/FlightMap/FlightMap.qml
index 472698bb70ebe0bebdc47164b7e66219840bb5a2..ed7d3a0383d9c21ed5af13a45a893e0ebf97a79b 100644
--- a/src/ui/qmlcommon/QGCMapBackground.qml
+++ b/src/FlightMap/FlightMap.qml
@@ -33,7 +33,7 @@ import QtLocation 5.3
 import QtPositioning 5.3
 
 import QGroundControl.Controls              1.0
-import QGroundControl.FlightControls        1.0
+import QGroundControl.FlightMap        1.0
 import QGroundControl.ScreenTools           1.0
 import QGroundControl.MavManager            1.0
 import QGroundControl.MultiVehicleManager   1.0
diff --git a/src/ui/qmlcommon/attitudeDial.svg b/src/FlightMap/Images/attitudeDial.svg
similarity index 100%
rename from src/ui/qmlcommon/attitudeDial.svg
rename to src/FlightMap/Images/attitudeDial.svg
diff --git a/src/ui/qmlcommon/attitudeInstrument.svg b/src/FlightMap/Images/attitudeInstrument.svg
similarity index 100%
rename from src/ui/qmlcommon/attitudeInstrument.svg
rename to src/FlightMap/Images/attitudeInstrument.svg
diff --git a/src/ui/qmlcommon/attitudePointer.svg b/src/FlightMap/Images/attitudePointer.svg
similarity index 100%
rename from src/ui/qmlcommon/attitudePointer.svg
rename to src/FlightMap/Images/attitudePointer.svg
diff --git a/src/ui/qmlcommon/buttonHome.svg b/src/FlightMap/Images/buttonHome.svg
similarity index 100%
rename from src/ui/qmlcommon/buttonHome.svg
rename to src/FlightMap/Images/buttonHome.svg
diff --git a/src/ui/qmlcommon/buttonLeft.svg b/src/FlightMap/Images/buttonLeft.svg
similarity index 100%
rename from src/ui/qmlcommon/buttonLeft.svg
rename to src/FlightMap/Images/buttonLeft.svg
diff --git a/src/ui/qmlcommon/buttonMore.svg b/src/FlightMap/Images/buttonMore.svg
similarity index 100%
rename from src/ui/qmlcommon/buttonMore.svg
rename to src/FlightMap/Images/buttonMore.svg
diff --git a/src/ui/qmlcommon/buttonRight.svg b/src/FlightMap/Images/buttonRight.svg
similarity index 100%
rename from src/ui/qmlcommon/buttonRight.svg
rename to src/FlightMap/Images/buttonRight.svg
diff --git a/src/ui/qmlcommon/compass.svg b/src/FlightMap/Images/compass.svg
similarity index 100%
rename from src/ui/qmlcommon/compass.svg
rename to src/FlightMap/Images/compass.svg
diff --git a/src/ui/qmlcommon/compassInstrumentAirplane.svg b/src/FlightMap/Images/compassInstrumentAirplane.svg
similarity index 100%
rename from src/ui/qmlcommon/compassInstrumentAirplane.svg
rename to src/FlightMap/Images/compassInstrumentAirplane.svg
diff --git a/src/ui/qmlcommon/compassInstrumentDial.svg b/src/FlightMap/Images/compassInstrumentDial.svg
similarity index 100%
rename from src/ui/qmlcommon/compassInstrumentDial.svg
rename to src/FlightMap/Images/compassInstrumentDial.svg
diff --git a/src/ui/qmlcommon/compassNeedle.svg b/src/FlightMap/Images/compassNeedle.svg
similarity index 100%
rename from src/ui/qmlcommon/compassNeedle.svg
rename to src/FlightMap/Images/compassNeedle.svg
diff --git a/src/ui/qmlcommon/crossHair.svg b/src/FlightMap/Images/crossHair.svg
similarity index 100%
rename from src/ui/qmlcommon/crossHair.svg
rename to src/FlightMap/Images/crossHair.svg
diff --git a/src/ui/qmlcommon/rollDialWhite.svg b/src/FlightMap/Images/rollDialWhite.svg
similarity index 100%
rename from src/ui/qmlcommon/rollDialWhite.svg
rename to src/FlightMap/Images/rollDialWhite.svg
diff --git a/src/ui/qmlcommon/rollPointerWhite.svg b/src/FlightMap/Images/rollPointerWhite.svg
similarity index 100%
rename from src/ui/qmlcommon/rollPointerWhite.svg
rename to src/FlightMap/Images/rollPointerWhite.svg
diff --git a/src/ui/qmlcommon/scale.png b/src/FlightMap/Images/scale.png
similarity index 100%
rename from src/ui/qmlcommon/scale.png
rename to src/FlightMap/Images/scale.png
diff --git a/src/ui/qmlcommon/scale_end.png b/src/FlightMap/Images/scale_end.png
similarity index 100%
rename from src/ui/qmlcommon/scale_end.png
rename to src/FlightMap/Images/scale_end.png
diff --git a/src/ui/qmlcommon/QGCWaypoint.qml b/src/FlightMap/MapItems/QGCWaypoint.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCWaypoint.qml
rename to src/FlightMap/MapItems/QGCWaypoint.qml
diff --git a/src/ui/qmlcommon/VehicleMapItem.qml b/src/FlightMap/MapItems/VehicleMapItem.qml
similarity index 100%
rename from src/ui/qmlcommon/VehicleMapItem.qml
rename to src/FlightMap/MapItems/VehicleMapItem.qml
diff --git a/src/ui/qmlcommon/QGCVideoBackground.qml b/src/FlightMap/QGCVideoBackground.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCVideoBackground.qml
rename to src/FlightMap/QGCVideoBackground.qml
diff --git a/src/ui/qmlcommon/QGCAltitudeWidget.qml b/src/FlightMap/Widgets/QGCAltitudeWidget.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCAltitudeWidget.qml
rename to src/FlightMap/Widgets/QGCAltitudeWidget.qml
diff --git a/src/ui/qmlcommon/QGCArtificialHorizon.qml b/src/FlightMap/Widgets/QGCArtificialHorizon.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCArtificialHorizon.qml
rename to src/FlightMap/Widgets/QGCArtificialHorizon.qml
diff --git a/src/ui/qmlcommon/QGCAttitudeHUD.qml b/src/FlightMap/Widgets/QGCAttitudeHUD.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCAttitudeHUD.qml
rename to src/FlightMap/Widgets/QGCAttitudeHUD.qml
diff --git a/src/ui/qmlcommon/QGCAttitudeWidget.qml b/src/FlightMap/Widgets/QGCAttitudeWidget.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCAttitudeWidget.qml
rename to src/FlightMap/Widgets/QGCAttitudeWidget.qml
diff --git a/src/ui/qmlcommon/QGCCompassHUD.qml b/src/FlightMap/Widgets/QGCCompassHUD.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCCompassHUD.qml
rename to src/FlightMap/Widgets/QGCCompassHUD.qml
diff --git a/src/ui/qmlcommon/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCCompassWidget.qml
rename to src/FlightMap/Widgets/QGCCompassWidget.qml
diff --git a/src/ui/qmlcommon/QGCCurrentAltitude.qml b/src/FlightMap/Widgets/QGCCurrentAltitude.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCCurrentAltitude.qml
rename to src/FlightMap/Widgets/QGCCurrentAltitude.qml
diff --git a/src/ui/qmlcommon/QGCCurrentSpeed.qml b/src/FlightMap/Widgets/QGCCurrentSpeed.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCCurrentSpeed.qml
rename to src/FlightMap/Widgets/QGCCurrentSpeed.qml
diff --git a/src/ui/qmlcommon/QGCHudMessage.qml b/src/FlightMap/Widgets/QGCHudMessage.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCHudMessage.qml
rename to src/FlightMap/Widgets/QGCHudMessage.qml
diff --git a/src/ui/qmlcommon/QGCMapToolButton.qml b/src/FlightMap/Widgets/QGCMapToolButton.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCMapToolButton.qml
rename to src/FlightMap/Widgets/QGCMapToolButton.qml
diff --git a/src/ui/qmlcommon/QGCPitchIndicator.qml b/src/FlightMap/Widgets/QGCPitchIndicator.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCPitchIndicator.qml
rename to src/FlightMap/Widgets/QGCPitchIndicator.qml
diff --git a/src/ui/qmlcommon/QGCSlider.qml b/src/FlightMap/Widgets/QGCSlider.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCSlider.qml
rename to src/FlightMap/Widgets/QGCSlider.qml
diff --git a/src/ui/qmlcommon/QGCSpeedWidget.qml b/src/FlightMap/Widgets/QGCSpeedWidget.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCSpeedWidget.qml
rename to src/FlightMap/Widgets/QGCSpeedWidget.qml
diff --git a/src/ui/qmlcommon/QGCWaypointEditor.qml b/src/FlightMap/Widgets/QGCWaypointEditor.qml
similarity index 100%
rename from src/ui/qmlcommon/QGCWaypointEditor.qml
rename to src/FlightMap/Widgets/QGCWaypointEditor.qml
diff --git a/src/ui/qmlcommon/qmldir b/src/FlightMap/qmldir
similarity index 87%
rename from src/ui/qmlcommon/qmldir
rename to src/FlightMap/qmldir
index e7929ffb3c28dd53b4fda28f8363a798eddda76a..7b559fec948dacf21a6a317ca2fab3d3d566b644 100644
--- a/src/ui/qmlcommon/qmldir
+++ b/src/FlightMap/qmldir
@@ -1,5 +1,10 @@
-Module QGroundControl.FlightControls
+Module QGroundControl.FlightMap
 
+# Main view controls
+FlightMap        1.0 FlightMap.qml
+QGCVideoBackground      1.0 QGCVideoBackground.qml
+
+# Widgets
 QGCAltitudeWidget       1.0 QGCAltitudeWidget.qml
 QGCArtificialHorizon    1.0 QGCArtificialHorizon.qml
 QGCAttitudeHUD          1.0 QGCAttitudeHUD.qml
@@ -9,12 +14,12 @@ QGCCompassWidget        1.0 QGCCompassWidget.qml
 QGCCurrentAltitude      1.0 QGCCurrentAltitude.qml
 QGCCurrentSpeed         1.0 QGCCurrentSpeed.qml
 QGCHudMessage           1.0 QGCHudMessage.qml
-QGCMapBackground        1.0 QGCMapBackground.qml
 QGCMapToolButton        1.0 QGCMapToolButton.qml
 QGCPitchIndicator       1.0 QGCPitchIndicator.qml
 QGCSlider               1.0 QGCSlider.qml
 QGCSpeedWidget          1.0 QGCSpeedWidget.qml
-QGCVideoBackground      1.0 QGCVideoBackground.qml
-QGCWaypoint             1.0 QGCWaypoint.qml
 QGCWaypointEditor       1.0 QGCWaypointEditor.qml
+
+# MapQuickItems
 VehicleMapItem          1.0 VehicleMapItem.qml
+QGCWaypoint             1.0 QGCWaypoint.qml
diff --git a/src/ui/flightdisplay/FlightDisplay.qml b/src/ui/flightdisplay/FlightDisplay.qml
index 0d4a7dd767503d785b4dcda153e2273d60b47e76..2b9e06d0e83c0978016c98e347b71ec4d4d404db 100644
--- a/src/ui/flightdisplay/FlightDisplay.qml
+++ b/src/ui/flightdisplay/FlightDisplay.qml
@@ -32,7 +32,7 @@ import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.2
 import QtQuick.Dialogs 1.2
 
-import QGroundControl.FlightControls 1.0
+import QGroundControl.FlightMap 1.0
 import QGroundControl.MavManager 1.0
 import QGroundControl.ScreenTools 1.0
 import QGroundControl.Controls 1.0
@@ -336,7 +336,7 @@ Item {
         z:                  10
     }
 
-    QGCMapBackground {
+    FlightMap {
         id:                 mapBackground
         anchors.fill:       parent
         mapName:            'MainFlightDisplay'
diff --git a/src/ui/mapdisplay/MapDisplay.qml b/src/ui/mapdisplay/MapDisplay.qml
index a60ebb8c63eb659c2d0c7cc6bd94e31b261c2802..e6b72443ea9564b73130a22de911bea41e71a60b 100644
--- a/src/ui/mapdisplay/MapDisplay.qml
+++ b/src/ui/mapdisplay/MapDisplay.qml
@@ -34,7 +34,7 @@ import QtQuick.Layouts 1.1
 
 import QGroundControl.Palette 1.0
 import QGroundControl.Controls 1.0
-import QGroundControl.FlightControls 1.0
+import QGroundControl.FlightMap 1.0
 
 Rectangle {
     QGCPalette { id: __palette; colorGroupEnabled: true }
@@ -60,7 +60,7 @@ Rectangle {
 
         //----------------------------------------------------------------------------------------
         // Map View
-        QGCMapBackground {
+        FlightMap {
             id:                     mapBackground
             Layout.fillWidth:       true
             Layout.minimumWidth:    300