72 files changed, 68 insertions, 67 deletions

diff --git a/doc/src/examples/accelbubble.qdoc b/doc/src/examples/accelbubble.qdoc
index 962bce6..7188533 100644
--- a/doc/src/examples/accelbubble.qdoc
+++ b/doc/src/examples/accelbubble.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/accelbubble
-    \title Accel Bubble
+    \example QtSensors/QtSensors_accelbubble
+    \title Qt Sensors - Accel Bubble
     \brief The AccelBubble example demonstrates the Legacy Accelerometer QML element.
     \ingroup qtsensors-examples
 
@@ -36,19 +36,19 @@
 
     Import the Legacy Sensors Declarative module.
 
-\snippet ../examples/QtSensors/accelbubble/main.qml 0
+\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml 0
 
     Add an Accelerometer QML element.
 
-\snippet ../examples/QtSensors/accelbubble/main.qml  1
+\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml  1
 
     The accelerometer might run too fast for what we need, so add a timer to read the accelerometer's readings.
 
-\snippet ../examples/QtSensors/accelbubble/main.qml  2
+\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml  2
 
     Use the 'active' property to start the sensor
 
-\snippet ../examples/QtSensors/accelbubble/main.qml  3
+\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml  3
 
 */
 
diff --git a/doc/src/cubehouse.qdoc b/doc/src/examples/cubehouse.qdoc
index 42bdd3d..278dd86 100644
--- a/doc/src/cubehouse.qdoc
+++ b/doc/src/examples/cubehouse.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/cubehouse
-    \title Cube House QML Accelerometer example
+    \example QtSensors/QtSensors_cubehouse
+    \title Qt Sensors - Cube House QML Accelerometer example
     \ingroup qtsensors-examples
     \brief The Cube House example demonstrates the use of the accelerometer to drive a camera to create a pseudo-3D effect.
     \image cubehouse.png
@@ -37,24 +37,24 @@
 
     Import the QtMobility.sensors declarative plugin:
 
-\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 0
+\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 0
 
     Add the Accelerometer QML elements into your qml file.
 
-\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 1
+\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 1
 
     In additional two properties are added to save the calculated pitch and roll values:
 
-\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 2
+\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 2
 
     Reading out the Accelerometer data can be done by implementing the 'onReadingChanged' slot and
     accessing the 'reading' property from the Accelerometer element:
 
-\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 3
+\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 3
 
     By using a timer the view can be rotated using the pitch and roll properties from the Accelerometer element:
 
-\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 4
+\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 4
 
 */
 
diff --git a/doc/src/examples/grue.qdoc b/doc/src/examples/grue.qdoc
index a64528a..73a67fc 100644
--- a/doc/src/examples/grue.qdoc
+++ b/doc/src/examples/grue.qdoc
@@ -27,11 +27,11 @@
 
 /*!
     \page gruesensorexample.html
-    \title Grue Sensor Example
-    \brief The Grue sensor example demonstrates all the steps from creating a new sensor to using it.
+    \title Qt Sensors - Grue Sensor Example
+    \brief The Qt Sensors - Grue sensor example demonstrates all the steps from creating a new sensor to using it.
     \ingroup qtsensors-examples
 
-    The Grue sensor example demonstrates all the steps from creating a new sensor to using it.
+    The Qt Sensors - Grue sensor example demonstrates all the steps from creating a new sensor to using it.
 
     The sensor definition is placed in a library where client apps can access it. The actual implementation
     lives in a plugin.
@@ -57,7 +57,7 @@
 */
 
 /*!
-    \example QtSensors/grue/lib
+    \example QtSensors/QtSensors_grue/lib
     \title Grue Sensor Definition
     \brief The Grue sensor is defined in a library so that applications can use it.
 
@@ -74,11 +74,11 @@
     src/sensors. As such, it contains some generated code that defines the convenience
     classes GrueFilter and GrueSensor.
 
-    \sa {Grue Sensor Example}
+    \sa {Qt Sensors - Grue Sensor Example}
 */
 
 /*!
-    \example QtSensors/grue/plugin
+    \example QtSensors/QtSensors_grue/plugin
     \title Grue Sensor Implementation
     \brief The Grue sensor implementation lives in a plugin that is loaded by the Qt Sensors library.
 
@@ -94,13 +94,13 @@
     light sensor. In the start method, the backend should be sure to call the
     sensorStopped() or sensorBusy() methods if it cannot start.
 
-    \snippet ../examples/QtSensors/grue/plugin/gruesensorimpl.cpp start
+    \snippet ../examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp start
 
     The setReading method is needed so that the sensors library knows where the
     readings are coming from. This backend has a local copy of the reading so
     it passes a pointer to the function.
 
-    \snippet ../examples/QtSensors/grue/plugin/gruesensorimpl.cpp setReading
+    \snippet ../examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp setReading
 
     However it is also possible to pass null to the setReading method in which
     case the sensors library will create an instance and return a pointer.
@@ -119,11 +119,11 @@
     The Grue sensor backend is delivered as a plugin. The plugin has a factory object
     that registers the types available and does the actual instantiation of the backend.
 
-    \sa {Grue Sensor Example}
+    \sa {Qt Sensors - Grue Sensor Example}
 */
 
 /*!
-    \example QtSensors/grue/console_app
+    \example QtSensors/QtSensors_grue/console_app
     \title Grue Sensor Console Application
     \brief The Grue sensor console application demonstrates use of the Grue sensor.
 
@@ -131,21 +131,21 @@
     access feature of Qt Sensors to avoid a link-time dependency on the Grue Sensor
     library.
 
-    \sa {Grue Sensor Example}
+    \sa {Qt Sensors - Grue Sensor Example}
 */
 
 /*!
-    \example QtSensors/grue/import
+    \example QtSensors/QtSensors_grue/import
     \title Grue Sensor QML Import
     \brief The Grue sensor QML import exports the GrueSensor class as a QML element.
 
     This example creates the \e {Grue 1.0} import.
 
-    \sa {Grue Sensor Example}
+    \sa {Qt Sensors - Grue Sensor Example}
 */
 
 /*!
-    \example QtSensors/grue/qml_app
+    \example QtSensors/QtSensors_grue
     \title Grue Sensor QML Application
     \brief The Grue sensor QML application demonstrates use of the GrueSensor QML element.
 
@@ -154,9 +154,9 @@
     this example or it will not be able to find its dependencies.
 
     \code
-    qmlscene main.qml
+    qmlscene QtSensors_grue.qml
     \endcode
 
-    \sa {Grue Sensor Example}
+    \sa {Qt Sensors - Grue Sensor Example}
 */
 
diff --git a/doc/src/qmlsensorgtestures.qdoc b/doc/src/examples/qmlsensorgtestures.qdoc
index a384d26..1da467a 100644
--- a/doc/src/qmlsensorgtestures.qdoc
+++ b/doc/src/examples/qmlsensorgtestures.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example QtSensors/qmlsensorgestures/qml_app
-    \title SensorGesture QML Element example
+    \example QtSensors/QtSensors_qmlsensorgestures
+    \title Qt Sensors - SensorGesture QML Element example
     \ingroup qtsensors-examples
 
     \brief This example demonstrates use of the SensorGesture QML element.
@@ -37,25 +37,25 @@
 
     Import the QtSensors 5.x declarative plugin:
 
-\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 0
+\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 0
 
    Add the SensorGesture QML element into your qml file.
 
-\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 1
+\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 1
 
    Each SensorGesture QML element contains a property called gestures.
 
    In this example an alias 'gestureid' for this property is used.
 
-\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 2
+\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 2
 
    By using this alias property you define which gestures should be used:
 
-\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml 3
+\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml 3
 
    A list of all available gestures can be created by calling the 'availableGestures' property:
 
-\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml 4
+\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml 4
 
 \sa {Qt Sensors - ShakeIt QML Example}
 \sa {Qt Sensor Gestures}
diff --git a/doc/src/examples/sensorgestures.qdoc b/doc/src/examples/sensorgestures.qdoc
index 6da13c8..4940dfb 100644
--- a/doc/src/examples/sensorgestures.qdoc
+++ b/doc/src/examples/sensorgestures.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \page sensorgestureexample.html
-    \title C++ Sensor Gestures Example
+    \title Qt Sensors - C++ Sensor Gestures Example
     \ingroup qtsensors-examples
     \brief The sensor gesture example demonstrates the steps for creating a C++ application
      that uses sensor gestures and the included shake sensor.
@@ -45,17 +45,17 @@
     In order to know about custom signals that may be available, we need to ask the QSensorGestureManager about them,
 
     Using the QSensorGesture::gestureIds() function, the manager will return a QStringList of known and valid gesture Ids.
-    \snippet ../examples/QtSensors/sensorgestures/mainwindow.cpp 0
+    \snippet ../examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp 0
 
     We can then use this to create a QSensorGesture object that we can use to connect signals to,
     and start the detection process. A QSensorGesture object will take a list of one or more
     recognizer ids in it's constructor.
 
-    \snippet ../examples/QtSensors/sensorgestures/mainwindow.cpp 1
+    \snippet ../examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp 1
 
     and later stop the detection process.
 
-    \snippet ../examples/QtSensors/sensorgestures/mainwindow.cpp 2
+    \snippet ../examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp 2
 
     The QSensorGesture object will contain all the signals of the valid  requested recognizers found on the system.
 
diff --git a/doc/src/qtsensors.qdoc b/doc/src/qtsensors.qdoc
index 925bc5a..cc10651 100644
--- a/doc/src/qtsensors.qdoc
+++ b/doc/src/qtsensors.qdoc
@@ -56,8 +56,8 @@
             \li \l {Qt Sensors Backend}{Backend}
             \li Information about the Qt Sensors back end
         \row
-            \li \l {Grue Sensor Example}
-            \li The Grue Sensor Example demonstrates creation of a sensor backend
+            \li \l {Qt Sensors - Grue Sensor Example}
+            \li The Qt Sensors - Grue Sensor Example demonstrates creation of a sensor backend
     \endtable
 
     \section1 Compatibility with QtMobility Sensors API
diff --git a/examples/QtSensors/QtSensors.pro b/examples/QtSensors/QtSensors.pro
index 3e64991..fd775ab 100644
--- a/examples/QtSensors/QtSensors.pro
+++ b/examples/QtSensors/QtSensors.pro
@@ -1,16 +1,16 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    accel \
-    accelbubble \
-    cubehouse \
-    grue \
-    qmlsensorgestures \
+    QtSensors_accel \
+    QtSensors_accelbubble \
+    QtSensors_cubehouse \
+    QtSensors_grue \
+    QtSensors_qmlsensorgestures \
     QtSensors_maze \
     QtSensors_qmlqtsensors \
     QtSensors_sensor_explorer \
     QtSensors_shakeit
 
 !isEmpty(QT.widgets.name):SUBDIRS += \
-    sensorgestures
+    QtSensors_sensorgestures
 
diff --git a/examples/QtSensors/accel/accel.pro b/examples/QtSensors/QtSensors_accel/QtSensors_accel.pro
index 86303ec..86303ec 100644
--- a/examples/QtSensors/accel/accel.pro
+++ b/examples/QtSensors/QtSensors_accel/QtSensors_accel.pro
diff --git a/examples/QtSensors/accel/main.cpp b/examples/QtSensors/QtSensors_accel/main.cpp
index 012c8c6..012c8c6 100644
--- a/examples/QtSensors/accel/main.cpp
+++ b/examples/QtSensors/QtSensors_accel/main.cpp
diff --git a/examples/QtSensors/accelbubble/accelbubble.pro b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro
index feeec68..feeec68 100644
--- a/examples/QtSensors/accelbubble/accelbubble.pro
+++ b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.pro
diff --git a/examples/QtSensors/accelbubble/main.qml b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml
index 487ee3f..2117698 100644
--- a/examples/QtSensors/accelbubble/main.qml
+++ b/examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml
@@ -83,7 +83,7 @@ Rectangle {
 
     Image {
         id: bubble
-        source: "images/Bluebubble2.png"
+        source: "content/Bluebubble2.png"
         property real centerX: parent.width / 2
         property real centerY: parent.height / 2;
         property real bubbleCenter: bubble.width / 2
diff --git a/examples/QtSensors/accelbubble/images/Bluebubble2.png b/examples/QtSensors/QtSensors_accelbubble/content/Bluebubble2.png
index f96126e..f96126e 100644
--- a/examples/QtSensors/accelbubble/images/Bluebubble2.png
+++ b/examples/QtSensors/QtSensors_accelbubble/content/Bluebubble2.png
diff --git a/examples/QtSensors/accelbubble/icon.png b/examples/QtSensors/QtSensors_accelbubble/icon.png
index d74f111..d74f111 100644
--- a/examples/QtSensors/accelbubble/icon.png
+++ b/examples/QtSensors/QtSensors_accelbubble/icon.png
diff --git a/examples/QtSensors/accelbubble/info.json b/examples/QtSensors/QtSensors_accelbubble/info.json
index 80c81bd..b91dd9f 100644
--- a/examples/QtSensors/accelbubble/info.json
+++ b/examples/QtSensors/QtSensors_accelbubble/info.json
@@ -6,7 +6,7 @@
         },
         "identifier": "com.nokia.mt.accelbubble",
         "runtime": "qml",
-        "main": "main.qml",
+        "main": "QtSensors_accelbubble.qml",
         "version": "1.0.0",
         "category": "application",
         "subcategory": "utility"
diff --git a/examples/QtSensors/cubehouse/Cube.qml b/examples/QtSensors/QtSensors_cubehouse/Cube.qml
index c174b8f..b8afe81 100644
--- a/examples/QtSensors/cubehouse/Cube.qml
+++ b/examples/QtSensors/QtSensors_cubehouse/Cube.qml
@@ -75,7 +75,7 @@ Cube {
 
     effect: Effect {
         color: "#aaca00"
-        texture: "images/qtlogo.png"
+        texture: "content/qtlogo.png"
         decal: true
     }
 }
diff --git a/examples/QtSensors/cubehouse/cubehouse.pro b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro
index 075ec4e..075ec4e 100644
--- a/examples/QtSensors/cubehouse/cubehouse.pro
+++ b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.pro
diff --git a/examples/QtSensors/cubehouse/Cubehouse.qml b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml
index 5a1b91f..5a1b91f 100644
--- a/examples/QtSensors/cubehouse/Cubehouse.qml
+++ b/examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml
diff --git a/examples/QtSensors/cubehouse/Room.qml b/examples/QtSensors/QtSensors_cubehouse/Room.qml
index 43af3b1..848735b 100644
--- a/examples/QtSensors/cubehouse/Room.qml
+++ b/examples/QtSensors/QtSensors_cubehouse/Room.qml
@@ -105,7 +105,7 @@ Item3D{
         id: frontWall
         scale: room.scale
         effect: Effect {
-            texture: "images/wall.jpg"
+            texture: "content/wall.jpg"
         }
         transform: [
             Translation3D {
@@ -130,7 +130,7 @@ Item3D{
         id: ground
         scale: room.scale
         effect: Effect {
-            texture: "images/ground.jpg"
+            texture: "content/ground.jpg"
         }
         transform: [
             Translation3D {
@@ -155,7 +155,7 @@ Item3D{
         id: leftWall
         scale: room.scale
         effect: Effect {
-            texture: "images/wall.jpg"
+            texture: "content/wall.jpg"
         }
         transform: [
             Translation3D {
@@ -180,7 +180,7 @@ Item3D{
         id: rightWall
         scale: room.scale
         effect: Effect {
-            texture: "images/wall.jpg"
+            texture: "content/wall.jpg"
         }
         transform: [
             Translation3D {
@@ -205,7 +205,7 @@ Item3D{
         id: roof
         scale: room.scale
         effect: Effect {
-            texture: "images/roof.jpg"
+            texture: "content/roof.jpg"
         }
         transform: [
             Translation3D {
@@ -230,7 +230,7 @@ Item3D{
         id: backWall
         scale: room.scale
         effect: Effect {
-            texture: "images/wall.jpg"
+            texture: "content/wall.jpg"
         }
         transform: [
             Translation3D {
diff --git a/examples/QtSensors/cubehouse/Table.qml b/examples/QtSensors/QtSensors_cubehouse/Table.qml
index 683d28d..683d28d 100644
--- a/examples/QtSensors/cubehouse/Table.qml
+++ b/examples/QtSensors/QtSensors_cubehouse/Table.qml
diff --git a/examples/QtSensors/cubehouse/images/ground.jpg b/examples/QtSensors/QtSensors_cubehouse/content/ground.jpg
index 2664b99..2664b99 100644
--- a/examples/QtSensors/cubehouse/images/ground.jpg
+++ b/examples/QtSensors/QtSensors_cubehouse/content/ground.jpg
diff --git a/examples/QtSensors/cubehouse/images/qtlogo.png b/examples/QtSensors/QtSensors_cubehouse/content/qtlogo.png
index 7d3e97e..7d3e97e 100644
--- a/examples/QtSensors/cubehouse/images/qtlogo.png
+++ b/examples/QtSensors/QtSensors_cubehouse/content/qtlogo.png
diff --git a/examples/QtSensors/cubehouse/images/roof.jpg b/examples/QtSensors/QtSensors_cubehouse/content/roof.jpg
index 53a35d6..53a35d6 100644
--- a/examples/QtSensors/cubehouse/images/roof.jpg
+++ b/examples/QtSensors/QtSensors_cubehouse/content/roof.jpg
diff --git a/examples/QtSensors/cubehouse/images/wall.jpg b/examples/QtSensors/QtSensors_cubehouse/content/wall.jpg
index 7c56e23..7c56e23 100644
--- a/examples/QtSensors/cubehouse/images/wall.jpg
+++ b/examples/QtSensors/QtSensors_cubehouse/content/wall.jpg
diff --git a/examples/QtSensors/cubehouse/icon.png b/examples/QtSensors/QtSensors_cubehouse/icon.png
index 193ad56..193ad56 100644
--- a/examples/QtSensors/cubehouse/icon.png
+++ b/examples/QtSensors/QtSensors_cubehouse/icon.png
diff --git a/examples/QtSensors/cubehouse/info.json b/examples/QtSensors/QtSensors_cubehouse/info.json
index 8d297c0..7b1c5af 100644
--- a/examples/QtSensors/cubehouse/info.json
+++ b/examples/QtSensors/QtSensors_cubehouse/info.json
@@ -6,7 +6,7 @@
         },
         "identifier": "com.nokia.mt.cubehouse",
         "runtime": "qml",
-        "main": "Cubehouse.qml",
+        "main": "QtSensors_cubehouse.qml",
         "version": "1.0.0",
         "category": "application",
         "subcategory": "utility"
diff --git a/examples/QtSensors/cubehouse/mesh/table.3ds b/examples/QtSensors/QtSensors_cubehouse/mesh/table.3ds
index 3e576bd..3e576bd 100644
--- a/examples/QtSensors/cubehouse/mesh/table.3ds
+++ b/examples/QtSensors/QtSensors_cubehouse/mesh/table.3ds
diff --git a/examples/QtSensors/grue/grue.pro b/examples/QtSensors/QtSensors_grue/QtSensors_grue.pro
index 0405286..de917bf 100644
--- a/examples/QtSensors/grue/grue.pro
+++ b/examples/QtSensors/QtSensors_grue/QtSensors_grue.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += lib plugin console_app
-SUBDIRS += import qml_app
+SUBDIRS += import qml.pro
 
 plugin.depends = lib
 import.depends = lib
diff --git a/examples/QtSensors/grue/qml_app/main.qml b/examples/QtSensors/QtSensors_grue/QtSensors_grue.qml
index 05d267c..05d267c 100644
--- a/examples/QtSensors/grue/qml_app/main.qml
+++ b/examples/QtSensors/QtSensors_grue/QtSensors_grue.qml
diff --git a/examples/QtSensors/grue/console_app/console_app.pro b/examples/QtSensors/QtSensors_grue/console_app/console_app.pro
index 33d4317..33d4317 100644
--- a/examples/QtSensors/grue/console_app/console_app.pro
+++ b/examples/QtSensors/QtSensors_grue/console_app/console_app.pro
diff --git a/examples/QtSensors/grue/console_app/main.cpp b/examples/QtSensors/QtSensors_grue/console_app/main.cpp
index dc62e4d..dc62e4d 100644
--- a/examples/QtSensors/grue/console_app/main.cpp
+++ b/examples/QtSensors/QtSensors_grue/console_app/main.cpp
diff --git a/examples/QtSensors/grue/qml_app/grue.png b/examples/QtSensors/QtSensors_grue/grue.png
index f0b070b..f0b070b 100644
--- a/examples/QtSensors/grue/qml_app/grue.png
+++ b/examples/QtSensors/QtSensors_grue/grue.png
diff --git a/examples/QtSensors/grue/qml_app/grue.xcf b/examples/QtSensors/QtSensors_grue/grue.xcf
index 2837ed7..2837ed7 100644
--- a/examples/QtSensors/grue/qml_app/grue.xcf
+++ b/examples/QtSensors/QtSensors_grue/grue.xcf
diff --git a/examples/QtSensors/grue/qml_app/icon.png b/examples/QtSensors/QtSensors_grue/icon.png
index f3f038c..f3f038c 100644
--- a/examples/QtSensors/grue/qml_app/icon.png
+++ b/examples/QtSensors/QtSensors_grue/icon.png
diff --git a/examples/QtSensors/grue/qml_app/icon.xcf b/examples/QtSensors/QtSensors_grue/icon.xcf
index 8416c49..8416c49 100644
--- a/examples/QtSensors/grue/qml_app/icon.xcf
+++ b/examples/QtSensors/QtSensors_grue/icon.xcf
diff --git a/examples/QtSensors/grue/import/import.pro b/examples/QtSensors/QtSensors_grue/import/import.pro
index 753e1ef..753e1ef 100644
--- a/examples/QtSensors/grue/import/import.pro
+++ b/examples/QtSensors/QtSensors_grue/import/import.pro
diff --git a/examples/QtSensors/grue/import/main.cpp b/examples/QtSensors/QtSensors_grue/import/main.cpp
index 6c32703..6c32703 100644
--- a/examples/QtSensors/grue/import/main.cpp
+++ b/examples/QtSensors/QtSensors_grue/import/main.cpp
diff --git a/examples/QtSensors/grue/import/plugin.json b/examples/QtSensors/QtSensors_grue/import/plugin.json
index 0967ef4..0967ef4 100644
--- a/examples/QtSensors/grue/import/plugin.json
+++ b/examples/QtSensors/QtSensors_grue/import/plugin.json
diff --git a/examples/QtSensors/grue/import/qmldir b/examples/QtSensors/QtSensors_grue/import/qmldir
index 266b7c1..266b7c1 100644
--- a/examples/QtSensors/grue/import/qmldir
+++ b/examples/QtSensors/QtSensors_grue/import/qmldir
diff --git a/examples/QtSensors/grue/qml_app/info.json b/examples/QtSensors/QtSensors_grue/info.json
index 700c3eb..7512905 100644
--- a/examples/QtSensors/grue/qml_app/info.json
+++ b/examples/QtSensors/QtSensors_grue/info.json
@@ -6,7 +6,7 @@
         },
         "identifier": "com.nokia.mt.grue",
         "runtime": "qml",
-        "main": "main.qml",
+        "main": "QtSensors_grue.qml",
         "version": "1.0.0",
         "category": "application",
         "subcategory": "utility"
diff --git a/examples/QtSensors/grue/lib/gruesensor.cpp b/examples/QtSensors/QtSensors_grue/lib/gruesensor.cpp
index b1f00ed..b1f00ed 100644
--- a/examples/QtSensors/grue/lib/gruesensor.cpp
+++ b/examples/QtSensors/QtSensors_grue/lib/gruesensor.cpp
diff --git a/examples/QtSensors/grue/lib/gruesensor.h b/examples/QtSensors/QtSensors_grue/lib/gruesensor.h
index 8088988..8088988 100644
--- a/examples/QtSensors/grue/lib/gruesensor.h
+++ b/examples/QtSensors/QtSensors_grue/lib/gruesensor.h
diff --git a/examples/QtSensors/grue/lib/gruesensor_p.h b/examples/QtSensors/QtSensors_grue/lib/gruesensor_p.h
index 4996e86..4996e86 100644
--- a/examples/QtSensors/grue/lib/gruesensor_p.h
+++ b/examples/QtSensors/QtSensors_grue/lib/gruesensor_p.h
diff --git a/examples/QtSensors/grue/lib/lib.pro b/examples/QtSensors/QtSensors_grue/lib/lib.pro
index e048e60..e048e60 100644
--- a/examples/QtSensors/grue/lib/lib.pro
+++ b/examples/QtSensors/QtSensors_grue/lib/lib.pro
diff --git a/examples/QtSensors/grue/plugin/gruesensorimpl.cpp b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp
index e7152a6..e7152a6 100644
--- a/examples/QtSensors/grue/plugin/gruesensorimpl.cpp
+++ b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.cpp
diff --git a/examples/QtSensors/grue/plugin/gruesensorimpl.h b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.h
index ed89711..ed89711 100644
--- a/examples/QtSensors/grue/plugin/gruesensorimpl.h
+++ b/examples/QtSensors/QtSensors_grue/plugin/gruesensorimpl.h
diff --git a/examples/QtSensors/grue/plugin/main.cpp b/examples/QtSensors/QtSensors_grue/plugin/main.cpp
index 36aec29..36aec29 100644
--- a/examples/QtSensors/grue/plugin/main.cpp
+++ b/examples/QtSensors/QtSensors_grue/plugin/main.cpp
diff --git a/examples/QtSensors/grue/plugin/plugin.json b/examples/QtSensors/QtSensors_grue/plugin/plugin.json
index 8a55b3a..8a55b3a 100644
--- a/examples/QtSensors/grue/plugin/plugin.json
+++ b/examples/QtSensors/QtSensors_grue/plugin/plugin.json
diff --git a/examples/QtSensors/grue/plugin/plugin.pro b/examples/QtSensors/QtSensors_grue/plugin/plugin.pro
index 32e127f..32e127f 100644
--- a/examples/QtSensors/grue/plugin/plugin.pro
+++ b/examples/QtSensors/QtSensors_grue/plugin/plugin.pro
diff --git a/examples/QtSensors/grue/qml_app/qml_app.pro b/examples/QtSensors/QtSensors_grue/qml.pro
index c017dcc..c017dcc 100644
--- a/examples/QtSensors/grue/qml_app/qml_app.pro
+++ b/examples/QtSensors/QtSensors_grue/qml.pro
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/Button.qml
index 23fc0f6..23fc0f6 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/Button.qml
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml
index c9b1f09..c9b1f09 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureList.qml
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml
index 07a9a5c..07a9a5c 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/GesturesView.qml
index 23924ca..23924ca 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/GesturesView.qml
diff --git a/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro
new file mode 100644
index 0000000..011f5f9
--- /dev/null
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS = \
+    plugin \
+    qml.pro
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml
index 2982c09..2982c09 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/QtSensors_qmlsensorgestures.qml
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/icon.png b/examples/QtSensors/QtSensors_qmlsensorgestures/icon.png
index c445bd7..c445bd7 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/icon.png
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/icon.png
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/info.json b/examples/QtSensors/QtSensors_qmlsensorgestures/info.json
index 02e1e0a..57241da 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/info.json
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/info.json
@@ -6,7 +6,7 @@
         },
         "identifier": "com.nokia.mt.qmlsensorsgesture",
         "runtime": "qml",
-        "main": "Gesture.qml",
+        "main": "QtSensors_qmlsensorgestures.qml",
         "version": "1.0.0",
         "category": "application",
         "subcategory": "utility"
diff --git a/examples/QtSensors/qmlsensorgestures/plugin/plugin.json b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.json
index 8a55b3a..8a55b3a 100644
--- a/examples/QtSensors/qmlsensorgestures/plugin/plugin.json
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.json
diff --git a/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.pro
index 2003e91..2003e91 100644
--- a/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/plugin.pro
diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.cpp
index 1fda187..1fda187 100644
--- a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.cpp
diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.h
index 4755f96..4755f96 100644
--- a/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcountergestureplugin.h
diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.cpp
index 03319e8..03319e8 100644
--- a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.cpp
diff --git a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.h
index 37c16eb..37c16eb 100644
--- a/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/plugin/qcounterrecognizer.h
diff --git a/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro b/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro
index 6ad9a8b..6ad9a8b 100644
--- a/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro
+++ b/examples/QtSensors/QtSensors_qmlsensorgestures/qml.pro
diff --git a/examples/QtSensors/sensorgestures/sensorgestures.pro b/examples/QtSensors/QtSensors_sensorgestures/QtSensors_sensorgestures.pro
index 295db94..295db94 100644
--- a/examples/QtSensors/sensorgestures/sensorgestures.pro
+++ b/examples/QtSensors/QtSensors_sensorgestures/QtSensors_sensorgestures.pro
diff --git a/examples/QtSensors/sensorgestures/gesture.png b/examples/QtSensors/QtSensors_sensorgestures/gesture.png
index 707d5c4..707d5c4 100644
--- a/examples/QtSensors/sensorgestures/gesture.png
+++ b/examples/QtSensors/QtSensors_sensorgestures/gesture.png
diff --git a/examples/QtSensors/sensorgestures/main.cpp b/examples/QtSensors/QtSensors_sensorgestures/main.cpp
index 49594d4..49594d4 100644
--- a/examples/QtSensors/sensorgestures/main.cpp
+++ b/examples/QtSensors/QtSensors_sensorgestures/main.cpp
diff --git a/examples/QtSensors/sensorgestures/mainwindow.cpp b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp
index 9dd8a61..9dd8a61 100644
--- a/examples/QtSensors/sensorgestures/mainwindow.cpp
+++ b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.cpp
diff --git a/examples/QtSensors/sensorgestures/mainwindow.h b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.h
index 1e38f1b..1e38f1b 100644
--- a/examples/QtSensors/sensorgestures/mainwindow.h
+++ b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.h
diff --git a/examples/QtSensors/sensorgestures/mainwindow.ui b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.ui
index baccf98..baccf98 100644
--- a/examples/QtSensors/sensorgestures/mainwindow.ui
+++ b/examples/QtSensors/QtSensors_sensorgestures/mainwindow.ui
diff --git a/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro b/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro
deleted file mode 100644
index 01677c1..0000000
--- a/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += plugin
-SUBDIRS += qml_app
-
diff --git a/src/imports/sensors2/qsensor2gesture.cpp b/src/imports/sensors2/qsensor2gesture.cpp
index 2743814..63b5f75 100644
--- a/src/imports/sensors2/qsensor2gesture.cpp
+++ b/src/imports/sensors2/qsensor2gesture.cpp
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
     displays the detected gesture in a text element.
 
     QtSensors.shake gesture is available with the Qt Sensors API, but the QtSensors.SecondCounter
-    sensor gesture is provided as example code for the \l {SensorGesture QML Element example}
+    sensor gesture is provided as example code for the \l {Qt Sensors - SensorGesture QML Element example}
 
     \qml
     Item {