165 files changed, 223 insertions, 199 deletions

diff --git a/doc/src/cubehouse.qdoc b/doc/src/cubehouse.qdoc
index 7555bb80..42bdd3d0 100644
--- a/doc/src/cubehouse.qdoc
+++ b/doc/src/cubehouse.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sensors/cubehouse
+    \example QtSensors/cubehouse
     \title 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.
@@ -37,24 +37,24 @@
 
     Import the QtMobility.sensors declarative plugin:
 
-\snippet ../examples/sensors/cubehouse/Cubehouse.qml 0
+\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 0
 
     Add the Accelerometer QML elements into your qml file.
 
-\snippet ../examples/sensors/cubehouse/Cubehouse.qml 1
+\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 1
 
     In additional two properties are added to save the calculated pitch and roll values:
 
-\snippet ../examples/sensors/cubehouse/Cubehouse.qml 2
+\snippet ../examples/QtSensors/cubehouse/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/sensors/cubehouse/Cubehouse.qml 3
+\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 3
 
     By using a timer the view can be rotated using the pitch and roll properties from the Accelerometer element:
 
-\snippet ../examples/sensors/cubehouse/Cubehouse.qml 4
+\snippet ../examples/QtSensors/cubehouse/Cubehouse.qml 4
 
 */
 
diff --git a/doc/src/examples/accelbubble.qdoc b/doc/src/examples/accelbubble.qdoc
index 2d4bd88d..962bce67 100644
--- a/doc/src/examples/accelbubble.qdoc
+++ b/doc/src/examples/accelbubble.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sensors/accelbubble
+    \example QtSensors/accelbubble
     \title 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/sensors/accelbubble/main.qml 0
+\snippet ../examples/QtSensors/accelbubble/main.qml 0
 
     Add an Accelerometer QML element.
 
-\snippet ../examples/sensors/accelbubble/main.qml  1
+\snippet ../examples/QtSensors/accelbubble/main.qml  1
 
     The accelerometer might run too fast for what we need, so add a timer to read the accelerometer's readings.
 
-\snippet ../examples/sensors/accelbubble/main.qml  2
+\snippet ../examples/QtSensors/accelbubble/main.qml  2
 
     Use the 'active' property to start the sensor
 
-\snippet ../examples/sensors/accelbubble/main.qml  3
+\snippet ../examples/QtSensors/accelbubble/main.qml  3
 
 */
 
diff --git a/doc/src/examples/grue.qdoc b/doc/src/examples/grue.qdoc
index 74283b07..a64528aa 100644
--- a/doc/src/examples/grue.qdoc
+++ b/doc/src/examples/grue.qdoc
@@ -57,7 +57,7 @@
 */
 
 /*!
-    \example sensors/grue/lib
+    \example QtSensors/grue/lib
     \title Grue Sensor Definition
     \brief The Grue sensor is defined in a library so that applications can use it.
 
@@ -78,7 +78,7 @@
 */
 
 /*!
-    \example sensors/grue/plugin
+    \example 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/sensors/grue/plugin/gruesensorimpl.cpp start
+    \snippet ../examples/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/sensors/grue/plugin/gruesensorimpl.cpp setReading
+    \snippet ../examples/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.
@@ -123,7 +123,7 @@
 */
 
 /*!
-    \example sensors/grue/console_app
+    \example QtSensors/grue/console_app
     \title Grue Sensor Console Application
     \brief The Grue sensor console application demonstrates use of the Grue sensor.
 
@@ -135,7 +135,7 @@
 */
 
 /*!
-    \example sensors/grue/import
+    \example QtSensors/grue/import
     \title Grue Sensor QML Import
     \brief The Grue sensor QML import exports the GrueSensor class as a QML element.
 
@@ -145,7 +145,7 @@
 */
 
 /*!
-    \example sensors/grue/qml_app
+    \example QtSensors/grue/qml_app
     \title Grue Sensor QML Application
     \brief The Grue sensor QML application demonstrates use of the GrueSensor QML element.
 
diff --git a/doc/src/examples/maze.qdoc b/doc/src/examples/maze.qdoc
index 3b89271b..ed2aeabc 100644
--- a/doc/src/examples/maze.qdoc
+++ b/doc/src/examples/maze.qdoc
@@ -26,32 +26,33 @@
 ****************************************************************************/
 
 /*!
-    \example sensors/maze
-    \title Maze example
+    \example QtSensors/QtSensors_maze
+    \title Qt Sensors - Maze QML Example
     \ingroup qtsensors-examples
+    \image maze.png
+
+    \section2 Maze in QML
     \brief The Maze example demonstrates the TiltSensor QML element.
-    \image maze.jpg
 
-\section1 Overview
+
     To write a QML application that will use the TiltSensor QML sensors element you need to do the following steps:
 
     Import the QtSensors 5.x declarative plugin:
 
-\snippet ../examples/sensors/maze/Maze.qml 0
+    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 0
 
     Add the Sensor QML elements into your qml file.
 
     In this example we use the TiltSensor with values based in degrees and an accuracy of 5 degree:
 
-\snippet ../examples/sensors/maze/Maze.qml 1
+    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 1
 
     Starting the sensor can be done by setting the 'enabled' property to true:
 
-\snippet ../examples/sensors/maze/Maze.qml 2
+    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 2
 
     To determine the walk direction of the mouse we use the following if -else statements:
 
-\snippet ../examples/sensors/maze/Maze.qml 3
-
+    \snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 3
 */
 
diff --git a/doc/src/examples/qmlqtsensors.qdoc b/doc/src/examples/qmlqtsensors.qdoc
index d8173306..4c509392 100644
--- a/doc/src/examples/qmlqtsensors.qdoc
+++ b/doc/src/examples/qmlqtsensors.qdoc
@@ -26,43 +26,45 @@
 ****************************************************************************/
 
 /*!
-    \example sensors/qmlqtsensors
-    \title Qt Sensors - Simple QML Example
+    \example QtSensors/QtSensors_qmlqtsensors
+    \title Qt Sensors - QML example
     \ingroup qtsensors-examples
-    \brief The Qt Sensors simple QML example demonstrates the QML sensors elements in the QtSensors 5 import.
-    \image qmlqtsensors.jpg
+    \image qmlqtsensors.png
+
+    \section2 Qt Sensors in QML
+    \brief The QML QtSensors example demonstrates the QML sensors elements in the QtSensors 5 import.
+
 
-\section1 Overview
     To write a QML application that will use the QML sensors elements in the QtSensors 5 import you need to to the following steps:
 
     Import the QtSensors 5.x declarative plugin:
 
-\snippet ../examples/sensors/qmlqtsensors/main.qml 0
+    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 0
 
     Add the Sensor QML elements into your qml file.
 
     In this example we use the TiltSensor:
 
-\snippet ../examples/sensors/qmlqtsensors/main.qml 1
+    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 1
 
     The Tilt-, AmbientLight- and the Proximity QML element sensor have the 'enabled' property in common.
     To start or stop the sensor set this property to true or false.
 
-\snippet ../examples/sensors/qmlqtsensors/main.qml 2
+    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 2
 
     Reading the data can be done for each sensor type like following:
 
     \l {QtSensors5::TiltSensor} {TiltSensor}
 
-\snippet ../examples/sensors/qmlqtsensors/main.qml 3
-\snippet ../examples/sensors/qmlqtsensors/main.qml 4
+    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 3
+    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 4
 
     \l {QtSensors5::AmbientLightSensor} {AmbientLightSensor}
 
-\snippet ../examples/sensors/qmlqtsensors/main.qml 5
+    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 5
 
     \l {QtSensors5::ProximitySensor} {ProximitySensor}
 
-\snippet ../examples/sensors/qmlqtsensors/main.qml 6
+    \snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 6
 */
 
diff --git a/doc/src/examples/sensor_explorer.qdoc b/doc/src/examples/sensor_explorer.qdoc
index d8c6a5f2..1f8e022c 100644
--- a/doc/src/examples/sensor_explorer.qdoc
+++ b/doc/src/examples/sensor_explorer.qdoc
@@ -26,60 +26,67 @@
 ****************************************************************************/
 
 /*!
-    \example sensors/sensor_explorer
-    \title Sensor Explorer example
+    \example QtSensors/QtSensors_sensor_explorer
+    \title Qt Sensors - Explorer QML example
     \ingroup qtsensors-examples
-    \brief The Sensor Explorer example demonstrates how to read the meta-data of available sensors.
-    \image sensorexplorer.jpg
-
-\section1 Overview
-    This example contains 2 projects.
-
-    A \l{Sensor Explorer QML Import} to make the sensors and their meta-data available to a QML application.
-
-    A \l{Sensor Explorer QML Application} that represents the \l{Sensor Explorer QML Import} information to the user interface.
+    \image sensorexplorer.png
 
-    \section1 Sensor Explorer QML Import
+    \section2 Sensor Explorer in QML
+    \brief The Sensor Explorer example demonstrates how to read the meta-data of available sensors.
 
-    The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML element.
 
-    This example creates the \e {Explorer 1.0} import.
+    This example is divided into two parts:
 
-    It consists of the code under the \c{import/} directory.
+    \list
+    \li A \l{Sensor Explorer QML Import}{C++ plug-in} that provides QML alternatives for QSensorExplorer, QPropertyInfo and the QSensorItem classes.
+    \li A QML Application that uses the QML alternatives to read the sensors meta-data and present it.
+    \endlist
 
-    \section1 Sensor Explorer QML Application
 
     This is a pure QML application that can be run from Qt Creator or directly using the
-    \c qmlscene binary. This app won't work if it cannot locate its related import.
+    \c qmlscene binary. You should install the other C++ plug-in before trying to run
+    this example, otherwise it will not find its dependencies.
 
     \code
     qmlscene main.qml
     \endcode
 
-\section2 Overview
     To write a QML application that will use the Explorer QML element you need to do the following steps:
 
     Import the Explorer 1.0 declarative plugin:
 
-    \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 0
+    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 0
 
     Create a SensorExplorer QML item:
 
-    \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 1
+    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 1
 
     You can retrieve a list of all available sensors using the SensorExplorer:
 
-    \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 2
+    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 2
 
     To retrieve the properties of a SensorItem use:
 
-    \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 3
+    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 3
 
     Changing a property value can be done like:
 
-    \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 4
+    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 4
+
+    Starting and stopping a sensor can be done like:
 
-    Starting and stoping a sesnor can be done like:
+    \snippet ../examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml 5
+*/
+
+/*!
+    \example QtSensors/QtSensors_sensor_explorer/import
+    \title Sensor Explorer QML Import
+
+    \section2 Sensor Explorer Declarative Plugin
+    \brief The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML element.
 
-    \snippet ../examples/sensors/sensor_explorer/qml_app/main.qml 5
+    This example creates the \e {Explorer 1.0} import.
+
+    \sa {Qt Sensors - Explorer QML example}
 */
+
diff --git a/doc/src/examples/sensorgestures.qdoc b/doc/src/examples/sensorgestures.qdoc
index 2fb1fe21..6da13c85 100644
--- a/doc/src/examples/sensorgestures.qdoc
+++ b/doc/src/examples/sensorgestures.qdoc
@@ -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/sensors/sensorgestures/mainwindow.cpp 0
+    \snippet ../examples/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/sensors/sensorgestures/mainwindow.cpp 1
+    \snippet ../examples/QtSensors/sensorgestures/mainwindow.cpp 1
 
     and later stop the detection process.
 
-    \snippet ../examples/sensors/sensorgestures/mainwindow.cpp 2
+    \snippet ../examples/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/examples/shakeit.qdoc b/doc/src/examples/shakeit.qdoc
index 409077d8..fca2a9dd 100644
--- a/doc/src/examples/shakeit.qdoc
+++ b/doc/src/examples/shakeit.qdoc
@@ -26,40 +26,39 @@
 ****************************************************************************/
 
 /*!
-    \example sensors/shakeit
-    \title ShakeIt! QML Sensor Gestures Example
+    \example QtSensors/QtSensors_shakeit
+    \title Qt Sensors - ShakeIt QML Example
     \ingroup qtsensors-examples
+    \image shakeit.png
+
+    \section2 ShakeIt in QML
     \brief The sensor gesture example demonstrates the steps for creating a QML application
      that uses sensor gestures and the included shake sensor.
-    \image shakeit.jpg
-
-    \section1 Overview
-        Writing a QML application that uses the Shake QML sensorgestures element
-     requires the following steps:
 
-        Import the Sensors Declarative module.
+    Writing a QML application that uses the Shake QML sensorgestures element requires the following steps:
 
-    \snippet ../examples/sensors/shakeit/shakeit.qml 0
+    Import the Sensors Declarative module.
 
-        Add a SensorGesture QML element.
+    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 0
 
-    \snippet ../examples/sensors/shakeit/shakeit.qml 1
+    Add a SensorGesture QML element.
 
-       In the SensorGesture element, specify which gesture to be used.
-      Note that this can be a comma separated list. Here we are only interested in one
-      gesture recognizer.
+    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 1
 
-    \snippet ../examples/sensors/shakeit/shakeit.qml 2
+    In the SensorGesture element, specify which gesture to be used.
+    Note that this can be a comma separated list. Here we are only interested in one
+    gesture recognizer.
 
-        Use the 'enabled' property to start the sensor gesture.
+    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 2
 
-    \snippet ../examples/sensors/shakeit/shakeit.qml 3
+    Use the 'enabled' property to start the sensor gesture.
 
-        Use the onDetected signal to do stuff.
+    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 3
 
-    \snippet ../examples/sensors/shakeit/shakeit.qml 4
+    Use the onDetected signal to do stuff.
 
-       There are additional gestures to shake which are supported:
-           whip, twistRight, hover, cover, turnover and pickup.
+    \snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 4
 
+    There are additional gestures to shake which are supported:
+    whip, twistRight, hover, cover, turnover and pickup.
 */
diff --git a/doc/src/images/maze.jpg b/doc/src/images/maze.jpg
deleted file mode 100644
index 1d6b9ccc..00000000
--- a/doc/src/images/maze.jpg
+++ /dev/null
diff --git a/doc/src/images/maze.png b/doc/src/images/maze.png
new file mode 100644
index 00000000..f3ad8de4
--- /dev/null
+++ b/doc/src/images/maze.png
diff --git a/doc/src/images/qmlqtsensors.jpg b/doc/src/images/qmlqtsensors.jpg
deleted file mode 100644
index 7154362f..00000000
--- a/doc/src/images/qmlqtsensors.jpg
+++ /dev/null
diff --git a/doc/src/images/qmlqtsensors.png b/doc/src/images/qmlqtsensors.png
new file mode 100644
index 00000000..0a54b653
--- /dev/null
+++ b/doc/src/images/qmlqtsensors.png
diff --git a/doc/src/images/sensorexplorer.jpg b/doc/src/images/sensorexplorer.jpg
deleted file mode 100644
index 81515ca0..00000000
--- a/doc/src/images/sensorexplorer.jpg
+++ /dev/null
diff --git a/doc/src/images/sensorexplorer.png b/doc/src/images/sensorexplorer.png
new file mode 100644
index 00000000..e9cda7ac
--- /dev/null
+++ b/doc/src/images/sensorexplorer.png
diff --git a/doc/src/images/shakeit.jpg b/doc/src/images/shakeit.jpg
deleted file mode 100644
index 8df4b44d..00000000
--- a/doc/src/images/shakeit.jpg
+++ /dev/null
diff --git a/doc/src/images/shakeit.png b/doc/src/images/shakeit.png
new file mode 100644
index 00000000..5ca1b58c
--- /dev/null
+++ b/doc/src/images/shakeit.png
diff --git a/doc/src/imports/qtsensors5.qdoc b/doc/src/imports/qtsensors5.qdoc
index fc172aed..c3e6a2a0 100644
--- a/doc/src/imports/qtsensors5.qdoc
+++ b/doc/src/imports/qtsensors5.qdoc
@@ -55,7 +55,7 @@
 
     The emulator supports simulating the Ambient Light, Orientation, Compass and Proximity sensors.
 
-    The \l {Qt Sensors - Simple QML Example} contains code for using the the \l TiltSensor, \l AmbientLightSensor
+    The \l {Qt Sensors - QML example} contains code for using the the \l TiltSensor, \l AmbientLightSensor
     and ProximitySensor elements.
 
     \section1 QML Elements
diff --git a/doc/src/qmlsensorgtestures.qdoc b/doc/src/qmlsensorgtestures.qdoc
index 317105a7..a384d266 100644
--- a/doc/src/qmlsensorgtestures.qdoc
+++ b/doc/src/qmlsensorgtestures.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sensors/qmlsensorgestures/qml_app
+    \example QtSensors/qmlsensorgestures/qml_app
     \title SensorGesture QML Element example
     \ingroup qtsensors-examples
 
@@ -37,27 +37,27 @@
 
     Import the QtSensors 5.x declarative plugin:
 
-\snippet ../examples/sensors/qmlsensorgestures/qml_app/GestureView.qml 0
+\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 0
 
    Add the SensorGesture QML element into your qml file.
 
-\snippet ../examples/sensors/qmlsensorgestures/qml_app/GestureView.qml 1
+\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/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/sensors/qmlsensorgestures/qml_app/GestureView.qml 2
+\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml 2
 
    By using this alias property you define which gestures should be used:
 
-\snippet ../examples/sensors/qmlsensorgestures/qml_app/Gesture.qml 3
+\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml 3
 
    A list of all available gestures can be created by calling the 'availableGestures' property:
 
-\snippet ../examples/sensors/qmlsensorgestures/qml_app/GestureList.qml 4
+\snippet ../examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml 4
 
-\sa {ShakeIt! QML Sensor Gestures Example}
+\sa {Qt Sensors - ShakeIt QML Example}
 \sa {Qt Sensor Gestures}
 */
 
diff --git a/doc/src/qtsensors-cpp.qdoc b/doc/src/qtsensors-cpp.qdoc
index 3df97f94..6cdd6a4b 100644
--- a/doc/src/qtsensors-cpp.qdoc
+++ b/doc/src/qtsensors-cpp.qdoc
@@ -101,7 +101,7 @@ This code does not require any compile-time links to \l QAccelerometer or
 
 \snippet snippets/sensors/start.cpp Starting a sensor
 
-You can discover all of this information at runtime too. The sensor_explorer example
+You can discover all of this information at runtime too. The QtSensors_sensor_explorer example
 shows you information about available sensors.
 
 \section1 Front end, back end
diff --git a/examples/sensors/sensors.pro b/examples/QtSensors/QtSensors.pro
index 807203f2..3e649918 100644
--- a/examples/sensors/sensors.pro
+++ b/examples/QtSensors/QtSensors.pro
@@ -5,11 +5,11 @@ SUBDIRS += \
     accelbubble \
     cubehouse \
     grue \
-    maze \
-    qmlqtsensors \
     qmlsensorgestures \
-    sensor_explorer \
-    shakeit
+    QtSensors_maze \
+    QtSensors_qmlqtsensors \
+    QtSensors_sensor_explorer \
+    QtSensors_shakeit
 
 !isEmpty(QT.widgets.name):SUBDIRS += \
     sensorgestures
diff --git a/examples/sensors/maze/Congratulation.qml b/examples/QtSensors/QtSensors_maze/Congratulation.qml
index b08ef1ae..a8d6c41c 100644
--- a/examples/sensors/maze/Congratulation.qml
+++ b/examples/QtSensors/QtSensors_maze/Congratulation.qml
@@ -56,6 +56,6 @@ Item {
         id: img
         anchors.fill: parent
         visible:  true
-        source: "images/congratulations.gif"
+        source: "content/congratulations.gif"
     }
 }
diff --git a/examples/sensors/maze/LabyrinthSquare.qml b/examples/QtSensors/QtSensors_maze/LabyrinthSquare.qml
index 27ca84da..e5aacfcd 100644
--- a/examples/sensors/maze/LabyrinthSquare.qml
+++ b/examples/QtSensors/QtSensors_maze/LabyrinthSquare.qml
@@ -65,16 +65,16 @@ Rectangle {
     function updateImage()
     {
         if (sq.val == -1)
-            sq.picture.source = "images/start.png";
+            sq.picture.source = "content/start.png";
         else if (sq.val == 3)
-            sq.picture.source = "images/cheese.png";
+            sq.picture.source = "content/cheese.png";
         else if (sq.val == 4){
-            sq.picture.source = "images/cheeseeating.gif";
+            sq.picture.source = "content/cheeseeating.gif";
             sq.picture.playing = true;
         }
         else if (sq.val == 1)
-            sq.picture.source = "images/01.png";
+            sq.picture.source = "content/01.png";
         else
-            sq.picture.source = "images/00.png";
+            sq.picture.source = "content/00.png";
     }
 }
diff --git a/examples/sensors/maze/Mouse.qml b/examples/QtSensors/QtSensors_maze/Mouse.qml
index 9786d96d..55dac18d 100644
--- a/examples/sensors/maze/Mouse.qml
+++ b/examples/QtSensors/QtSensors_maze/Mouse.qml
@@ -63,36 +63,36 @@ Item {
     states: [
         State {
            name: "up"
-           PropertyChanges { target: img; source: "images/mouse_up.gif" }
+           PropertyChanges { target: img; source: "content/mouse_up.gif" }
         },
         State {
            name: "down"
-           PropertyChanges { target: img; source: "images/mouse_down.gif" }
+           PropertyChanges { target: img; source: "content/mouse_down.gif" }
         },
         State {
            name: "left"
-           PropertyChanges { target: img; source: "images/mouse_left.gif" }
+           PropertyChanges { target: img; source: "content/mouse_left.gif" }
         },
         State {
            name: "right"
-           PropertyChanges { target: img; source: "images/mouse_right.gif" }
+           PropertyChanges { target: img; source: "content/mouse_right.gif" }
         },
 
         State {
            name: "rightup"
-           PropertyChanges { target: img; source: "images/mouse_rightup.gif" }
+           PropertyChanges { target: img; source: "content/mouse_rightup.gif" }
         },
         State {
            name: "rightdown"
-           PropertyChanges { target: img; source: "images/mouse_rightdown.gif" }
+           PropertyChanges { target: img; source: "content/mouse_rightdown.gif" }
         },
         State {
            name: "leftup"
-           PropertyChanges { target: img; source: "images/mouse_leftup.gif" }
+           PropertyChanges { target: img; source: "content/mouse_leftup.gif" }
         },
         State {
            name: "leftdown"
-           PropertyChanges { target: img; source: "images/mouse_leftdown.gif" }
+           PropertyChanges { target: img; source: "content/mouse_leftdown.gif" }
         }
 
     ]
diff --git a/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro b/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro
new file mode 100644
index 00000000..a15e39ef
--- /dev/null
+++ b/examples/QtSensors/QtSensors_maze/QtSensors_maze.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS = qml.pro
+
diff --git a/examples/sensors/maze/Maze.qml b/examples/QtSensors/QtSensors_maze/QtSensors_maze.qml
index f52c00f2..f52c00f2 100644
--- a/examples/sensors/maze/Maze.qml
+++ b/examples/QtSensors/QtSensors_maze/QtSensors_maze.qml
diff --git a/examples/sensors/maze/components/ApplicationWindow.qml b/examples/QtSensors/QtSensors_maze/components/ApplicationWindow.qml
index cab5e94c..cab5e94c 100644
--- a/examples/sensors/maze/components/ApplicationWindow.qml
+++ b/examples/QtSensors/QtSensors_maze/components/ApplicationWindow.qml
diff --git a/examples/sensors/maze/components/Button.qml b/examples/QtSensors/QtSensors_maze/components/Button.qml
index 537a8bce..537a8bce 100644
--- a/examples/sensors/maze/components/Button.qml
+++ b/examples/QtSensors/QtSensors_maze/components/Button.qml
diff --git a/examples/sensors/maze/components/images/button_background_disabled.png b/examples/QtSensors/QtSensors_maze/components/images/button_background_disabled.png
index 62a00b9a..62a00b9a 100644
--- a/examples/sensors/maze/components/images/button_background_disabled.png
+++ b/examples/QtSensors/QtSensors_maze/components/images/button_background_disabled.png
diff --git a/examples/sensors/maze/components/images/button_background_normal.png b/examples/QtSensors/QtSensors_maze/components/images/button_background_normal.png
index 1fecad5b..1fecad5b 100644
--- a/examples/sensors/maze/components/images/button_background_normal.png
+++ b/examples/QtSensors/QtSensors_maze/components/images/button_background_normal.png
diff --git a/examples/sensors/maze/components/images/button_background_pressed.png b/examples/QtSensors/QtSensors_maze/components/images/button_background_pressed.png
index 149529e1..149529e1 100644
--- a/examples/sensors/maze/components/images/button_background_pressed.png
+++ b/examples/QtSensors/QtSensors_maze/components/images/button_background_pressed.png
diff --git a/examples/sensors/maze/images/00.png b/examples/QtSensors/QtSensors_maze/content/00.png
index ab29a622..ab29a622 100644
--- a/examples/sensors/maze/images/00.png
+++ b/examples/QtSensors/QtSensors_maze/content/00.png
diff --git a/examples/sensors/maze/images/01.png b/examples/QtSensors/QtSensors_maze/content/01.png
index 0e70d1b2..0e70d1b2 100644
--- a/examples/sensors/maze/images/01.png
+++ b/examples/QtSensors/QtSensors_maze/content/01.png
diff --git a/examples/sensors/maze/images/cheese.png b/examples/QtSensors/QtSensors_maze/content/cheese.png
index ecef4503..ecef4503 100644
--- a/examples/sensors/maze/images/cheese.png
+++ b/examples/QtSensors/QtSensors_maze/content/cheese.png
diff --git a/examples/sensors/maze/images/cheeseeating.gif b/examples/QtSensors/QtSensors_maze/content/cheeseeating.gif
index 6b2cb47f..6b2cb47f 100644
--- a/examples/sensors/maze/images/cheeseeating.gif
+++ b/examples/QtSensors/QtSensors_maze/content/cheeseeating.gif
diff --git a/examples/sensors/maze/images/congratulations.gif b/examples/QtSensors/QtSensors_maze/content/congratulations.gif
index 70204176..70204176 100644
--- a/examples/sensors/maze/images/congratulations.gif
+++ b/examples/QtSensors/QtSensors_maze/content/congratulations.gif
diff --git a/examples/sensors/maze/images/mouse_down.gif b/examples/QtSensors/QtSensors_maze/content/mouse_down.gif
index 5491c18f..5491c18f 100644
--- a/examples/sensors/maze/images/mouse_down.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_down.gif
diff --git a/examples/sensors/maze/images/mouse_left.gif b/examples/QtSensors/QtSensors_maze/content/mouse_left.gif
index 265d2bab..265d2bab 100644
--- a/examples/sensors/maze/images/mouse_left.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_left.gif
diff --git a/examples/sensors/maze/images/mouse_leftdown.gif b/examples/QtSensors/QtSensors_maze/content/mouse_leftdown.gif
index bdcd708f..bdcd708f 100644
--- a/examples/sensors/maze/images/mouse_leftdown.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_leftdown.gif
diff --git a/examples/sensors/maze/images/mouse_leftup.gif b/examples/QtSensors/QtSensors_maze/content/mouse_leftup.gif
index a8b1e8f6..a8b1e8f6 100644
--- a/examples/sensors/maze/images/mouse_leftup.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_leftup.gif
diff --git a/examples/sensors/maze/images/mouse_right.gif b/examples/QtSensors/QtSensors_maze/content/mouse_right.gif
index a95d02cc..a95d02cc 100644
--- a/examples/sensors/maze/images/mouse_right.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_right.gif
diff --git a/examples/sensors/maze/images/mouse_rightdown.gif b/examples/QtSensors/QtSensors_maze/content/mouse_rightdown.gif
index 00bc3e18..00bc3e18 100644
--- a/examples/sensors/maze/images/mouse_rightdown.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_rightdown.gif
diff --git a/examples/sensors/maze/images/mouse_rightup.gif b/examples/QtSensors/QtSensors_maze/content/mouse_rightup.gif
index e0153eb4..e0153eb4 100644
--- a/examples/sensors/maze/images/mouse_rightup.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_rightup.gif
diff --git a/examples/sensors/maze/images/mouse_up.gif b/examples/QtSensors/QtSensors_maze/content/mouse_up.gif
index 19220ebe..19220ebe 100644
--- a/examples/sensors/maze/images/mouse_up.gif
+++ b/examples/QtSensors/QtSensors_maze/content/mouse_up.gif
diff --git a/examples/sensors/maze/images/start.png b/examples/QtSensors/QtSensors_maze/content/start.png
index 698c0b1c..698c0b1c 100644
--- a/examples/sensors/maze/images/start.png
+++ b/examples/QtSensors/QtSensors_maze/content/start.png
diff --git a/examples/sensors/maze/icon.png b/examples/QtSensors/QtSensors_maze/icon.png
index 1e7ff8d8..1e7ff8d8 100644
--- a/examples/sensors/maze/icon.png
+++ b/examples/QtSensors/QtSensors_maze/icon.png
diff --git a/examples/QtSensors/QtSensors_maze/info.json b/examples/QtSensors/QtSensors_maze/info.json
new file mode 100644
index 00000000..8e2ad1a8
--- /dev/null
+++ b/examples/QtSensors/QtSensors_maze/info.json
@@ -0,0 +1,15 @@
+{
+    "info-version": "1.0",
+    "dict": {
+        "category": "application",
+        "runtime": "qml",
+        "displayName": {
+            "en_US": "Maze"
+        },
+        "subcategory": "utility",
+        "main": "QtSensors_maze.qml",
+        "version": "1.0.0",
+        "identifier": "com.nokia.mt.maze",
+        "author": "Qt"
+    }
+}
diff --git a/examples/sensors/maze/lib.js b/examples/QtSensors/QtSensors_maze/lib.js
index fccce18f..fccce18f 100644
--- a/examples/sensors/maze/lib.js
+++ b/examples/QtSensors/QtSensors_maze/lib.js
diff --git a/examples/sensors/maze/maze.pro b/examples/QtSensors/QtSensors_maze/qml.pro
index cb3b9aaa..765b9d0d 100644
--- a/examples/sensors/maze/maze.pro
+++ b/examples/QtSensors/QtSensors_maze/qml.pro
@@ -1,15 +1,15 @@
 TEMPLATE = aux
 
 app.files = \
-    Congratulation.qml \
-    Maze.qml \
     components \
-    images \
-    lib.js \
+    info.json \
+    Congratulation.qml \
     LabyrinthSquare.qml \
+    lib.js \
+    QtSensors_maze.qml \
     Mouse.qml \
     icon.png \
-    info.json
+    content
 
 MT_SYSROOT=$$(MT_SYSROOT)
 !isEmpty(MT_SYSROOT):EXAMPLES_PREFIX=/opt/mt/applications
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro
new file mode 100644
index 00000000..a15e39ef
--- /dev/null
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS = qml.pro
+
diff --git a/examples/sensors/qmlqtsensors/main.qml b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml
index 44be63aa..44be63aa 100644
--- a/examples/sensors/qmlqtsensors/main.qml
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml
diff --git a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml b/examples/QtSensors/QtSensors_qmlqtsensors/components/ApplicationWindow.qml
index cab5e94c..cab5e94c 100644
--- a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/ApplicationWindow.qml
diff --git a/examples/sensors/qmlqtsensors/components/Button.qml b/examples/QtSensors/QtSensors_qmlqtsensors/components/Button.qml
index 537a8bce..537a8bce 100644
--- a/examples/sensors/qmlqtsensors/components/Button.qml
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/Button.qml
diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_disabled.png
index 62a00b9a..62a00b9a 100644
--- a/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_disabled.png
diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_normal.png b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_normal.png
index 1fecad5b..1fecad5b 100644
--- a/examples/sensors/qmlqtsensors/components/images/button_background_normal.png
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_normal.png
diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_pressed.png
index 149529e1..149529e1 100644
--- a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/components/images/button_background_pressed.png
diff --git a/examples/sensors/qmlqtsensors/icon.png b/examples/QtSensors/QtSensors_qmlqtsensors/icon.png
index d3243c5b..d3243c5b 100644
--- a/examples/sensors/qmlqtsensors/icon.png
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/icon.png
diff --git a/examples/QtSensors/QtSensors_qmlqtsensors/info.json b/examples/QtSensors/QtSensors_qmlqtsensors/info.json
new file mode 100644
index 00000000..e5484028
--- /dev/null
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/info.json
@@ -0,0 +1,15 @@
+{
+    "info-version": "1.0",
+    "dict": {
+        "category": "application",
+        "runtime": "qml",
+        "displayName": {
+            "en_US": "QML QtSensors"
+        },
+        "subcategory": "utility",
+        "main": "QtSensors_qmlqtsensors.qml",
+        "version": "1.0.0",
+        "identifier": "com.nokia.mt.qmlqtsensors",
+        "author": "Qt"
+    }
+}
diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro
index 9ecebd9a..e1ec8724 100644
--- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro
+++ b/examples/QtSensors/QtSensors_qmlqtsensors/qml.pro
@@ -2,7 +2,7 @@ TEMPLATE = aux
 
 app.files = \
     info.json \
-    main.qml \
+    QtSensors_qmlqtsensors.qml \
     icon.png \
     components
 
diff --git a/examples/sensors/sensor_explorer/qml_app/PropertyList.qml b/examples/QtSensors/QtSensors_sensor_explorer/PropertyList.qml
index ba956fba..846c4cca 100644
--- a/examples/sensors/sensor_explorer/qml_app/PropertyList.qml
+++ b/examples/QtSensors/QtSensors_sensor_explorer/PropertyList.qml
@@ -93,7 +93,7 @@ Rectangle {
                 Image {
                     id: backgroundImage
                     anchors.fill: parent
-                    source: "images/listitem_select.png"
+                    source: "content/listitem_select.png"
                     visible: itemList.currentIndex === index
                 }
 
diff --git a/examples/sensors/sensor_explorer/sensor_explorer.pro b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.pro
index 759e9307..85ba45ef 100644
--- a/examples/sensors/sensor_explorer/sensor_explorer.pro
+++ b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
+CONFIG += ordered
 
 SUBDIRS = \
     import \
-    qml_app
+    qml.pro
diff --git a/examples/sensors/sensor_explorer/qml_app/main.qml b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml
index 88641604..88641604 100644
--- a/examples/sensors/sensor_explorer/qml_app/main.qml
+++ b/examples/QtSensors/QtSensors_sensor_explorer/QtSensors_sensor_explorer.qml
diff --git a/examples/sensors/sensor_explorer/qml_app/SensorList.qml b/examples/QtSensors/QtSensors_sensor_explorer/SensorList.qml
index f95572b3..da157378 100644
--- a/examples/sensors/sensor_explorer/qml_app/SensorList.qml
+++ b/examples/QtSensors/QtSensors_sensor_explorer/SensorList.qml
@@ -118,7 +118,7 @@ Rectangle {
                 Image {
                     id: backgroundImage
                     anchors.fill: parent
-                    source: "images/listitem_select.png"
+                    source: "content/listitem_select.png"
                     visible: itemList.currentIndex === index
                 }
 
diff --git a/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml b/examples/QtSensors/QtSensors_sensor_explorer/components/ApplicationWindow.qml
index cab5e94c..cab5e94c 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/ApplicationWindow.qml
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/ApplicationWindow.qml
diff --git a/examples/sensors/sensor_explorer/qml_app/components/Button.qml b/examples/QtSensors/QtSensors_sensor_explorer/components/Button.qml
index 537a8bce..537a8bce 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/Button.qml
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/Button.qml
diff --git a/examples/sensors/sensor_explorer/qml_app/components/TextField.qml b/examples/QtSensors/QtSensors_sensor_explorer/components/TextField.qml
index c1feaf21..c1feaf21 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/TextField.qml
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/TextField.qml
diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_disabled.png
index 62a00b9a..62a00b9a 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_disabled.png
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_disabled.png
diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_normal.png
index 1fecad5b..1fecad5b 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_normal.png
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_normal.png
diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_pressed.png
index 149529e1..149529e1 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/images/button_background_pressed.png
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/button_background_pressed.png
diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_disabled.png
index 98bc601f..98bc601f 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_disabled.png
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_disabled.png
diff --git a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_normal.png
index b90b50cd..b90b50cd 100644
--- a/examples/sensors/sensor_explorer/qml_app/components/images/textfield_background_normal.png
+++ b/examples/QtSensors/QtSensors_sensor_explorer/components/images/textfield_background_normal.png
diff --git a/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png b/examples/QtSensors/QtSensors_sensor_explorer/content/listitem_select.png
index def234f1..def234f1 100644
--- a/examples/sensors/sensor_explorer/qml_app/images/listitem_select.png
+++ b/examples/QtSensors/QtSensors_sensor_explorer/content/listitem_select.png
diff --git a/examples/sensors/sensor_explorer/qml_app/icon.png b/examples/QtSensors/QtSensors_sensor_explorer/icon.png
index c48b6095..c48b6095 100644
--- a/examples/sensors/sensor_explorer/qml_app/icon.png
+++ b/examples/QtSensors/QtSensors_sensor_explorer/icon.png
diff --git a/examples/sensors/sensor_explorer/import/explorer.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp
index 0c296192..0c296192 100644
--- a/examples/sensors/sensor_explorer/import/explorer.cpp
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.cpp
diff --git a/examples/sensors/sensor_explorer/import/explorer.h b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.h
index f8806b6f..eaac8104 100644
--- a/examples/sensors/sensor_explorer/import/explorer.h
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/explorer.h
@@ -42,7 +42,7 @@
 #ifndef QSEONSOREXPLORER_H
 #define QSEONSOREXPLORER_H
 
-#include <QtQml/qqml.h>
+#include <QtQml/QtQml>
 #include <QtQml/QQmlListProperty>
 #include "sensoritem.h"
 
diff --git a/examples/sensors/sensor_explorer/import/import.pro b/examples/QtSensors/QtSensors_sensor_explorer/import/import.pro
index 1f97b67e..1f97b67e 100644
--- a/examples/sensors/sensor_explorer/import/import.pro
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/import.pro
diff --git a/examples/sensors/sensor_explorer/import/main.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/main.cpp
index e0b3ad99..80e2510d 100644
--- a/examples/sensors/sensor_explorer/import/main.cpp
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtQml/qqmlextensionplugin.h>
-#include <QtQml/qqml.h>
+#include <QtQml/QQmlExtensionPlugin>
+#include <QtQml/QtQml>
 #include "explorer.h"
 #include <QtCore/QDebug>
 
diff --git a/examples/sensors/grue/import/plugin.json b/examples/QtSensors/QtSensors_sensor_explorer/import/plugin.json
index 0967ef42..0967ef42 100644
--- a/examples/sensors/grue/import/plugin.json
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/plugin.json
diff --git a/examples/sensors/sensor_explorer/import/propertyinfo.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp
index 0360e0d2..0360e0d2 100644
--- a/examples/sensors/sensor_explorer/import/propertyinfo.cpp
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.cpp
diff --git a/examples/sensors/sensor_explorer/import/propertyinfo.h b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.h
index dd8eecf0..b3ebe4c0 100644
--- a/examples/sensors/sensor_explorer/import/propertyinfo.h
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/propertyinfo.h
@@ -42,7 +42,7 @@
 #ifndef QPROPERTYINFO_H
 #define QPROPERTYINFO_H
 
-#include <QtQml/qqml.h>
+#include <QtQml/QtQml>
 #include <QtCore/QString>
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/sensors/sensor_explorer/import/qmldir b/examples/QtSensors/QtSensors_sensor_explorer/import/qmldir
index 60d8f883..60d8f883 100644
--- a/examples/sensors/sensor_explorer/import/qmldir
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/qmldir
diff --git a/examples/sensors/sensor_explorer/import/sensoritem.cpp b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp
index 68dccf46..68dccf46 100644
--- a/examples/sensors/sensor_explorer/import/sensoritem.cpp
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.cpp
diff --git a/examples/sensors/sensor_explorer/import/sensoritem.h b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.h
index 09313676..b937687f 100644
--- a/examples/sensors/sensor_explorer/import/sensoritem.h
+++ b/examples/QtSensors/QtSensors_sensor_explorer/import/sensoritem.h
@@ -42,7 +42,7 @@
 #ifndef QSENSORITEM_H
 #define QSENSORITEM_H
 
-#include <QtQml/qqml.h>
+#include <QtQml/QtQml>
 #include <QtCore/QString>
 #include "propertyinfo.h"
 
diff --git a/examples/QtSensors/QtSensors_sensor_explorer/info.json b/examples/QtSensors/QtSensors_sensor_explorer/info.json
new file mode 100644
index 00000000..18f3e8d5
--- /dev/null
+++ b/examples/QtSensors/QtSensors_sensor_explorer/info.json
@@ -0,0 +1,15 @@
+{
+    "info-version": "1.0",
+    "dict": {
+        "category": "application",
+        "runtime": "qml",
+        "displayName": {
+            "en_US": "Sensors Explorer"
+        },
+        "subcategory": "utility",
+        "main": "QtSensors_sensor_explorer.qml",
+        "version": "1.0.0",
+        "identifier": "com.nokia.mt.sensorexplorer",
+        "author": "Qt"
+    }
+}
diff --git a/examples/sensors/sensor_explorer/qml_app/qml_app.pro b/examples/QtSensors/QtSensors_sensor_explorer/qml.pro
index ded6634f..bc4f8588 100644
--- a/examples/sensors/sensor_explorer/qml_app/qml_app.pro
+++ b/examples/QtSensors/QtSensors_sensor_explorer/qml.pro
@@ -1,13 +1,13 @@
 TEMPLATE = aux
 
 app.files = \
-    PropertyList.qml \
-    components \
-    images \
     info.json \
+    QtSensors_sensor_explorer.qml \
+    PropertyList.qml \
     SensorList.qml \
     icon.png \
-    main.qml
+    components \
+    content
 
 MT_SYSROOT=$$(MT_SYSROOT)
 !isEmpty(MT_SYSROOT):EXAMPLES_PREFIX=/opt/mt/applications
diff --git a/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro
new file mode 100644
index 00000000..6dc685b9
--- /dev/null
+++ b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS = qml.pro
diff --git a/examples/sensors/shakeit/shakeit.qml b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml
index e2a2254c..50ef8deb 100644
--- a/examples/sensors/shakeit/shakeit.qml
+++ b/examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml
@@ -71,19 +71,19 @@ Rectangle {
     Image {
         id: triangle1
         smooth: true
-        source: "images/triangle.png"
+        source: "content/triangle.png"
         x: parent.width / 2 - (triangle1.width / 2)
         y: parent.height / 2 - (triangle1.height);
         Behavior on x { SmoothedAnimation { velocity: 200 } }
         Behavior on y { SmoothedAnimation { velocity: 200 } }
         transform: Rotation {
              id: myRot
-         }
+        }
     }
     Image {
         id: triangle2
         smooth: true
-        source: "images/triangle2.png"
+        source: "content/triangle2.png"
         x: parent.width / 2 - (triangle1.width + triangle2.width / 2)
         y: parent.height / 2 + (triangle2.height / 2);
         Behavior on x { SmoothedAnimation { velocity: 200 } }
@@ -92,7 +92,7 @@ Rectangle {
     Image {
         id: triangle3
         smooth: true
-        source: "images/triangle3.png"
+        source: "content/triangle3.png"
         x: parent.width / 2 + (triangle1.width / 2)
         y: parent.height / 2 + (triangle3.height / 2);
 
diff --git a/examples/sensors/shakeit/audio/loopy2a_mono.wav b/examples/QtSensors/QtSensors_shakeit/audio/loopy2a_mono.wav
index 7d76cb65..7d76cb65 100644
--- a/examples/sensors/shakeit/audio/loopy2a_mono.wav
+++ b/examples/QtSensors/QtSensors_shakeit/audio/loopy2a_mono.wav
diff --git a/examples/sensors/shakeit/audio/phone.wav b/examples/QtSensors/QtSensors_shakeit/audio/phone.wav
index 884e9ac2..884e9ac2 100644
--- a/examples/sensors/shakeit/audio/phone.wav
+++ b/examples/QtSensors/QtSensors_shakeit/audio/phone.wav
diff --git a/examples/sensors/shakeit/images/triangle.png b/examples/QtSensors/QtSensors_shakeit/content/triangle.png
index f366537e..f366537e 100644
--- a/examples/sensors/shakeit/images/triangle.png
+++ b/examples/QtSensors/QtSensors_shakeit/content/triangle.png
diff --git a/examples/sensors/shakeit/images/triangle2.png b/examples/QtSensors/QtSensors_shakeit/content/triangle2.png
index 9318d5a3..9318d5a3 100644
--- a/examples/sensors/shakeit/images/triangle2.png
+++ b/examples/QtSensors/QtSensors_shakeit/content/triangle2.png
diff --git a/examples/sensors/shakeit/images/triangle3.png b/examples/QtSensors/QtSensors_shakeit/content/triangle3.png
index 4cc5ccda..4cc5ccda 100644
--- a/examples/sensors/shakeit/images/triangle3.png
+++ b/examples/QtSensors/QtSensors_shakeit/content/triangle3.png
diff --git a/examples/sensors/shakeit/icon.png b/examples/QtSensors/QtSensors_shakeit/icon.png
index d8f21546..d8f21546 100644
--- a/examples/sensors/shakeit/icon.png
+++ b/examples/QtSensors/QtSensors_shakeit/icon.png
diff --git a/examples/QtSensors/QtSensors_shakeit/info.json b/examples/QtSensors/QtSensors_shakeit/info.json
new file mode 100644
index 00000000..a98f6f2b
--- /dev/null
+++ b/examples/QtSensors/QtSensors_shakeit/info.json
@@ -0,0 +1,14 @@
+{
+    "info-version": "1.0",
+    "dict": {
+        "displayName": {
+            "en_US": "ShakeIt!"
+        },
+        "identifier": "com.nokia.mt.shakeit",
+        "runtime": "qml",
+        "main": "QtSensors_shakeit.qml",
+        "version": "1.0.0",
+        "category": "application",
+        "subcategory": "utility"
+    }
+}
diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/QtSensors/QtSensors_shakeit/qml.pro
index 5c715418..a56249de 100644
--- a/examples/sensors/shakeit/shakeit.pro
+++ b/examples/QtSensors/QtSensors_shakeit/qml.pro
@@ -2,10 +2,10 @@ TEMPLATE = aux
 
 app.files = \
     info.json \
-    shakeit.qml \
+    QtSensors_shakeit.qml \
     icon.png \
     audio \
-    images
+    content
 
 MT_SYSROOT=$$(MT_SYSROOT)
 !isEmpty(MT_SYSROOT):EXAMPLES_PREFIX=/opt/mt/applications
diff --git a/examples/sensors/accel/accel.pro b/examples/QtSensors/accel/accel.pro
index 86303eca..86303eca 100644
--- a/examples/sensors/accel/accel.pro
+++ b/examples/QtSensors/accel/accel.pro
diff --git a/examples/sensors/accel/main.cpp b/examples/QtSensors/accel/main.cpp
index 012c8c61..012c8c61 100644
--- a/examples/sensors/accel/main.cpp
+++ b/examples/QtSensors/accel/main.cpp
diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/QtSensors/accelbubble/accelbubble.pro
index feeec685..feeec685 100644
--- a/examples/sensors/accelbubble/accelbubble.pro
+++ b/examples/QtSensors/accelbubble/accelbubble.pro
diff --git a/examples/sensors/accelbubble/icon.png b/examples/QtSensors/accelbubble/icon.png
index d74f1111..d74f1111 100644
--- a/examples/sensors/accelbubble/icon.png
+++ b/examples/QtSensors/accelbubble/icon.png
diff --git a/examples/sensors/accelbubble/images/Bluebubble2.png b/examples/QtSensors/accelbubble/images/Bluebubble2.png
index f96126eb..f96126eb 100644
--- a/examples/sensors/accelbubble/images/Bluebubble2.png
+++ b/examples/QtSensors/accelbubble/images/Bluebubble2.png
diff --git a/examples/sensors/accelbubble/info.json b/examples/QtSensors/accelbubble/info.json
index 9a2ed709..9a2ed709 100644
--- a/examples/sensors/accelbubble/info.json
+++ b/examples/QtSensors/accelbubble/info.json
diff --git a/examples/sensors/accelbubble/main.qml b/examples/QtSensors/accelbubble/main.qml
index 487ee3f5..487ee3f5 100644
--- a/examples/sensors/accelbubble/main.qml
+++ b/examples/QtSensors/accelbubble/main.qml
diff --git a/examples/sensors/cubehouse/Cube.qml b/examples/QtSensors/cubehouse/Cube.qml
index c174b8fe..c174b8fe 100644
--- a/examples/sensors/cubehouse/Cube.qml
+++ b/examples/QtSensors/cubehouse/Cube.qml
diff --git a/examples/sensors/cubehouse/Cubehouse.qml b/examples/QtSensors/cubehouse/Cubehouse.qml
index 5a1b91f8..5a1b91f8 100644
--- a/examples/sensors/cubehouse/Cubehouse.qml
+++ b/examples/QtSensors/cubehouse/Cubehouse.qml
diff --git a/examples/sensors/cubehouse/Room.qml b/examples/QtSensors/cubehouse/Room.qml
index 43af3b12..43af3b12 100644
--- a/examples/sensors/cubehouse/Room.qml
+++ b/examples/QtSensors/cubehouse/Room.qml
diff --git a/examples/sensors/cubehouse/Table.qml b/examples/QtSensors/cubehouse/Table.qml
index 683d28de..683d28de 100644
--- a/examples/sensors/cubehouse/Table.qml
+++ b/examples/QtSensors/cubehouse/Table.qml
diff --git a/examples/sensors/cubehouse/cubehouse.pro b/examples/QtSensors/cubehouse/cubehouse.pro
index 075ec4ef..075ec4ef 100644
--- a/examples/sensors/cubehouse/cubehouse.pro
+++ b/examples/QtSensors/cubehouse/cubehouse.pro
diff --git a/examples/sensors/cubehouse/icon.png b/examples/QtSensors/cubehouse/icon.png
index 193ad561..193ad561 100644
--- a/examples/sensors/cubehouse/icon.png
+++ b/examples/QtSensors/cubehouse/icon.png
diff --git a/examples/sensors/cubehouse/images/ground.jpg b/examples/QtSensors/cubehouse/images/ground.jpg
index 2664b99e..2664b99e 100644
--- a/examples/sensors/cubehouse/images/ground.jpg
+++ b/examples/QtSensors/cubehouse/images/ground.jpg
diff --git a/examples/sensors/cubehouse/images/qtlogo.png b/examples/QtSensors/cubehouse/images/qtlogo.png
index 7d3e97eb..7d3e97eb 100644
--- a/examples/sensors/cubehouse/images/qtlogo.png
+++ b/examples/QtSensors/cubehouse/images/qtlogo.png
diff --git a/examples/sensors/cubehouse/images/roof.jpg b/examples/QtSensors/cubehouse/images/roof.jpg
index 53a35d64..53a35d64 100644
--- a/examples/sensors/cubehouse/images/roof.jpg
+++ b/examples/QtSensors/cubehouse/images/roof.jpg
diff --git a/examples/sensors/cubehouse/images/wall.jpg b/examples/QtSensors/cubehouse/images/wall.jpg
index 7c56e23f..7c56e23f 100644
--- a/examples/sensors/cubehouse/images/wall.jpg
+++ b/examples/QtSensors/cubehouse/images/wall.jpg
diff --git a/examples/sensors/cubehouse/info.json b/examples/QtSensors/cubehouse/info.json
index 39e39a8b..39e39a8b 100644
--- a/examples/sensors/cubehouse/info.json
+++ b/examples/QtSensors/cubehouse/info.json
diff --git a/examples/sensors/cubehouse/mesh/table.3ds b/examples/QtSensors/cubehouse/mesh/table.3ds
index 3e576bd1..3e576bd1 100644
--- a/examples/sensors/cubehouse/mesh/table.3ds
+++ b/examples/QtSensors/cubehouse/mesh/table.3ds
diff --git a/examples/sensors/grue/console_app/console_app.pro b/examples/QtSensors/grue/console_app/console_app.pro
index 33d43176..33d43176 100644
--- a/examples/sensors/grue/console_app/console_app.pro
+++ b/examples/QtSensors/grue/console_app/console_app.pro
diff --git a/examples/sensors/grue/console_app/main.cpp b/examples/QtSensors/grue/console_app/main.cpp
index dc62e4de..dc62e4de 100644
--- a/examples/sensors/grue/console_app/main.cpp
+++ b/examples/QtSensors/grue/console_app/main.cpp
diff --git a/examples/sensors/grue/grue.pro b/examples/QtSensors/grue/grue.pro
index 0405286d..0405286d 100644
--- a/examples/sensors/grue/grue.pro
+++ b/examples/QtSensors/grue/grue.pro
diff --git a/examples/sensors/grue/import/import.pro b/examples/QtSensors/grue/import/import.pro
index 753e1ef8..753e1ef8 100644
--- a/examples/sensors/grue/import/import.pro
+++ b/examples/QtSensors/grue/import/import.pro
diff --git a/examples/sensors/grue/import/main.cpp b/examples/QtSensors/grue/import/main.cpp
index 6c327032..6c327032 100644
--- a/examples/sensors/grue/import/main.cpp
+++ b/examples/QtSensors/grue/import/main.cpp
diff --git a/examples/sensors/sensor_explorer/import/plugin.json b/examples/QtSensors/grue/import/plugin.json
index 0967ef42..0967ef42 100644
--- a/examples/sensors/sensor_explorer/import/plugin.json
+++ b/examples/QtSensors/grue/import/plugin.json
diff --git a/examples/sensors/grue/import/qmldir b/examples/QtSensors/grue/import/qmldir
index 266b7c11..266b7c11 100644
--- a/examples/sensors/grue/import/qmldir
+++ b/examples/QtSensors/grue/import/qmldir
diff --git a/examples/sensors/grue/lib/gruesensor.cpp b/examples/QtSensors/grue/lib/gruesensor.cpp
index b1f00ede..b1f00ede 100644
--- a/examples/sensors/grue/lib/gruesensor.cpp
+++ b/examples/QtSensors/grue/lib/gruesensor.cpp
diff --git a/examples/sensors/grue/lib/gruesensor.h b/examples/QtSensors/grue/lib/gruesensor.h
index 8088988d..8088988d 100644
--- a/examples/sensors/grue/lib/gruesensor.h
+++ b/examples/QtSensors/grue/lib/gruesensor.h
diff --git a/examples/sensors/grue/lib/gruesensor_p.h b/examples/QtSensors/grue/lib/gruesensor_p.h
index 4996e868..4996e868 100644
--- a/examples/sensors/grue/lib/gruesensor_p.h
+++ b/examples/QtSensors/grue/lib/gruesensor_p.h
diff --git a/examples/sensors/grue/lib/lib.pro b/examples/QtSensors/grue/lib/lib.pro
index e048e607..e048e607 100644
--- a/examples/sensors/grue/lib/lib.pro
+++ b/examples/QtSensors/grue/lib/lib.pro
diff --git a/examples/sensors/grue/plugin/gruesensorimpl.cpp b/examples/QtSensors/grue/plugin/gruesensorimpl.cpp
index e7152a67..e7152a67 100644
--- a/examples/sensors/grue/plugin/gruesensorimpl.cpp
+++ b/examples/QtSensors/grue/plugin/gruesensorimpl.cpp
diff --git a/examples/sensors/grue/plugin/gruesensorimpl.h b/examples/QtSensors/grue/plugin/gruesensorimpl.h
index ed89711d..ed89711d 100644
--- a/examples/sensors/grue/plugin/gruesensorimpl.h
+++ b/examples/QtSensors/grue/plugin/gruesensorimpl.h
diff --git a/examples/sensors/grue/plugin/main.cpp b/examples/QtSensors/grue/plugin/main.cpp
index 36aec298..36aec298 100644
--- a/examples/sensors/grue/plugin/main.cpp
+++ b/examples/QtSensors/grue/plugin/main.cpp
diff --git a/examples/sensors/grue/plugin/plugin.json b/examples/QtSensors/grue/plugin/plugin.json
index 8a55b3ae..8a55b3ae 100644
--- a/examples/sensors/grue/plugin/plugin.json
+++ b/examples/QtSensors/grue/plugin/plugin.json
diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/QtSensors/grue/plugin/plugin.pro
index 32e127f1..32e127f1 100644
--- a/examples/sensors/grue/plugin/plugin.pro
+++ b/examples/QtSensors/grue/plugin/plugin.pro
diff --git a/examples/sensors/grue/qml_app/grue.png b/examples/QtSensors/grue/qml_app/grue.png
index f0b070b4..f0b070b4 100644
--- a/examples/sensors/grue/qml_app/grue.png
+++ b/examples/QtSensors/grue/qml_app/grue.png
diff --git a/examples/sensors/grue/qml_app/grue.xcf b/examples/QtSensors/grue/qml_app/grue.xcf
index 2837ed7e..2837ed7e 100644
--- a/examples/sensors/grue/qml_app/grue.xcf
+++ b/examples/QtSensors/grue/qml_app/grue.xcf
diff --git a/examples/sensors/grue/qml_app/icon.png b/examples/QtSensors/grue/qml_app/icon.png
index f3f038c7..f3f038c7 100644
--- a/examples/sensors/grue/qml_app/icon.png
+++ b/examples/QtSensors/grue/qml_app/icon.png
diff --git a/examples/sensors/grue/qml_app/icon.xcf b/examples/QtSensors/grue/qml_app/icon.xcf
index 8416c49f..8416c49f 100644
--- a/examples/sensors/grue/qml_app/icon.xcf
+++ b/examples/QtSensors/grue/qml_app/icon.xcf
diff --git a/examples/sensors/grue/qml_app/info.json b/examples/QtSensors/grue/qml_app/info.json
index 2e14fc79..2e14fc79 100644
--- a/examples/sensors/grue/qml_app/info.json
+++ b/examples/QtSensors/grue/qml_app/info.json
diff --git a/examples/sensors/grue/qml_app/main.qml b/examples/QtSensors/grue/qml_app/main.qml
index 05d267c7..05d267c7 100644
--- a/examples/sensors/grue/qml_app/main.qml
+++ b/examples/QtSensors/grue/qml_app/main.qml
diff --git a/examples/sensors/grue/qml_app/qml_app.pro b/examples/QtSensors/grue/qml_app/qml_app.pro
index c017dcc4..c017dcc4 100644
--- a/examples/sensors/grue/qml_app/qml_app.pro
+++ b/examples/QtSensors/grue/qml_app/qml_app.pro
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.json b/examples/QtSensors/qmlsensorgestures/plugin/plugin.json
index 8a55b3ae..8a55b3ae 100644
--- a/examples/sensors/qmlsensorgestures/plugin/plugin.json
+++ b/examples/QtSensors/qmlsensorgestures/plugin/plugin.json
diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro
index 2003e910..2003e910 100644
--- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro
+++ b/examples/QtSensors/qmlsensorgestures/plugin/plugin.pro
diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp
index 1fda1879..1fda1879 100644
--- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp
+++ b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp
diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h
index 4755f96e..4755f96e 100644
--- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h
+++ b/examples/QtSensors/qmlsensorgestures/plugin/qcountergestureplugin.h
diff --git a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp
index 03319e81..03319e81 100644
--- a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp
+++ b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp
diff --git a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h
index 37c16eb1..37c16eb1 100644
--- a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h
+++ b/examples/QtSensors/qmlsensorgestures/plugin/qcounterrecognizer.h
diff --git a/examples/sensors/qmlsensorgestures/qml_app/Button.qml b/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml
index 23fc0f66..23fc0f66 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/Button.qml
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/Button.qml
diff --git a/examples/sensors/qmlsensorgestures/qml_app/Gesture.qml b/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml
index 2982c097..2982c097 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/Gesture.qml
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/Gesture.qml
diff --git a/examples/sensors/qmlsensorgestures/qml_app/GestureList.qml b/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml
index c9b1f094..c9b1f094 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/GestureList.qml
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/GestureList.qml
diff --git a/examples/sensors/qmlsensorgestures/qml_app/GestureView.qml b/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml
index 07a9a5cc..07a9a5cc 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/GestureView.qml
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/GestureView.qml
diff --git a/examples/sensors/qmlsensorgestures/qml_app/GesturesView.qml b/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml
index 23924cad..23924cad 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/GesturesView.qml
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/GesturesView.qml
diff --git a/examples/sensors/qmlsensorgestures/qml_app/icon.png b/examples/QtSensors/qmlsensorgestures/qml_app/icon.png
index c445bd7f..c445bd7f 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/icon.png
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/icon.png
diff --git a/examples/sensors/qmlsensorgestures/qml_app/info.json b/examples/QtSensors/qmlsensorgestures/qml_app/info.json
index 063caaa0..063caaa0 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/info.json
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/info.json
diff --git a/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro b/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro
index 6ad9a8bf..6ad9a8bf 100644
--- a/examples/sensors/qmlsensorgestures/qml_app/qml_app.pro
+++ b/examples/QtSensors/qmlsensorgestures/qml_app/qml_app.pro
diff --git a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro b/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro
index 01677c19..01677c19 100644
--- a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro
+++ b/examples/QtSensors/qmlsensorgestures/qmlsensorgestures.pro
diff --git a/examples/sensors/sensorgestures/gesture.png b/examples/QtSensors/sensorgestures/gesture.png
index 707d5c4e..707d5c4e 100644
--- a/examples/sensors/sensorgestures/gesture.png
+++ b/examples/QtSensors/sensorgestures/gesture.png
diff --git a/examples/sensors/sensorgestures/main.cpp b/examples/QtSensors/sensorgestures/main.cpp
index 49594d4e..49594d4e 100644
--- a/examples/sensors/sensorgestures/main.cpp
+++ b/examples/QtSensors/sensorgestures/main.cpp
diff --git a/examples/sensors/sensorgestures/mainwindow.cpp b/examples/QtSensors/sensorgestures/mainwindow.cpp
index 9dd8a611..9dd8a611 100644
--- a/examples/sensors/sensorgestures/mainwindow.cpp
+++ b/examples/QtSensors/sensorgestures/mainwindow.cpp
diff --git a/examples/sensors/sensorgestures/mainwindow.h b/examples/QtSensors/sensorgestures/mainwindow.h
index 1e38f1be..1e38f1be 100644
--- a/examples/sensors/sensorgestures/mainwindow.h
+++ b/examples/QtSensors/sensorgestures/mainwindow.h
diff --git a/examples/sensors/sensorgestures/mainwindow.ui b/examples/QtSensors/sensorgestures/mainwindow.ui
index baccf98c..baccf98c 100644
--- a/examples/sensors/sensorgestures/mainwindow.ui
+++ b/examples/QtSensors/sensorgestures/mainwindow.ui
diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/QtSensors/sensorgestures/sensorgestures.pro
index 295db944..295db944 100644
--- a/examples/sensors/sensorgestures/sensorgestures.pro
+++ b/examples/QtSensors/sensorgestures/sensorgestures.pro
diff --git a/examples/examples.pro b/examples/examples.pro
index 0685c62c..94375404 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += sensors
+SUBDIRS += QtSensors
diff --git a/examples/sensors/maze/info.json b/examples/sensors/maze/info.json
deleted file mode 100644
index 3aa2369c..00000000
--- a/examples/sensors/maze/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "info-version": "1.0",
-    "dict": {
-        "Category": "application",
-        "Runtime": "qml",
-        "DisplayName": "Maze",
-        "Subcategory": "utility",
-        "MainQML": "Maze.qml",
-        "Version": "1.0.0",
-        "Identifier": "com.nokia.mt.maze",
-        "Summary": "Labyrinth game using TiltSensor",
-        "Author": "Qt"
-    }
-}
diff --git a/examples/sensors/qmlqtsensors/info.json b/examples/sensors/qmlqtsensors/info.json
deleted file mode 100644
index d76c3002..00000000
--- a/examples/sensors/qmlqtsensors/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "info-version": "1.0",
-    "dict": {
-        "Category": "application",
-        "Runtime": "qml",
-        "DisplayName": "QML QtSensors",
-        "Subcategory": "utility",
-        "MainQML": "main.qml",
-        "Version": "1.0.0",
-        "Identifier": "com.nokia.mt.qmlqtsensors",
-        "Summary": "QML Qt Sensors demo",
-        "Author": "Qt"
-    }
-}
diff --git a/examples/sensors/sensor_explorer/qml_app/info.json b/examples/sensors/sensor_explorer/qml_app/info.json
deleted file mode 100644
index ce7e0c37..00000000
--- a/examples/sensors/sensor_explorer/qml_app/info.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "info-version": "1.0",
-    "dict": {
-        "Category": "application",
-        "Runtime": "qml",
-        "DisplayName": "Sensors Explorer",
-        "Subcategory": "utility",
-        "MainQML": "main.qml",
-        "Version": "1.0.0",
-        "Identifier": "com.nokia.mt.sensor_explorer",
-        "Summary": "QML Sensors Explorer demo",
-        "Author": "Qt"
-    }
-}
-
diff --git a/examples/sensors/shakeit/info.json b/examples/sensors/shakeit/info.json
deleted file mode 100644
index 1895469b..00000000
--- a/examples/sensors/shakeit/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "info-version": "1.0",
-    "dict": {
-        "DisplayName": "ShakeIt!",
-        "Identifier": "com.nokia.mt.shakeit",
-        "Runtime": "qml",
-        "MainQML": "shakeit.qml",
-        "Version": "1.0.0",
-        "Category": "application",
-        "Subcategory": "utility",
-        "Summary": "ShakeIt demonstrates the Qt5 QtSensor Gestures API"
-    }
-}
diff --git a/src/imports/sensors2/qsensor2ambientlight.cpp b/src/imports/sensors2/qsensor2ambientlight.cpp
index b24a8b09..28f46eda 100644
--- a/src/imports/sensors2/qsensor2ambientlight.cpp
+++ b/src/imports/sensors2/qsensor2ambientlight.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
     This element is part of the \b{QtSensors 5} module.
 
-    The \l {Qt Sensors - Simple QML Example} is an example how to use this QML element.
+    The \l {Qt Sensors - QML example} is an example how to use this QML element.
 */
 QSensor2AmbientLight::QSensor2AmbientLight(QObject* parent)
     : qsensor2common(parent)
diff --git a/src/imports/sensors2/qsensor2proximity.cpp b/src/imports/sensors2/qsensor2proximity.cpp
index c0ef9570..d126dc97 100644
--- a/src/imports/sensors2/qsensor2proximity.cpp
+++ b/src/imports/sensors2/qsensor2proximity.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
     This element is part of the \b{QtSensors 5} module.
 
-    The \l {Qt Sensors - Simple QML Example} is an example how to use this QML element.
+    The \l {Qt Sensors - QML example} is an example how to use this QML element.
 
 */
 
diff --git a/src/imports/sensors2/qsensor2tilt.cpp b/src/imports/sensors2/qsensor2tilt.cpp
index b0d85a5d..99d4a601 100644
--- a/src/imports/sensors2/qsensor2tilt.cpp
+++ b/src/imports/sensors2/qsensor2tilt.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
     This element is part of the \b{QtSensors 5} module.
 
-    The \l {Qt Sensors - Simple QML Example} is an example how to use this QML element.
+    The \l {Qt Sensors - QML example} is an example how to use this QML element.
 
 */
 QSensor2Tilt::QSensor2Tilt(QObject* parent)