143 files changed, 114 insertions, 99 deletions

diff --git a/examples/sensors/sensors.pro b/examples/QtSensors/QtSensors.pro
index 807203f..3e64991 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 b08ef1a..a8d6c41 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 27ca84d..e5aacfc 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 9786d96..55dac18 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 0000000..a15e39e
--- /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 f52c00f..f52c00f 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 cab5e94..cab5e94 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 537a8bc..537a8bc 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 62a00b9..62a00b9 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 1fecad5..1fecad5 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 149529e..149529e 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 ab29a62..ab29a62 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 0e70d1b..0e70d1b 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 ecef450..ecef450 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 6b2cb47..6b2cb47 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 7020417..7020417 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 5491c18..5491c18 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 265d2ba..265d2ba 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 bdcd708..bdcd708 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 a8b1e8f..a8b1e8f 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 a95d02c..a95d02c 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 00bc3e1..00bc3e1 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 e0153eb..e0153eb 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 19220eb..19220eb 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 698c0b1..698c0b1 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 1e7ff8d..1e7ff8d 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 0000000..8e2ad1a
--- /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 fccce18..fccce18 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 cb3b9aa..765b9d0 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 0000000..a15e39e
--- /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 44be63a..44be63a 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 cab5e94..cab5e94 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 537a8bc..537a8bc 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 62a00b9..62a00b9 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 1fecad5..1fecad5 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 149529e..149529e 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 d3243c5..d3243c5 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 0000000..e548402
--- /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 9ecebd9..e1ec872 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 ba956fb..846c4cc 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 759e930..85ba45e 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 8864160..8864160 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 f95572b..da15737 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 cab5e94..cab5e94 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 537a8bc..537a8bc 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 c1feaf2..c1feaf2 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 62a00b9..62a00b9 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 1fecad5..1fecad5 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 149529e..149529e 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 98bc601..98bc601 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 b90b50c..b90b50c 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 def234f..def234f 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 c48b609..c48b609 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 0c29619..0c29619 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 f8806b6..eaac810 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 1f97b67..1f97b67 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 e0b3ad9..80e2510 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 0967ef4..0967ef4 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 0360e0d..0360e0d 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 dd8eecf..b3ebe4c 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 60d8f88..60d8f88 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 68dccf4..68dccf4 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 0931367..b937687 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 0000000..18f3e8d
--- /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 ded6634..bc4f858 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 0000000..6dc685b
--- /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 e2a2254..50ef8de 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 7d76cb6..7d76cb6 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 884e9ac..884e9ac 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 f366537..f366537 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 9318d5a..9318d5a 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 4cc5ccd..4cc5ccd 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 d8f2154..d8f2154 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 0000000..a98f6f2
--- /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 5c71541..a56249d 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 86303ec..86303ec 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 012c8c6..012c8c6 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 feeec68..feeec68 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 d74f111..d74f111 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 f96126e..f96126e 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 9a2ed70..9a2ed70 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 487ee3f..487ee3f 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 c174b8f..c174b8f 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 5a1b91f..5a1b91f 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 43af3b1..43af3b1 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 683d28d..683d28d 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 075ec4e..075ec4e 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 193ad56..193ad56 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 2664b99..2664b99 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 7d3e97e..7d3e97e 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 53a35d6..53a35d6 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 7c56e23..7c56e23 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 39e39a8..39e39a8 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 3e576bd..3e576bd 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 33d4317..33d4317 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 dc62e4d..dc62e4d 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 0405286..0405286 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 753e1ef..753e1ef 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 6c32703..6c32703 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 0967ef4..0967ef4 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 266b7c1..266b7c1 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 b1f00ed..b1f00ed 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 8088988..8088988 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 4996e86..4996e86 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 e048e60..e048e60 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 e7152a6..e7152a6 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 ed89711..ed89711 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 36aec29..36aec29 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 8a55b3a..8a55b3a 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 32e127f..32e127f 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 f0b070b..f0b070b 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 2837ed7..2837ed7 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 f3f038c..f3f038c 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 8416c49..8416c49 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 2e14fc7..2e14fc7 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 05d267c..05d267c 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 c017dcc..c017dcc 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 8a55b3a..8a55b3a 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 2003e91..2003e91 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 1fda187..1fda187 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 4755f96..4755f96 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 03319e8..03319e8 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 37c16eb..37c16eb 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 23fc0f6..23fc0f6 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 2982c09..2982c09 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 c9b1f09..c9b1f09 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 07a9a5c..07a9a5c 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 23924ca..23924ca 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 c445bd7..c445bd7 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 063caaa..063caaa 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 6ad9a8b..6ad9a8b 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 01677c1..01677c1 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 707d5c4..707d5c4 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 49594d4..49594d4 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 9dd8a61..9dd8a61 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 1e38f1b..1e38f1b 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 baccf98..baccf98 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 295db94..295db94 100644
--- a/examples/sensors/sensorgestures/sensorgestures.pro
+++ b/examples/QtSensors/sensorgestures/sensorgestures.pro
diff --git a/examples/examples.pro b/examples/examples.pro
index 0685c62..9437540 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 3aa2369..0000000
--- 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 d76c300..0000000
--- 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 ce7e0c3..0000000
--- 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 1895469..0000000
--- 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"
-    }
-}