diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45fb1fbff3ff9c88e788a4470fd72ce478..5de255cb69e5775ba5ede321121ef6a5efc52ab9 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
 load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/examples/demos/calqlatr/calqlatr.pro b/examples/demos/calqlatr/calqlatr.pro
deleted file mode 100644
index 6a147f4ce6ebee3c62b72662bfb8b7a1ecab64b8..0000000000000000000000000000000000000000
--- a/examples/demos/calqlatr/calqlatr.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
-qml.files = calqlatr.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
-sources.files = $$SOURCES calqlatr.pro
-sources.path = $$qml.path
-INSTALLS += target sources qml
diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro
deleted file mode 100644
index b2433969867eb41e8f3d93517c3eb6c19860fb60..0000000000000000000000000000000000000000
--- a/examples/demos/demos.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS =   calqlatr \
-            samegame \
-            tweetsearch \
-            maroon \
-            stocqt
-
-# install
-sources.files = demos.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos
-INSTALLS += sources
diff --git a/examples/demos/maroon/maroon.pro b/examples/demos/maroon/maroon.pro
deleted file mode 100644
index fa2e4b5709d9e062521820adb8bdd97f0a4f9dca..0000000000000000000000000000000000000000
--- a/examples/demos/maroon/maroon.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
-qml.files = maroon.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
-sources.files = $$SOURCES maroon.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro
deleted file mode 100644
index 2f7afef5a500e74872b079db995104ed9578a0f1..0000000000000000000000000000000000000000
--- a/examples/demos/samegame/samegame.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
-qml.files = samegame.qml content settings.js
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
-sources.files = $$SOURCES samegame.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/demos/stocqt/stocqt.pro b/examples/demos/stocqt/stocqt.pro
deleted file mode 100644
index dfa1924946dcb584d171cecf52ff8ed0907da2dd..0000000000000000000000000000000000000000
--- a/examples/demos/stocqt/stocqt.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += qml quick
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
-qml.files = stocqt.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
-sources.files = $$SOURCES stocqt.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/demos/tweetsearch/tweetsearch.pro b/examples/demos/tweetsearch/tweetsearch.pro
deleted file mode 100644
index 36f4377de112aca584bc2389b82cb2b7c3ee8660..0000000000000000000000000000000000000000
--- a/examples/demos/tweetsearch/tweetsearch.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
-qml.files = tweetsearch.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
-sources.files = $$SOURCES tweetsearch.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/examples.pro b/examples/examples.pro
index f2b7a2dddfecf019520fdc11a8b639cc170181ba..1bcc66d16412d1403f476585ba8f03685a8f6fd4 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,16 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    demos \
-    shared \
-    localstorage \
-    particles \
+    qmltest \
     qml \
-    quick \
-    tutorials \
-    window \
-    qmltest
-
-# install
-sources.files = shared examples.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/
-INSTALLS += sources
+    quick
diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro
deleted file mode 100644
index d9058700ff9e9193cd497f9c41fc460fa60fe9aa..0000000000000000000000000000000000000000
--- a/examples/localstorage/localstorage.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += localstorage
-
-# install
-sources.files = localstorage.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage
-INSTALLS += sources
diff --git a/examples/localstorage/localstorage/localstorage.pro b/examples/localstorage/localstorage/localstorage.pro
deleted file mode 100644
index 504f9f77c1b52d9bae2303f3ef6ae476032f7dde..0000000000000000000000000000000000000000
--- a/examples/localstorage/localstorage/localstorage.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
-qml.files = localstorage.qml hello.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
-sources.files = $$SOURCES localstorage.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/affectors/affectors.pro b/examples/particles/affectors/affectors.pro
deleted file mode 100644
index 231be91f0110d26fd765d570175883e789b61fc5..0000000000000000000000000000000000000000
--- a/examples/particles/affectors/affectors.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
-qml.files = affectors.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
-sources.files = $$SOURCES affectors.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/customparticle/customparticle.pro b/examples/particles/customparticle/customparticle.pro
deleted file mode 100644
index 80043799b0f3ce905e124f039d28019592126715..0000000000000000000000000000000000000000
--- a/examples/particles/customparticle/customparticle.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
-qml.files = customparticle.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
-sources.files = $$SOURCES customparticle.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/emitters/emitters.pro b/examples/particles/emitters/emitters.pro
deleted file mode 100644
index aae8e83c711a7d5487ecbf22232f11ec5d1b783e..0000000000000000000000000000000000000000
--- a/examples/particles/emitters/emitters.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
-qml.files = emitters.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
-sources.files = $$SOURCES emitters.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/imageparticle/imageparticle.pro b/examples/particles/imageparticle/imageparticle.pro
deleted file mode 100644
index 17d4816138ac6ae39a141bb0e250d578ad0bcc2d..0000000000000000000000000000000000000000
--- a/examples/particles/imageparticle/imageparticle.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
-qml.files = imageparticle.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
-sources.files = $$SOURCES imageparticle.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/particles/system/system.pro b/examples/particles/system/system.pro
deleted file mode 100644
index 7cc3165483dfdc00c32e94e475d6c9b3d455c561..0000000000000000000000000000000000000000
--- a/examples/particles/system/system.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
-qml.files = system.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
-sources.files = $$SOURCES system.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
diff --git a/examples/qml/imageprovider/imageprovider.pro b/examples/qml/imageprovider/imageprovider.pro
index 135f4da627cbef9c77ac22629d910678e4c00dcc..d1dd321b723ceb9d95cf72a6c82efb83f9e717d3 100644
--- a/examples/qml/imageprovider/imageprovider.pro
+++ b/examples/qml/imageprovider/imageprovider.pro
@@ -7,15 +7,9 @@ TARGET  = qmlimageproviderplugin
 
 SOURCES += imageprovider.cpp
 
-OTHER_FILES += imageprovider.json
+EXAMPLE_FILES = imageprovider-example.qml
 
-sources.files = $$SOURCES imageprovider.qml imageprovider.pro $$OTHER_FILES
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
-
-ImageProviderCore_sources.files = \
-    ImageProviderCore/qmldir 
-ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
-
-INSTALLS = sources ImageProviderCore_sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore
+qml.files = ImageProviderCore/qmldir
+qml.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore
+INSTALLS = target qml
diff --git a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 3195dfd7a2ca2554e788a632cb0cb50181b29318..222cc71c46e3c065e285090287a321a88986c477 100644
--- a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -3,8 +3,5 @@ QT += qml quick network
 SOURCES += main.cpp 
 RESOURCES += networkaccessmanagerfactory.qrc
 
-sources.files = $$SOURCES $$RESOURCES networkaccessmanagerfactory.pro view.qml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/networkaccessmanagerfactory
-target.path = $$sources.path
-
-INSTALLS = sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/networkaccessmanagerfactory
+INSTALLS = target
diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/plugins/plugins.pro
index 66af7d3c073eeb0141c02eab3b4266b1ec44d056..6f8cb37f93040b6791727b3cbfdbce71e65c15b8 100644
--- a/examples/qml/plugins/plugins.pro
+++ b/examples/qml/plugins/plugins.pro
@@ -7,7 +7,7 @@ TARGET  = qmlqtimeexampleplugin
 
 SOURCES += plugin.cpp
 
-qdeclarativesources.files += \
+pluginfiles.files += \
     imports/TimeExample/qmldir \
     imports/TimeExample/center.png \
     imports/TimeExample/clock.png \
@@ -15,11 +15,10 @@ qdeclarativesources.files += \
     imports/TimeExample/hour.png \
     imports/TimeExample/minute.png
 
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample
+qml.files = plugins.qml
+qml.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample
+pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample
 
-sources.files += plugins.pro plugin.cpp plugins.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample
-
-INSTALLS += qdeclarativesources sources target
+INSTALLS += target qml pluginfiles
 
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
index 6bc620fbf09ed7ce5043f266ac467055fd376550..a66d08a8b76c031b9f780701df0ba900fee29bcb 100644
--- a/examples/qml/qml.pro
+++ b/examples/qml/qml.pro
@@ -1,12 +1,13 @@
 TEMPLATE = subdirs
 
 SUBDIRS +=imageprovider \
-          plugins \
           networkaccessmanagerfactory \
+          plugins \
           referenceexamples \
-          shell
+          shell \
+          xmlhttprequest
 
-#Install
-sources.files = qml.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml
-INSTALLS += sources
+EXAMPLE_FILES = \
+    dynamicscene \
+    i18n \
+    locale
diff --git a/examples/qml/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro
index a6c2fc65ed3b272bab41971ff04f8613aca1f57e..86c830bda9db68798e13d8390f2148ab017e2107 100644
--- a/examples/qml/referenceexamples/adding/adding.pro
+++ b/examples/qml/referenceexamples/adding/adding.pro
@@ -5,7 +5,5 @@ SOURCES += main.cpp \
 HEADERS += person.h
 RESOURCES += adding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/adding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/adding
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro
index 247db55cee97bd1c1c1847cad4f31f43f27e2f53..1225a5fcfdf8867fdc403c68e3652fc9fc19e443 100644
--- a/examples/qml/referenceexamples/attached/attached.pro
+++ b/examples/qml/referenceexamples/attached/attached.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += attached.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/attached
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/attached
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro
index 86787c7654e29884b4452945cecca1fb94aa4c30..3c1f9565ed64c587af11e56b2436d75624a8266a 100644
--- a/examples/qml/referenceexamples/binding/binding.pro
+++ b/examples/qml/referenceexamples/binding/binding.pro
@@ -7,9 +7,7 @@ SOURCES += main.cpp \
 HEADERS += person.h \
            birthdayparty.h \
            happybirthdaysong.h
-
 RESOURCES += binding.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/binding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/binding
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro
index e053ac21cb67a722384095085c5a92840c0d80e1..c501b9cda2c458390c8e6346f4ecbe9209e54630 100644
--- a/examples/qml/referenceexamples/coercion/coercion.pro
+++ b/examples/qml/referenceexamples/coercion/coercion.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += coercion.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/coercion
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/coercion
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro
index 80bee644613c22ce253033c8cb527e659d31da4c..db4b88413bcd2b2a95a74c274ea36c767599bcca 100644
--- a/examples/qml/referenceexamples/default/default.pro
+++ b/examples/qml/referenceexamples/default/default.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += default.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/default
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/default
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro
index 5b21d9044758b3f9e9ddd71693beb42d83da2f96..b38a1753b9d0af33503498802c05b5457aec06c7 100644
--- a/examples/qml/referenceexamples/extended/extended.pro
+++ b/examples/qml/referenceexamples/extended/extended.pro
@@ -5,7 +5,5 @@ SOURCES += main.cpp \
 HEADERS += lineedit.h
 RESOURCES += extended.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/extended
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/extended
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro
index afd1c15668cb5dc8a2af56ae8a0ed58a15124821..7014d9680dba00292efa280010ad78c88e0fe8df 100644
--- a/examples/qml/referenceexamples/grouped/grouped.pro
+++ b/examples/qml/referenceexamples/grouped/grouped.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += grouped.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/grouped
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/grouped
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro
index a7dd99653202dfd5174fa896d57306a23594c8d0..c1be0713e6939dab67be1606994bffea3a5801cf 100644
--- a/examples/qml/referenceexamples/methods/methods.pro
+++ b/examples/qml/referenceexamples/methods/methods.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += methods.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/methods
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/methods
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro
index c1cf877e65cac22530ab74aa4c82ac20d0d90e37..cd1ffeddcccd7ee4e59ef5a4ed97f8b1a283b4f5 100644
--- a/examples/qml/referenceexamples/properties/properties.pro
+++ b/examples/qml/referenceexamples/properties/properties.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += properties.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/properties
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/properties
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro
index 5f514bc1db68c70a5b6ae7978f4c84d1741c710d..4bfbd488eaecaa5686668cc140531c45e6a0e7ff 100644
--- a/examples/qml/referenceexamples/referenceexamples.pro
+++ b/examples/qml/referenceexamples/referenceexamples.pro
@@ -13,7 +13,3 @@ SUBDIRS += \
     methods
 
 !contains(QT_CONFIG, no-widgets): SUBDIRS += extended
-
-sources.files = referenceexamples.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples
-INSTALLS += sources
diff --git a/examples/qml/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro
index 5a021ebae076d23bd3ab9152b62168ca55b836d5..81692d3676e1fb870f97a321ff2ee230c7f44371 100644
--- a/examples/qml/referenceexamples/signal/signal.pro
+++ b/examples/qml/referenceexamples/signal/signal.pro
@@ -7,7 +7,5 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += signal.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/signal
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/signal
+INSTALLS += target
diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro
index d7aafb7d107b31d6012c00400b11e77bef0fc152..4ec77ff83b260246aca354a1f43e7a9e167da8a3 100644
--- a/examples/qml/referenceexamples/valuesource/valuesource.pro
+++ b/examples/qml/referenceexamples/valuesource/valuesource.pro
@@ -9,7 +9,5 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += valuesource.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/valuesource
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro example.qml
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/valuesource
+INSTALLS += target
diff --git a/examples/qml/shell/shell.pro b/examples/qml/shell/shell.pro
index b57d550d315139b9c13eb54de6f05faac3383a00..da97590189d90239b30f5b6012daf3d18a124eb6 100644
--- a/examples/qml/shell/shell.pro
+++ b/examples/qml/shell/shell.pro
@@ -5,7 +5,5 @@ mac:CONFIG -= app_bundle
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/shell
-sources.files = $$SOURCES shell.pro
-sources.path = $$target.path
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/shell
+INSTALLS += target
diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp
index 976a462464bfa8dff9057a7a9c0b0c4d3cbd7f71..25f3759de5cffbef5d660c8ac288a08c63f29eba 100644
--- a/examples/qml/xmlhttprequest/main.cpp
+++ b/examples/qml/xmlhttprequest/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest)
\ No newline at end of file
+#include "../../quick/shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest)
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.pro b/examples/qml/xmlhttprequest/xmlhttprequest.pro
index bb7fae66bf877a6d7814f9d1b823fb38929a37b7..5af32eeab6d2590617f9d3ceeeb95217fcbd910c 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.pro
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.pro
@@ -3,7 +3,10 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest
+EXAMPLE_FILES = \
+    data.xml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest
 qml.files = xmlhttprequest.qml get.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest
+qml.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest
 INSTALLS += target qml
diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qml b/examples/qml/xmlhttprequest/xmlhttprequest.qml
index b9bf4548cb612c48d7af0e6b927fb26610ba6f38..b483ac1aa0c1074d6bafc68aa8c7a1ae04bfaa9f 100644
--- a/examples/qml/xmlhttprequest/xmlhttprequest.qml
+++ b/examples/qml/xmlhttprequest/xmlhttprequest.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../../quick/shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
index dbf032e11ce285e13f319871ddd1cd850c8cbec8..3ade5f2cbd05e8d2deefd88f67ccab9ab5320233 100644
--- a/examples/qmltest/qmltest/qmltest.pro
+++ b/examples/qmltest/qmltest/qmltest.pro
@@ -5,7 +5,7 @@ SOURCES += tst_qmltest.cpp
 
 # Note: Normally, tests are auto-installed to a test-specific directory. Overwritten here
 # so this one will end up in the examples tree.
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qmltest
-sources.files = $$SOURCES qmltest.pro *.qml
-sources.path = $$target.path
-INSTALLS = sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/qmltest
+qml.files = tst_basic.qml tst_item.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest
+INSTALLS += target qml
diff --git a/examples/quick/accessibility/accessibility.pro b/examples/quick/accessibility/accessibility.pro
index 681e44b3072810bd785f790fd9d359b78efaa3a4..9658a8e70bd8b7fa834947efa4cf42b5434e8980 100644
--- a/examples/quick/accessibility/accessibility.pro
+++ b/examples/quick/accessibility/accessibility.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/accessibility
 qml.files = accessibility.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility
-sources.files = $$SOURCES accessibility.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/accessibility
+INSTALLS += target qml
diff --git a/examples/quick/accessibility/main.cpp b/examples/quick/accessibility/main.cpp
index 801ccdcf19799f79127fcb35c39930f363b4bf86..51374d049335425d249bafc4d284c2862beab4f4 100644
--- a/examples/quick/accessibility/main.cpp
+++ b/examples/quick/accessibility/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(accessibility)
diff --git a/examples/quick/animation/animation.pro b/examples/quick/animation/animation.pro
index edc767d709dda8ee7ae8d69e5cc6fe2a8bf6327a..58e9226ea5495840f74988e77da519140edcb508 100644
--- a/examples/quick/animation/animation.pro
+++ b/examples/quick/animation/animation.pro
@@ -3,10 +3,8 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/animation
 qml.files = animation.qml  basics  behaviors  easing pathanimation  pathinterpolator  states
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation
-sources.files = $$SOURCES animation.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/animation
+INSTALLS += target qml
 
diff --git a/examples/quick/animation/animation.qml b/examples/quick/animation/animation.qml
index a17967a49623fcf74be8d717f8d7b7f090dc6926..8a1b8558ee73a8fffe22b44e41b7dba0fe81d4bf 100644
--- a/examples/quick/animation/animation.qml
+++ b/examples/quick/animation/animation.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/animation/main.cpp b/examples/quick/animation/main.cpp
index faccffc27add4df53e4f2ca079495b5e3b78dc78..dc5b506888acb1fb23ebe18b4870aa652ce0d9dc 100644
--- a/examples/quick/animation/main.cpp
+++ b/examples/quick/animation/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(animation)
diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro
index 9f024237a27cd5643b170e22feb3ad3e4b793869..d721805abd8991dad6e5bcf7b614027f331fa0d5 100644
--- a/examples/quick/canvas/canvas.pro
+++ b/examples/quick/canvas/canvas.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/canvas
 qml.files = canvas.qml bezierCurve clip quadraticCurveTo roundedrect smile squircle tiger contents
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas
-sources.files = $$SOURCES canvas.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/canvas
+INSTALLS += target qml
diff --git a/examples/quick/canvas/canvas.qml b/examples/quick/canvas/canvas.qml
index 65707f7381cc13b62fb93ee7542bd0b07f09f9f1..e1e87241499ffdc6b22268bc682ededb94654a1e 100644
--- a/examples/quick/canvas/canvas.qml
+++ b/examples/quick/canvas/canvas.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/canvas/main.cpp b/examples/quick/canvas/main.cpp
index acbef7551bd84917bc74e50425ada0a4b977e1fe..52c62ace1247bbf3733dc9abf1727b3946c76fef 100644
--- a/examples/quick/canvas/main.cpp
+++ b/examples/quick/canvas/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(canvas)
\ No newline at end of file
diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro
index a401042d4ef0a9ba2f9a7bef7916139b76f899ca..1e0a2aed49c93a3878d3abd162e6123f49b03e6d 100644
--- a/examples/quick/customitems/customitems.pro
+++ b/examples/quick/customitems/customitems.pro
@@ -1,17 +1,14 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-    #dialcontrol \
-    #flipable \
     painteditem \
-    #progressbar \
-    #scrollbar \
-    #searchbox \
-    #slideswitch \
-    #spinner \
-    #tabwidget \
     maskedmousearea
 
-# install
-sources.files = customitems.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems
-INSTALLS += sources
+EXAMPLE_FILES = \
+    dialcontrol \
+    flipable \
+    progressbar \
+    scrollbar \
+    searchbox \
+    slideswitch \
+    spinner \
+    tabwidget
diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
index b812508bd79812d746b5f3a227162dcbdca41fb6..d44fa59d0823d3d07a4bc00c4398cbebca36cc81 100644
--- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
@@ -7,9 +7,7 @@ HEADERS += maskedmousearea.h
 SOURCES += main.cpp \
            maskedmousearea.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/maskedmousearea
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/maskedmousearea
 qml.files = maskedmousearea.qml images
 qml.path = $$target.path
-sources.files = $$SOURCES $$HEADERS maskedmousearea.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+INSTALLS += target qml
diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro
index 846ad6307d1ada931e6db1b0c5e8be56bf8002e4..dfe6f96923a5797cff1cd37fe681dea98c6b0bcb 100644
--- a/examples/quick/customitems/painteditem/painteditem.pro
+++ b/examples/quick/customitems/painteditem/painteditem.pro
@@ -9,16 +9,12 @@ HEADERS += TextBalloonPlugin/plugin.h \
 
 SOURCES += textballoon.cpp
 
-OTHER_FILES += textballoon.json
-
 DESTDIR = TextBalloonPlugin
 
-INSTALL_PATH = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/painteditem/
-qdeclarativesources.files += \
-    TextBalloonPlugin/qmldir TextBalloonPlugin/plugin.h
-qdeclarativesources.path += $$INSTALL_PATH/TextBalloonPlugin
-sources.files = textballoons.qml $$SOURCES textballoon.h $$OTHER_FILES painteditem.pro
-sources.path = $$INSTALL_PATH
-target.path = $$INSTALL_PATH/TextBalloonPlugin
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin
+qmldir.files = TextBalloonPlugin/qmldir
+qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin
+qml.files = textballoons.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/
 
-INSTALLS = qdeclarativesources sources target
+INSTALLS += qml qmldir target
diff --git a/examples/quick/demos/calqlatr/calqlatr.pro b/examples/quick/demos/calqlatr/calqlatr.pro
new file mode 100644
index 0000000000000000000000000000000000000000..fec0d6416b9d525a583d6394cf76298c0d8ecc0b
--- /dev/null
+++ b/examples/quick/demos/calqlatr/calqlatr.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr
+qml.files = calqlatr.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr
+INSTALLS += target qml
diff --git a/examples/demos/calqlatr/calqlatr.qml b/examples/quick/demos/calqlatr/calqlatr.qml
similarity index 100%
rename from examples/demos/calqlatr/calqlatr.qml
rename to examples/quick/demos/calqlatr/calqlatr.qml
diff --git a/examples/demos/calqlatr/calqlatr.qmlproject b/examples/quick/demos/calqlatr/calqlatr.qmlproject
similarity index 100%
rename from examples/demos/calqlatr/calqlatr.qmlproject
rename to examples/quick/demos/calqlatr/calqlatr.qmlproject
diff --git a/examples/demos/calqlatr/content/Button.qml b/examples/quick/demos/calqlatr/content/Button.qml
similarity index 100%
rename from examples/demos/calqlatr/content/Button.qml
rename to examples/quick/demos/calqlatr/content/Button.qml
diff --git a/examples/demos/calqlatr/content/Display.qml b/examples/quick/demos/calqlatr/content/Display.qml
similarity index 100%
rename from examples/demos/calqlatr/content/Display.qml
rename to examples/quick/demos/calqlatr/content/Display.qml
diff --git a/examples/demos/calqlatr/content/NumberPad.qml b/examples/quick/demos/calqlatr/content/NumberPad.qml
similarity index 100%
rename from examples/demos/calqlatr/content/NumberPad.qml
rename to examples/quick/demos/calqlatr/content/NumberPad.qml
diff --git a/examples/demos/calqlatr/content/StyleLabel.qml b/examples/quick/demos/calqlatr/content/StyleLabel.qml
similarity index 100%
rename from examples/demos/calqlatr/content/StyleLabel.qml
rename to examples/quick/demos/calqlatr/content/StyleLabel.qml
diff --git a/examples/demos/calqlatr/content/audio/touch.wav b/examples/quick/demos/calqlatr/content/audio/touch.wav
similarity index 100%
rename from examples/demos/calqlatr/content/audio/touch.wav
rename to examples/quick/demos/calqlatr/content/audio/touch.wav
diff --git a/examples/demos/calqlatr/content/calculator.js b/examples/quick/demos/calqlatr/content/calculator.js
similarity index 100%
rename from examples/demos/calqlatr/content/calculator.js
rename to examples/quick/demos/calqlatr/content/calculator.js
diff --git a/examples/demos/calqlatr/content/images/icon-back.png b/examples/quick/demos/calqlatr/content/images/icon-back.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/icon-back.png
rename to examples/quick/demos/calqlatr/content/images/icon-back.png
diff --git a/examples/demos/calqlatr/content/images/icon-close.png b/examples/quick/demos/calqlatr/content/images/icon-close.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/icon-close.png
rename to examples/quick/demos/calqlatr/content/images/icon-close.png
diff --git a/examples/demos/calqlatr/content/images/icon-settings.png b/examples/quick/demos/calqlatr/content/images/icon-settings.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/icon-settings.png
rename to examples/quick/demos/calqlatr/content/images/icon-settings.png
diff --git a/examples/demos/calqlatr/content/images/logo.png b/examples/quick/demos/calqlatr/content/images/logo.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/logo.png
rename to examples/quick/demos/calqlatr/content/images/logo.png
diff --git a/examples/demos/calqlatr/content/images/paper-edge-left.png b/examples/quick/demos/calqlatr/content/images/paper-edge-left.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/paper-edge-left.png
rename to examples/quick/demos/calqlatr/content/images/paper-edge-left.png
diff --git a/examples/demos/calqlatr/content/images/paper-edge-right.png b/examples/quick/demos/calqlatr/content/images/paper-edge-right.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/paper-edge-right.png
rename to examples/quick/demos/calqlatr/content/images/paper-edge-right.png
diff --git a/examples/demos/calqlatr/content/images/paper-grip.png b/examples/quick/demos/calqlatr/content/images/paper-grip.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/paper-grip.png
rename to examples/quick/demos/calqlatr/content/images/paper-grip.png
diff --git a/examples/demos/calqlatr/content/images/settings-selected-a.png b/examples/quick/demos/calqlatr/content/images/settings-selected-a.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/settings-selected-a.png
rename to examples/quick/demos/calqlatr/content/images/settings-selected-a.png
diff --git a/examples/demos/calqlatr/content/images/settings-selected-b.png b/examples/quick/demos/calqlatr/content/images/settings-selected-b.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/settings-selected-b.png
rename to examples/quick/demos/calqlatr/content/images/settings-selected-b.png
diff --git a/examples/demos/calqlatr/content/images/touch-green.png b/examples/quick/demos/calqlatr/content/images/touch-green.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/touch-green.png
rename to examples/quick/demos/calqlatr/content/images/touch-green.png
diff --git a/examples/demos/calqlatr/content/images/touch-white.png b/examples/quick/demos/calqlatr/content/images/touch-white.png
similarity index 100%
rename from examples/demos/calqlatr/content/images/touch-white.png
rename to examples/quick/demos/calqlatr/content/images/touch-white.png
diff --git a/examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png b/examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
similarity index 100%
rename from examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
rename to examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png
diff --git a/examples/demos/calqlatr/doc/src/calqlatr.qdoc b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc
similarity index 100%
rename from examples/demos/calqlatr/doc/src/calqlatr.qdoc
rename to examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc
diff --git a/examples/demos/calqlatr/main.cpp b/examples/quick/demos/calqlatr/main.cpp
similarity index 100%
rename from examples/demos/calqlatr/main.cpp
rename to examples/quick/demos/calqlatr/main.cpp
diff --git a/examples/demos/clocks/clocks.qml b/examples/quick/demos/clocks/clocks.qml
similarity index 100%
rename from examples/demos/clocks/clocks.qml
rename to examples/quick/demos/clocks/clocks.qml
diff --git a/examples/demos/clocks/content/Clock.qml b/examples/quick/demos/clocks/content/Clock.qml
similarity index 100%
rename from examples/demos/clocks/content/Clock.qml
rename to examples/quick/demos/clocks/content/Clock.qml
diff --git a/examples/demos/clocks/content/arrow.png b/examples/quick/demos/clocks/content/arrow.png
similarity index 100%
rename from examples/demos/clocks/content/arrow.png
rename to examples/quick/demos/clocks/content/arrow.png
diff --git a/examples/demos/clocks/content/background.png b/examples/quick/demos/clocks/content/background.png
similarity index 100%
rename from examples/demos/clocks/content/background.png
rename to examples/quick/demos/clocks/content/background.png
diff --git a/examples/demos/clocks/content/center.png b/examples/quick/demos/clocks/content/center.png
similarity index 100%
rename from examples/demos/clocks/content/center.png
rename to examples/quick/demos/clocks/content/center.png
diff --git a/examples/demos/clocks/content/clock-night.png b/examples/quick/demos/clocks/content/clock-night.png
similarity index 100%
rename from examples/demos/clocks/content/clock-night.png
rename to examples/quick/demos/clocks/content/clock-night.png
diff --git a/examples/demos/clocks/content/clock.png b/examples/quick/demos/clocks/content/clock.png
similarity index 100%
rename from examples/demos/clocks/content/clock.png
rename to examples/quick/demos/clocks/content/clock.png
diff --git a/examples/demos/clocks/content/hour.png b/examples/quick/demos/clocks/content/hour.png
similarity index 100%
rename from examples/demos/clocks/content/hour.png
rename to examples/quick/demos/clocks/content/hour.png
diff --git a/examples/demos/clocks/content/minute.png b/examples/quick/demos/clocks/content/minute.png
similarity index 100%
rename from examples/demos/clocks/content/minute.png
rename to examples/quick/demos/clocks/content/minute.png
diff --git a/examples/demos/clocks/content/quit.png b/examples/quick/demos/clocks/content/quit.png
similarity index 100%
rename from examples/demos/clocks/content/quit.png
rename to examples/quick/demos/clocks/content/quit.png
diff --git a/examples/demos/clocks/content/second.png b/examples/quick/demos/clocks/content/second.png
similarity index 100%
rename from examples/demos/clocks/content/second.png
rename to examples/quick/demos/clocks/content/second.png
diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
new file mode 100644
index 0000000000000000000000000000000000000000..474b5b1bc0120f7533f491b262c68086c45a4a7c
--- /dev/null
+++ b/examples/quick/demos/demos.pro
@@ -0,0 +1,11 @@
+TEMPLATE = subdirs
+SUBDIRS = samegame \
+            calqlatr \
+            tweetsearch \
+            maroon \
+            stocqt
+
+EXAMPLE_FILES = \
+    clocks \
+    photoviewer \
+    rssnews
diff --git a/examples/demos/maroon/content/BuildButton.qml b/examples/quick/demos/maroon/content/BuildButton.qml
similarity index 100%
rename from examples/demos/maroon/content/BuildButton.qml
rename to examples/quick/demos/maroon/content/BuildButton.qml
diff --git a/examples/demos/maroon/content/GameCanvas.qml b/examples/quick/demos/maroon/content/GameCanvas.qml
similarity index 100%
rename from examples/demos/maroon/content/GameCanvas.qml
rename to examples/quick/demos/maroon/content/GameCanvas.qml
diff --git a/examples/demos/maroon/content/GameOverScreen.qml b/examples/quick/demos/maroon/content/GameOverScreen.qml
similarity index 100%
rename from examples/demos/maroon/content/GameOverScreen.qml
rename to examples/quick/demos/maroon/content/GameOverScreen.qml
diff --git a/examples/demos/maroon/content/InfoBar.qml b/examples/quick/demos/maroon/content/InfoBar.qml
similarity index 100%
rename from examples/demos/maroon/content/InfoBar.qml
rename to examples/quick/demos/maroon/content/InfoBar.qml
diff --git a/examples/demos/maroon/content/NewGameScreen.qml b/examples/quick/demos/maroon/content/NewGameScreen.qml
similarity index 100%
rename from examples/demos/maroon/content/NewGameScreen.qml
rename to examples/quick/demos/maroon/content/NewGameScreen.qml
diff --git a/examples/demos/maroon/content/SoundEffect.qml b/examples/quick/demos/maroon/content/SoundEffect.qml
similarity index 100%
rename from examples/demos/maroon/content/SoundEffect.qml
rename to examples/quick/demos/maroon/content/SoundEffect.qml
diff --git a/examples/demos/maroon/content/audio/bomb-action.wav b/examples/quick/demos/maroon/content/audio/bomb-action.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/bomb-action.wav
rename to examples/quick/demos/maroon/content/audio/bomb-action.wav
diff --git a/examples/demos/maroon/content/audio/catch-action.wav b/examples/quick/demos/maroon/content/audio/catch-action.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/catch-action.wav
rename to examples/quick/demos/maroon/content/audio/catch-action.wav
diff --git a/examples/demos/maroon/content/audio/catch.wav b/examples/quick/demos/maroon/content/audio/catch.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/catch.wav
rename to examples/quick/demos/maroon/content/audio/catch.wav
diff --git a/examples/demos/maroon/content/audio/currency.wav b/examples/quick/demos/maroon/content/audio/currency.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/currency.wav
rename to examples/quick/demos/maroon/content/audio/currency.wav
diff --git a/examples/demos/maroon/content/audio/factory-action.wav b/examples/quick/demos/maroon/content/audio/factory-action.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/factory-action.wav
rename to examples/quick/demos/maroon/content/audio/factory-action.wav
diff --git a/examples/demos/maroon/content/audio/melee-action.wav b/examples/quick/demos/maroon/content/audio/melee-action.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/melee-action.wav
rename to examples/quick/demos/maroon/content/audio/melee-action.wav
diff --git a/examples/demos/maroon/content/audio/projectile-action.wav b/examples/quick/demos/maroon/content/audio/projectile-action.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/projectile-action.wav
rename to examples/quick/demos/maroon/content/audio/projectile-action.wav
diff --git a/examples/demos/maroon/content/audio/shooter-action.wav b/examples/quick/demos/maroon/content/audio/shooter-action.wav
similarity index 100%
rename from examples/demos/maroon/content/audio/shooter-action.wav
rename to examples/quick/demos/maroon/content/audio/shooter-action.wav
diff --git a/examples/demos/maroon/content/gfx/background.png b/examples/quick/demos/maroon/content/gfx/background.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/background.png
rename to examples/quick/demos/maroon/content/gfx/background.png
diff --git a/examples/demos/maroon/content/gfx/bomb-action.png b/examples/quick/demos/maroon/content/gfx/bomb-action.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/bomb-action.png
rename to examples/quick/demos/maroon/content/gfx/bomb-action.png
diff --git a/examples/demos/maroon/content/gfx/bomb-idle.png b/examples/quick/demos/maroon/content/gfx/bomb-idle.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/bomb-idle.png
rename to examples/quick/demos/maroon/content/gfx/bomb-idle.png
diff --git a/examples/demos/maroon/content/gfx/bomb.png b/examples/quick/demos/maroon/content/gfx/bomb.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/bomb.png
rename to examples/quick/demos/maroon/content/gfx/bomb.png
diff --git a/examples/demos/maroon/content/gfx/button-help.png b/examples/quick/demos/maroon/content/gfx/button-help.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/button-help.png
rename to examples/quick/demos/maroon/content/gfx/button-help.png
diff --git a/examples/demos/maroon/content/gfx/button-play.png b/examples/quick/demos/maroon/content/gfx/button-play.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/button-play.png
rename to examples/quick/demos/maroon/content/gfx/button-play.png
diff --git a/examples/demos/maroon/content/gfx/catch-action.png b/examples/quick/demos/maroon/content/gfx/catch-action.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/catch-action.png
rename to examples/quick/demos/maroon/content/gfx/catch-action.png
diff --git a/examples/demos/maroon/content/gfx/catch.png b/examples/quick/demos/maroon/content/gfx/catch.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/catch.png
rename to examples/quick/demos/maroon/content/gfx/catch.png
diff --git a/examples/demos/maroon/content/gfx/cloud.png b/examples/quick/demos/maroon/content/gfx/cloud.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/cloud.png
rename to examples/quick/demos/maroon/content/gfx/cloud.png
diff --git a/examples/demos/maroon/content/gfx/currency.png b/examples/quick/demos/maroon/content/gfx/currency.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/currency.png
rename to examples/quick/demos/maroon/content/gfx/currency.png
diff --git a/examples/demos/maroon/content/gfx/dialog-bomb.png b/examples/quick/demos/maroon/content/gfx/dialog-bomb.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/dialog-bomb.png
rename to examples/quick/demos/maroon/content/gfx/dialog-bomb.png
diff --git a/examples/demos/maroon/content/gfx/dialog-factory.png b/examples/quick/demos/maroon/content/gfx/dialog-factory.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/dialog-factory.png
rename to examples/quick/demos/maroon/content/gfx/dialog-factory.png
diff --git a/examples/demos/maroon/content/gfx/dialog-melee.png b/examples/quick/demos/maroon/content/gfx/dialog-melee.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/dialog-melee.png
rename to examples/quick/demos/maroon/content/gfx/dialog-melee.png
diff --git a/examples/demos/maroon/content/gfx/dialog-pointer.png b/examples/quick/demos/maroon/content/gfx/dialog-pointer.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/dialog-pointer.png
rename to examples/quick/demos/maroon/content/gfx/dialog-pointer.png
diff --git a/examples/demos/maroon/content/gfx/dialog-shooter.png b/examples/quick/demos/maroon/content/gfx/dialog-shooter.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/dialog-shooter.png
rename to examples/quick/demos/maroon/content/gfx/dialog-shooter.png
diff --git a/examples/demos/maroon/content/gfx/dialog.png b/examples/quick/demos/maroon/content/gfx/dialog.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/dialog.png
rename to examples/quick/demos/maroon/content/gfx/dialog.png
diff --git a/examples/demos/maroon/content/gfx/factory-action.png b/examples/quick/demos/maroon/content/gfx/factory-action.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/factory-action.png
rename to examples/quick/demos/maroon/content/gfx/factory-action.png
diff --git a/examples/demos/maroon/content/gfx/factory-idle.png b/examples/quick/demos/maroon/content/gfx/factory-idle.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/factory-idle.png
rename to examples/quick/demos/maroon/content/gfx/factory-idle.png
diff --git a/examples/demos/maroon/content/gfx/factory.png b/examples/quick/demos/maroon/content/gfx/factory.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/factory.png
rename to examples/quick/demos/maroon/content/gfx/factory.png
diff --git a/examples/demos/maroon/content/gfx/grid.png b/examples/quick/demos/maroon/content/gfx/grid.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/grid.png
rename to examples/quick/demos/maroon/content/gfx/grid.png
diff --git a/examples/demos/maroon/content/gfx/help.png b/examples/quick/demos/maroon/content/gfx/help.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/help.png
rename to examples/quick/demos/maroon/content/gfx/help.png
diff --git a/examples/demos/maroon/content/gfx/lifes.png b/examples/quick/demos/maroon/content/gfx/lifes.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/lifes.png
rename to examples/quick/demos/maroon/content/gfx/lifes.png
diff --git a/examples/demos/maroon/content/gfx/logo-bubble.png b/examples/quick/demos/maroon/content/gfx/logo-bubble.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/logo-bubble.png
rename to examples/quick/demos/maroon/content/gfx/logo-bubble.png
diff --git a/examples/demos/maroon/content/gfx/logo-fish.png b/examples/quick/demos/maroon/content/gfx/logo-fish.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/logo-fish.png
rename to examples/quick/demos/maroon/content/gfx/logo-fish.png
diff --git a/examples/demos/maroon/content/gfx/logo.png b/examples/quick/demos/maroon/content/gfx/logo.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/logo.png
rename to examples/quick/demos/maroon/content/gfx/logo.png
diff --git a/examples/demos/maroon/content/gfx/melee-action.png b/examples/quick/demos/maroon/content/gfx/melee-action.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/melee-action.png
rename to examples/quick/demos/maroon/content/gfx/melee-action.png
diff --git a/examples/demos/maroon/content/gfx/melee-idle.png b/examples/quick/demos/maroon/content/gfx/melee-idle.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/melee-idle.png
rename to examples/quick/demos/maroon/content/gfx/melee-idle.png
diff --git a/examples/demos/maroon/content/gfx/melee.png b/examples/quick/demos/maroon/content/gfx/melee.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/melee.png
rename to examples/quick/demos/maroon/content/gfx/melee.png
diff --git a/examples/demos/maroon/content/gfx/mob-idle.png b/examples/quick/demos/maroon/content/gfx/mob-idle.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/mob-idle.png
rename to examples/quick/demos/maroon/content/gfx/mob-idle.png
diff --git a/examples/demos/maroon/content/gfx/mob.png b/examples/quick/demos/maroon/content/gfx/mob.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/mob.png
rename to examples/quick/demos/maroon/content/gfx/mob.png
diff --git a/examples/demos/maroon/content/gfx/points.png b/examples/quick/demos/maroon/content/gfx/points.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/points.png
rename to examples/quick/demos/maroon/content/gfx/points.png
diff --git a/examples/demos/maroon/content/gfx/projectile-action.png b/examples/quick/demos/maroon/content/gfx/projectile-action.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/projectile-action.png
rename to examples/quick/demos/maroon/content/gfx/projectile-action.png
diff --git a/examples/demos/maroon/content/gfx/projectile.png b/examples/quick/demos/maroon/content/gfx/projectile.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/projectile.png
rename to examples/quick/demos/maroon/content/gfx/projectile.png
diff --git a/examples/demos/maroon/content/gfx/scores.png b/examples/quick/demos/maroon/content/gfx/scores.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/scores.png
rename to examples/quick/demos/maroon/content/gfx/scores.png
diff --git a/examples/demos/maroon/content/gfx/shooter-action.png b/examples/quick/demos/maroon/content/gfx/shooter-action.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/shooter-action.png
rename to examples/quick/demos/maroon/content/gfx/shooter-action.png
diff --git a/examples/demos/maroon/content/gfx/shooter-idle.png b/examples/quick/demos/maroon/content/gfx/shooter-idle.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/shooter-idle.png
rename to examples/quick/demos/maroon/content/gfx/shooter-idle.png
diff --git a/examples/demos/maroon/content/gfx/shooter.png b/examples/quick/demos/maroon/content/gfx/shooter.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/shooter.png
rename to examples/quick/demos/maroon/content/gfx/shooter.png
diff --git a/examples/demos/maroon/content/gfx/sunlight.png b/examples/quick/demos/maroon/content/gfx/sunlight.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/sunlight.png
rename to examples/quick/demos/maroon/content/gfx/sunlight.png
diff --git a/examples/demos/maroon/content/gfx/text-1.png b/examples/quick/demos/maroon/content/gfx/text-1.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/text-1.png
rename to examples/quick/demos/maroon/content/gfx/text-1.png
diff --git a/examples/demos/maroon/content/gfx/text-2.png b/examples/quick/demos/maroon/content/gfx/text-2.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/text-2.png
rename to examples/quick/demos/maroon/content/gfx/text-2.png
diff --git a/examples/demos/maroon/content/gfx/text-3.png b/examples/quick/demos/maroon/content/gfx/text-3.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/text-3.png
rename to examples/quick/demos/maroon/content/gfx/text-3.png
diff --git a/examples/demos/maroon/content/gfx/text-blank.png b/examples/quick/demos/maroon/content/gfx/text-blank.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/text-blank.png
rename to examples/quick/demos/maroon/content/gfx/text-blank.png
diff --git a/examples/demos/maroon/content/gfx/text-gameover.png b/examples/quick/demos/maroon/content/gfx/text-gameover.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/text-gameover.png
rename to examples/quick/demos/maroon/content/gfx/text-gameover.png
diff --git a/examples/demos/maroon/content/gfx/text-go.png b/examples/quick/demos/maroon/content/gfx/text-go.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/text-go.png
rename to examples/quick/demos/maroon/content/gfx/text-go.png
diff --git a/examples/demos/maroon/content/gfx/wave.png b/examples/quick/demos/maroon/content/gfx/wave.png
similarity index 100%
rename from examples/demos/maroon/content/gfx/wave.png
rename to examples/quick/demos/maroon/content/gfx/wave.png
diff --git a/examples/demos/maroon/content/logic.js b/examples/quick/demos/maroon/content/logic.js
similarity index 100%
rename from examples/demos/maroon/content/logic.js
rename to examples/quick/demos/maroon/content/logic.js
diff --git a/examples/demos/maroon/content/mobs/MobBase.qml b/examples/quick/demos/maroon/content/mobs/MobBase.qml
similarity index 100%
rename from examples/demos/maroon/content/mobs/MobBase.qml
rename to examples/quick/demos/maroon/content/mobs/MobBase.qml
diff --git a/examples/demos/maroon/content/towers/Bomb.qml b/examples/quick/demos/maroon/content/towers/Bomb.qml
similarity index 100%
rename from examples/demos/maroon/content/towers/Bomb.qml
rename to examples/quick/demos/maroon/content/towers/Bomb.qml
diff --git a/examples/demos/maroon/content/towers/Factory.qml b/examples/quick/demos/maroon/content/towers/Factory.qml
similarity index 100%
rename from examples/demos/maroon/content/towers/Factory.qml
rename to examples/quick/demos/maroon/content/towers/Factory.qml
diff --git a/examples/demos/maroon/content/towers/Melee.qml b/examples/quick/demos/maroon/content/towers/Melee.qml
similarity index 100%
rename from examples/demos/maroon/content/towers/Melee.qml
rename to examples/quick/demos/maroon/content/towers/Melee.qml
diff --git a/examples/demos/maroon/content/towers/Ranged.qml b/examples/quick/demos/maroon/content/towers/Ranged.qml
similarity index 100%
rename from examples/demos/maroon/content/towers/Ranged.qml
rename to examples/quick/demos/maroon/content/towers/Ranged.qml
diff --git a/examples/demos/maroon/content/towers/TowerBase.qml b/examples/quick/demos/maroon/content/towers/TowerBase.qml
similarity index 100%
rename from examples/demos/maroon/content/towers/TowerBase.qml
rename to examples/quick/demos/maroon/content/towers/TowerBase.qml
diff --git a/examples/demos/maroon/main.cpp b/examples/quick/demos/maroon/main.cpp
similarity index 100%
rename from examples/demos/maroon/main.cpp
rename to examples/quick/demos/maroon/main.cpp
diff --git a/examples/quick/demos/maroon/maroon.pro b/examples/quick/demos/maroon/maroon.pro
new file mode 100644
index 0000000000000000000000000000000000000000..e193927e727ecab69699300f85622fa31794fa3b
--- /dev/null
+++ b/examples/quick/demos/maroon/maroon.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/maroon
+qml.files = maroon.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/maroon
+INSTALLS += target qml
diff --git a/examples/demos/maroon/maroon.qml b/examples/quick/demos/maroon/maroon.qml
similarity index 100%
rename from examples/demos/maroon/maroon.qml
rename to examples/quick/demos/maroon/maroon.qml
diff --git a/examples/demos/maroon/maroon.qmlproject b/examples/quick/demos/maroon/maroon.qmlproject
similarity index 100%
rename from examples/demos/maroon/maroon.qmlproject
rename to examples/quick/demos/maroon/maroon.qmlproject
diff --git a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Button.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/Button.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/Button.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/Button.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/EditableButton.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/EditableButton.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/ProgressBar.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/RssModel.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/RssModel.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/RssModel.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/Tag.qml
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/Tag.qml
rename to examples/quick/demos/photoviewer/PhotoViewerCore/Tag.qml
diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
rename to examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png
diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/busy.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/images/busy.png
rename to examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png
diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png
rename to examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png
diff --git a/examples/demos/photoviewer/PhotoViewerCore/qmldir b/examples/quick/demos/photoviewer/PhotoViewerCore/qmldir
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/qmldir
rename to examples/quick/demos/photoviewer/PhotoViewerCore/qmldir
diff --git a/examples/demos/photoviewer/PhotoViewerCore/script/script.js b/examples/quick/demos/photoviewer/PhotoViewerCore/script/script.js
similarity index 100%
rename from examples/demos/photoviewer/PhotoViewerCore/script/script.js
rename to examples/quick/demos/photoviewer/PhotoViewerCore/script/script.js
diff --git a/examples/demos/photoviewer/i18n/base.ts b/examples/quick/demos/photoviewer/i18n/base.ts
similarity index 100%
rename from examples/demos/photoviewer/i18n/base.ts
rename to examples/quick/demos/photoviewer/i18n/base.ts
diff --git a/examples/demos/photoviewer/i18n/qml_fr.qm b/examples/quick/demos/photoviewer/i18n/qml_fr.qm
similarity index 100%
rename from examples/demos/photoviewer/i18n/qml_fr.qm
rename to examples/quick/demos/photoviewer/i18n/qml_fr.qm
diff --git a/examples/demos/photoviewer/i18n/qml_fr.ts b/examples/quick/demos/photoviewer/i18n/qml_fr.ts
similarity index 100%
rename from examples/demos/photoviewer/i18n/qml_fr.ts
rename to examples/quick/demos/photoviewer/i18n/qml_fr.ts
diff --git a/examples/demos/photoviewer/photoviewer.qml b/examples/quick/demos/photoviewer/photoviewer.qml
similarity index 100%
rename from examples/demos/photoviewer/photoviewer.qml
rename to examples/quick/demos/photoviewer/photoviewer.qml
diff --git a/examples/demos/photoviewer/photoviewer.qmlproject b/examples/quick/demos/photoviewer/photoviewer.qmlproject
similarity index 100%
rename from examples/demos/photoviewer/photoviewer.qmlproject
rename to examples/quick/demos/photoviewer/photoviewer.qmlproject
diff --git a/examples/demos/rssnews/content/BusyIndicator.qml b/examples/quick/demos/rssnews/content/BusyIndicator.qml
similarity index 100%
rename from examples/demos/rssnews/content/BusyIndicator.qml
rename to examples/quick/demos/rssnews/content/BusyIndicator.qml
diff --git a/examples/demos/rssnews/content/CategoryDelegate.qml b/examples/quick/demos/rssnews/content/CategoryDelegate.qml
similarity index 100%
rename from examples/demos/rssnews/content/CategoryDelegate.qml
rename to examples/quick/demos/rssnews/content/CategoryDelegate.qml
diff --git a/examples/demos/rssnews/content/NewsDelegate.qml b/examples/quick/demos/rssnews/content/NewsDelegate.qml
similarity index 100%
rename from examples/demos/rssnews/content/NewsDelegate.qml
rename to examples/quick/demos/rssnews/content/NewsDelegate.qml
diff --git a/examples/demos/rssnews/content/RssFeeds.qml b/examples/quick/demos/rssnews/content/RssFeeds.qml
similarity index 100%
rename from examples/demos/rssnews/content/RssFeeds.qml
rename to examples/quick/demos/rssnews/content/RssFeeds.qml
diff --git a/examples/demos/rssnews/content/ScrollBar.qml b/examples/quick/demos/rssnews/content/ScrollBar.qml
similarity index 100%
rename from examples/demos/rssnews/content/ScrollBar.qml
rename to examples/quick/demos/rssnews/content/ScrollBar.qml
diff --git a/examples/demos/rssnews/content/images/busy.png b/examples/quick/demos/rssnews/content/images/busy.png
similarity index 100%
rename from examples/demos/rssnews/content/images/busy.png
rename to examples/quick/demos/rssnews/content/images/busy.png
diff --git a/examples/demos/rssnews/content/images/scrollbar.png b/examples/quick/demos/rssnews/content/images/scrollbar.png
similarity index 100%
rename from examples/demos/rssnews/content/images/scrollbar.png
rename to examples/quick/demos/rssnews/content/images/scrollbar.png
diff --git a/examples/demos/rssnews/rssnews.qml b/examples/quick/demos/rssnews/rssnews.qml
similarity index 100%
rename from examples/demos/rssnews/rssnews.qml
rename to examples/quick/demos/rssnews/rssnews.qml
diff --git a/examples/demos/rssnews/rssnews.qmlproject b/examples/quick/demos/rssnews/rssnews.qmlproject
similarity index 100%
rename from examples/demos/rssnews/rssnews.qmlproject
rename to examples/quick/demos/rssnews/rssnews.qmlproject
diff --git a/examples/demos/samegame/content/Block.qml b/examples/quick/demos/samegame/content/Block.qml
similarity index 100%
rename from examples/demos/samegame/content/Block.qml
rename to examples/quick/demos/samegame/content/Block.qml
diff --git a/examples/demos/samegame/content/BlockEmitter.qml b/examples/quick/demos/samegame/content/BlockEmitter.qml
similarity index 100%
rename from examples/demos/samegame/content/BlockEmitter.qml
rename to examples/quick/demos/samegame/content/BlockEmitter.qml
diff --git a/examples/demos/samegame/content/Button.qml b/examples/quick/demos/samegame/content/Button.qml
similarity index 100%
rename from examples/demos/samegame/content/Button.qml
rename to examples/quick/demos/samegame/content/Button.qml
diff --git a/examples/demos/samegame/content/GameArea.qml b/examples/quick/demos/samegame/content/GameArea.qml
similarity index 100%
rename from examples/demos/samegame/content/GameArea.qml
rename to examples/quick/demos/samegame/content/GameArea.qml
diff --git a/examples/demos/samegame/content/LogoAnimation.qml b/examples/quick/demos/samegame/content/LogoAnimation.qml
similarity index 100%
rename from examples/demos/samegame/content/LogoAnimation.qml
rename to examples/quick/demos/samegame/content/LogoAnimation.qml
diff --git a/examples/demos/samegame/content/MenuEmitter.qml b/examples/quick/demos/samegame/content/MenuEmitter.qml
similarity index 100%
rename from examples/demos/samegame/content/MenuEmitter.qml
rename to examples/quick/demos/samegame/content/MenuEmitter.qml
diff --git a/examples/demos/samegame/content/PaintEmitter.qml b/examples/quick/demos/samegame/content/PaintEmitter.qml
similarity index 100%
rename from examples/demos/samegame/content/PaintEmitter.qml
rename to examples/quick/demos/samegame/content/PaintEmitter.qml
diff --git a/examples/demos/samegame/content/PrimaryPack.qml b/examples/quick/demos/samegame/content/PrimaryPack.qml
similarity index 100%
rename from examples/demos/samegame/content/PrimaryPack.qml
rename to examples/quick/demos/samegame/content/PrimaryPack.qml
diff --git a/examples/demos/samegame/content/PuzzleBlock.qml b/examples/quick/demos/samegame/content/PuzzleBlock.qml
similarity index 100%
rename from examples/demos/samegame/content/PuzzleBlock.qml
rename to examples/quick/demos/samegame/content/PuzzleBlock.qml
diff --git a/examples/demos/samegame/content/SamegameText.qml b/examples/quick/demos/samegame/content/SamegameText.qml
similarity index 100%
rename from examples/demos/samegame/content/SamegameText.qml
rename to examples/quick/demos/samegame/content/SamegameText.qml
diff --git a/examples/demos/samegame/content/SimpleBlock.qml b/examples/quick/demos/samegame/content/SimpleBlock.qml
similarity index 100%
rename from examples/demos/samegame/content/SimpleBlock.qml
rename to examples/quick/demos/samegame/content/SimpleBlock.qml
diff --git a/examples/demos/samegame/content/SmokeText.qml b/examples/quick/demos/samegame/content/SmokeText.qml
similarity index 100%
rename from examples/demos/samegame/content/SmokeText.qml
rename to examples/quick/demos/samegame/content/SmokeText.qml
diff --git a/examples/demos/samegame/content/gfx/background-puzzle.png b/examples/quick/demos/samegame/content/gfx/background-puzzle.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/background-puzzle.png
rename to examples/quick/demos/samegame/content/gfx/background-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/background.png b/examples/quick/demos/samegame/content/gfx/background.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/background.png
rename to examples/quick/demos/samegame/content/gfx/background.png
diff --git a/examples/demos/samegame/content/gfx/bar.png b/examples/quick/demos/samegame/content/gfx/bar.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/bar.png
rename to examples/quick/demos/samegame/content/gfx/bar.png
diff --git a/examples/demos/samegame/content/gfx/blue-puzzle.png b/examples/quick/demos/samegame/content/gfx/blue-puzzle.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/blue-puzzle.png
rename to examples/quick/demos/samegame/content/gfx/blue-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/blue.png b/examples/quick/demos/samegame/content/gfx/blue.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/blue.png
rename to examples/quick/demos/samegame/content/gfx/blue.png
diff --git a/examples/demos/samegame/content/gfx/bubble-highscore.png b/examples/quick/demos/samegame/content/gfx/bubble-highscore.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/bubble-highscore.png
rename to examples/quick/demos/samegame/content/gfx/bubble-highscore.png
diff --git a/examples/demos/samegame/content/gfx/bubble-puzzle.png b/examples/quick/demos/samegame/content/gfx/bubble-puzzle.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/bubble-puzzle.png
rename to examples/quick/demos/samegame/content/gfx/bubble-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/but-game-1.png b/examples/quick/demos/samegame/content/gfx/but-game-1.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-game-1.png
rename to examples/quick/demos/samegame/content/gfx/but-game-1.png
diff --git a/examples/demos/samegame/content/gfx/but-game-2.png b/examples/quick/demos/samegame/content/gfx/but-game-2.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-game-2.png
rename to examples/quick/demos/samegame/content/gfx/but-game-2.png
diff --git a/examples/demos/samegame/content/gfx/but-game-3.png b/examples/quick/demos/samegame/content/gfx/but-game-3.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-game-3.png
rename to examples/quick/demos/samegame/content/gfx/but-game-3.png
diff --git a/examples/demos/samegame/content/gfx/but-game-4.png b/examples/quick/demos/samegame/content/gfx/but-game-4.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-game-4.png
rename to examples/quick/demos/samegame/content/gfx/but-game-4.png
diff --git a/examples/demos/samegame/content/gfx/but-game-new.png b/examples/quick/demos/samegame/content/gfx/but-game-new.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-game-new.png
rename to examples/quick/demos/samegame/content/gfx/but-game-new.png
diff --git a/examples/demos/samegame/content/gfx/but-menu.png b/examples/quick/demos/samegame/content/gfx/but-menu.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-menu.png
rename to examples/quick/demos/samegame/content/gfx/but-menu.png
diff --git a/examples/demos/samegame/content/gfx/but-puzzle-next.png b/examples/quick/demos/samegame/content/gfx/but-puzzle-next.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-puzzle-next.png
rename to examples/quick/demos/samegame/content/gfx/but-puzzle-next.png
diff --git a/examples/demos/samegame/content/gfx/but-quit.png b/examples/quick/demos/samegame/content/gfx/but-quit.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/but-quit.png
rename to examples/quick/demos/samegame/content/gfx/but-quit.png
diff --git a/examples/demos/samegame/content/gfx/green-puzzle.png b/examples/quick/demos/samegame/content/gfx/green-puzzle.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/green-puzzle.png
rename to examples/quick/demos/samegame/content/gfx/green-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/green.png b/examples/quick/demos/samegame/content/gfx/green.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/green.png
rename to examples/quick/demos/samegame/content/gfx/green.png
diff --git a/examples/demos/samegame/content/gfx/icon-fail.png b/examples/quick/demos/samegame/content/gfx/icon-fail.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/icon-fail.png
rename to examples/quick/demos/samegame/content/gfx/icon-fail.png
diff --git a/examples/demos/samegame/content/gfx/icon-ok.png b/examples/quick/demos/samegame/content/gfx/icon-ok.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/icon-ok.png
rename to examples/quick/demos/samegame/content/gfx/icon-ok.png
diff --git a/examples/demos/samegame/content/gfx/icon-time.png b/examples/quick/demos/samegame/content/gfx/icon-time.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/icon-time.png
rename to examples/quick/demos/samegame/content/gfx/icon-time.png
diff --git a/examples/demos/samegame/content/gfx/logo-a.png b/examples/quick/demos/samegame/content/gfx/logo-a.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/logo-a.png
rename to examples/quick/demos/samegame/content/gfx/logo-a.png
diff --git a/examples/demos/samegame/content/gfx/logo-e.png b/examples/quick/demos/samegame/content/gfx/logo-e.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/logo-e.png
rename to examples/quick/demos/samegame/content/gfx/logo-e.png
diff --git a/examples/demos/samegame/content/gfx/logo-g.png b/examples/quick/demos/samegame/content/gfx/logo-g.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/logo-g.png
rename to examples/quick/demos/samegame/content/gfx/logo-g.png
diff --git a/examples/demos/samegame/content/gfx/logo-m.png b/examples/quick/demos/samegame/content/gfx/logo-m.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/logo-m.png
rename to examples/quick/demos/samegame/content/gfx/logo-m.png
diff --git a/examples/demos/samegame/content/gfx/logo-s.png b/examples/quick/demos/samegame/content/gfx/logo-s.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/logo-s.png
rename to examples/quick/demos/samegame/content/gfx/logo-s.png
diff --git a/examples/demos/samegame/content/gfx/logo.png b/examples/quick/demos/samegame/content/gfx/logo.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/logo.png
rename to examples/quick/demos/samegame/content/gfx/logo.png
diff --git a/examples/demos/samegame/content/gfx/particle-brick.png b/examples/quick/demos/samegame/content/gfx/particle-brick.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/particle-brick.png
rename to examples/quick/demos/samegame/content/gfx/particle-brick.png
diff --git a/examples/demos/samegame/content/gfx/particle-paint.png b/examples/quick/demos/samegame/content/gfx/particle-paint.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/particle-paint.png
rename to examples/quick/demos/samegame/content/gfx/particle-paint.png
diff --git a/examples/demos/samegame/content/gfx/particle-smoke.png b/examples/quick/demos/samegame/content/gfx/particle-smoke.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/particle-smoke.png
rename to examples/quick/demos/samegame/content/gfx/particle-smoke.png
diff --git a/examples/demos/samegame/content/gfx/red-puzzle.png b/examples/quick/demos/samegame/content/gfx/red-puzzle.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/red-puzzle.png
rename to examples/quick/demos/samegame/content/gfx/red-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/red.png b/examples/quick/demos/samegame/content/gfx/red.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/red.png
rename to examples/quick/demos/samegame/content/gfx/red.png
diff --git a/examples/demos/samegame/content/gfx/text-highscore-new.png b/examples/quick/demos/samegame/content/gfx/text-highscore-new.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-highscore-new.png
rename to examples/quick/demos/samegame/content/gfx/text-highscore-new.png
diff --git a/examples/demos/samegame/content/gfx/text-highscore.png b/examples/quick/demos/samegame/content/gfx/text-highscore.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-highscore.png
rename to examples/quick/demos/samegame/content/gfx/text-highscore.png
diff --git a/examples/demos/samegame/content/gfx/text-no-winner.png b/examples/quick/demos/samegame/content/gfx/text-no-winner.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-no-winner.png
rename to examples/quick/demos/samegame/content/gfx/text-no-winner.png
diff --git a/examples/demos/samegame/content/gfx/text-p1-go.png b/examples/quick/demos/samegame/content/gfx/text-p1-go.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-p1-go.png
rename to examples/quick/demos/samegame/content/gfx/text-p1-go.png
diff --git a/examples/demos/samegame/content/gfx/text-p1-won.png b/examples/quick/demos/samegame/content/gfx/text-p1-won.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-p1-won.png
rename to examples/quick/demos/samegame/content/gfx/text-p1-won.png
diff --git a/examples/demos/samegame/content/gfx/text-p1.png b/examples/quick/demos/samegame/content/gfx/text-p1.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-p1.png
rename to examples/quick/demos/samegame/content/gfx/text-p1.png
diff --git a/examples/demos/samegame/content/gfx/text-p2-go.png b/examples/quick/demos/samegame/content/gfx/text-p2-go.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-p2-go.png
rename to examples/quick/demos/samegame/content/gfx/text-p2-go.png
diff --git a/examples/demos/samegame/content/gfx/text-p2-won.png b/examples/quick/demos/samegame/content/gfx/text-p2-won.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-p2-won.png
rename to examples/quick/demos/samegame/content/gfx/text-p2-won.png
diff --git a/examples/demos/samegame/content/gfx/text-p2.png b/examples/quick/demos/samegame/content/gfx/text-p2.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/text-p2.png
rename to examples/quick/demos/samegame/content/gfx/text-p2.png
diff --git a/examples/demos/samegame/content/gfx/yellow-puzzle.png b/examples/quick/demos/samegame/content/gfx/yellow-puzzle.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/yellow-puzzle.png
rename to examples/quick/demos/samegame/content/gfx/yellow-puzzle.png
diff --git a/examples/demos/samegame/content/gfx/yellow.png b/examples/quick/demos/samegame/content/gfx/yellow.png
similarity index 100%
rename from examples/demos/samegame/content/gfx/yellow.png
rename to examples/quick/demos/samegame/content/gfx/yellow.png
diff --git a/examples/demos/samegame/content/levels/TemplateBase.qml b/examples/quick/demos/samegame/content/levels/TemplateBase.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/TemplateBase.qml
rename to examples/quick/demos/samegame/content/levels/TemplateBase.qml
diff --git a/examples/demos/samegame/content/levels/level0.qml b/examples/quick/demos/samegame/content/levels/level0.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level0.qml
rename to examples/quick/demos/samegame/content/levels/level0.qml
diff --git a/examples/demos/samegame/content/levels/level1.qml b/examples/quick/demos/samegame/content/levels/level1.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level1.qml
rename to examples/quick/demos/samegame/content/levels/level1.qml
diff --git a/examples/demos/samegame/content/levels/level2.qml b/examples/quick/demos/samegame/content/levels/level2.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level2.qml
rename to examples/quick/demos/samegame/content/levels/level2.qml
diff --git a/examples/demos/samegame/content/levels/level3.qml b/examples/quick/demos/samegame/content/levels/level3.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level3.qml
rename to examples/quick/demos/samegame/content/levels/level3.qml
diff --git a/examples/demos/samegame/content/levels/level4.qml b/examples/quick/demos/samegame/content/levels/level4.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level4.qml
rename to examples/quick/demos/samegame/content/levels/level4.qml
diff --git a/examples/demos/samegame/content/levels/level5.qml b/examples/quick/demos/samegame/content/levels/level5.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level5.qml
rename to examples/quick/demos/samegame/content/levels/level5.qml
diff --git a/examples/demos/samegame/content/levels/level6.qml b/examples/quick/demos/samegame/content/levels/level6.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level6.qml
rename to examples/quick/demos/samegame/content/levels/level6.qml
diff --git a/examples/demos/samegame/content/levels/level7.qml b/examples/quick/demos/samegame/content/levels/level7.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level7.qml
rename to examples/quick/demos/samegame/content/levels/level7.qml
diff --git a/examples/demos/samegame/content/levels/level8.qml b/examples/quick/demos/samegame/content/levels/level8.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level8.qml
rename to examples/quick/demos/samegame/content/levels/level8.qml
diff --git a/examples/demos/samegame/content/levels/level9.qml b/examples/quick/demos/samegame/content/levels/level9.qml
similarity index 100%
rename from examples/demos/samegame/content/levels/level9.qml
rename to examples/quick/demos/samegame/content/levels/level9.qml
diff --git a/examples/demos/samegame/content/samegame.js b/examples/quick/demos/samegame/content/samegame.js
similarity index 100%
rename from examples/demos/samegame/content/samegame.js
rename to examples/quick/demos/samegame/content/samegame.js
diff --git a/examples/demos/samegame/main.cpp b/examples/quick/demos/samegame/main.cpp
similarity index 100%
rename from examples/demos/samegame/main.cpp
rename to examples/quick/demos/samegame/main.cpp
diff --git a/examples/quick/demos/samegame/samegame.pro b/examples/quick/demos/samegame/samegame.pro
new file mode 100644
index 0000000000000000000000000000000000000000..fec2e53018ddd9f257c84a87afca54f2cd11f802
--- /dev/null
+++ b/examples/quick/demos/samegame/samegame.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame
+qml.files = samegame.qml content settings.js
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame
+INSTALLS += target qml
diff --git a/examples/demos/samegame/samegame.qml b/examples/quick/demos/samegame/samegame.qml
similarity index 100%
rename from examples/demos/samegame/samegame.qml
rename to examples/quick/demos/samegame/samegame.qml
diff --git a/examples/demos/samegame/samegame.qmlproject b/examples/quick/demos/samegame/samegame.qmlproject
similarity index 100%
rename from examples/demos/samegame/samegame.qmlproject
rename to examples/quick/demos/samegame/samegame.qmlproject
diff --git a/examples/demos/samegame/settings.js b/examples/quick/demos/samegame/settings.js
similarity index 100%
rename from examples/demos/samegame/settings.js
rename to examples/quick/demos/samegame/settings.js
diff --git a/examples/demos/stocqt/content/Button.qml b/examples/quick/demos/stocqt/content/Button.qml
similarity index 100%
rename from examples/demos/stocqt/content/Button.qml
rename to examples/quick/demos/stocqt/content/Button.qml
diff --git a/examples/demos/stocqt/content/DatePicker.qml b/examples/quick/demos/stocqt/content/DatePicker.qml
similarity index 100%
rename from examples/demos/stocqt/content/DatePicker.qml
rename to examples/quick/demos/stocqt/content/DatePicker.qml
diff --git a/examples/demos/stocqt/content/StockChart.qml b/examples/quick/demos/stocqt/content/StockChart.qml
similarity index 100%
rename from examples/demos/stocqt/content/StockChart.qml
rename to examples/quick/demos/stocqt/content/StockChart.qml
diff --git a/examples/demos/stocqt/content/StockListModel.qml b/examples/quick/demos/stocqt/content/StockListModel.qml
similarity index 100%
rename from examples/demos/stocqt/content/StockListModel.qml
rename to examples/quick/demos/stocqt/content/StockListModel.qml
diff --git a/examples/demos/stocqt/content/StockListView.qml b/examples/quick/demos/stocqt/content/StockListView.qml
similarity index 100%
rename from examples/demos/stocqt/content/StockListView.qml
rename to examples/quick/demos/stocqt/content/StockListView.qml
diff --git a/examples/demos/stocqt/content/StockModel.qml b/examples/quick/demos/stocqt/content/StockModel.qml
similarity index 100%
rename from examples/demos/stocqt/content/StockModel.qml
rename to examples/quick/demos/stocqt/content/StockModel.qml
diff --git a/examples/demos/stocqt/content/StockSettings.qml b/examples/quick/demos/stocqt/content/StockSettings.qml
similarity index 100%
rename from examples/demos/stocqt/content/StockSettings.qml
rename to examples/quick/demos/stocqt/content/StockSettings.qml
diff --git a/examples/demos/stocqt/content/StockView.qml b/examples/quick/demos/stocqt/content/StockView.qml
similarity index 100%
rename from examples/demos/stocqt/content/StockView.qml
rename to examples/quick/demos/stocqt/content/StockView.qml
diff --git a/examples/demos/stocqt/content/images/icon-calendar-anim.png b/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png
similarity index 100%
rename from examples/demos/stocqt/content/images/icon-calendar-anim.png
rename to examples/quick/demos/stocqt/content/images/icon-calendar-anim.png
diff --git a/examples/demos/stocqt/content/images/icon-calendar.png b/examples/quick/demos/stocqt/content/images/icon-calendar.png
similarity index 100%
rename from examples/demos/stocqt/content/images/icon-calendar.png
rename to examples/quick/demos/stocqt/content/images/icon-calendar.png
diff --git a/examples/demos/stocqt/content/images/icon-items.png b/examples/quick/demos/stocqt/content/images/icon-items.png
similarity index 100%
rename from examples/demos/stocqt/content/images/icon-items.png
rename to examples/quick/demos/stocqt/content/images/icon-items.png
diff --git a/examples/demos/stocqt/content/images/icon-settings.png b/examples/quick/demos/stocqt/content/images/icon-settings.png
similarity index 100%
rename from examples/demos/stocqt/content/images/icon-settings.png
rename to examples/quick/demos/stocqt/content/images/icon-settings.png
diff --git a/examples/demos/stocqt/content/images/logo.png b/examples/quick/demos/stocqt/content/images/logo.png
similarity index 100%
rename from examples/demos/stocqt/content/images/logo.png
rename to examples/quick/demos/stocqt/content/images/logo.png
diff --git a/examples/demos/stocqt/content/images/stock-selected.png b/examples/quick/demos/stocqt/content/images/stock-selected.png
similarity index 100%
rename from examples/demos/stocqt/content/images/stock-selected.png
rename to examples/quick/demos/stocqt/content/images/stock-selected.png
diff --git a/examples/demos/stocqt/content/images/wheel-touch.png b/examples/quick/demos/stocqt/content/images/wheel-touch.png
similarity index 100%
rename from examples/demos/stocqt/content/images/wheel-touch.png
rename to examples/quick/demos/stocqt/content/images/wheel-touch.png
diff --git a/examples/demos/stocqt/content/images/wheel.png b/examples/quick/demos/stocqt/content/images/wheel.png
similarity index 100%
rename from examples/demos/stocqt/content/images/wheel.png
rename to examples/quick/demos/stocqt/content/images/wheel.png
diff --git a/examples/demos/stocqt/main.cpp b/examples/quick/demos/stocqt/main.cpp
similarity index 100%
rename from examples/demos/stocqt/main.cpp
rename to examples/quick/demos/stocqt/main.cpp
diff --git a/examples/quick/demos/stocqt/stocqt.pro b/examples/quick/demos/stocqt/stocqt.pro
new file mode 100644
index 0000000000000000000000000000000000000000..f33c4aee01f0dbec6e7d15a5c3b70810f8bbcc84
--- /dev/null
+++ b/examples/quick/demos/stocqt/stocqt.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += qml quick
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt
+qml.files = stocqt.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt
+INSTALLS += target qml
diff --git a/examples/demos/stocqt/stocqt.qml b/examples/quick/demos/stocqt/stocqt.qml
similarity index 100%
rename from examples/demos/stocqt/stocqt.qml
rename to examples/quick/demos/stocqt/stocqt.qml
diff --git a/examples/demos/stocqt/stocqt.qmlproject b/examples/quick/demos/stocqt/stocqt.qmlproject
similarity index 100%
rename from examples/demos/stocqt/stocqt.qmlproject
rename to examples/quick/demos/stocqt/stocqt.qmlproject
diff --git a/examples/demos/tweetsearch/content/FlipBar.qml b/examples/quick/demos/tweetsearch/content/FlipBar.qml
similarity index 100%
rename from examples/demos/tweetsearch/content/FlipBar.qml
rename to examples/quick/demos/tweetsearch/content/FlipBar.qml
diff --git a/examples/demos/tweetsearch/content/LineInput.qml b/examples/quick/demos/tweetsearch/content/LineInput.qml
similarity index 100%
rename from examples/demos/tweetsearch/content/LineInput.qml
rename to examples/quick/demos/tweetsearch/content/LineInput.qml
diff --git a/examples/demos/tweetsearch/content/ListFooter.qml b/examples/quick/demos/tweetsearch/content/ListFooter.qml
similarity index 100%
rename from examples/demos/tweetsearch/content/ListFooter.qml
rename to examples/quick/demos/tweetsearch/content/ListFooter.qml
diff --git a/examples/demos/tweetsearch/content/ListHeader.qml b/examples/quick/demos/tweetsearch/content/ListHeader.qml
similarity index 100%
rename from examples/demos/tweetsearch/content/ListHeader.qml
rename to examples/quick/demos/tweetsearch/content/ListHeader.qml
diff --git a/examples/demos/tweetsearch/content/SearchDelegate.qml b/examples/quick/demos/tweetsearch/content/SearchDelegate.qml
similarity index 100%
rename from examples/demos/tweetsearch/content/SearchDelegate.qml
rename to examples/quick/demos/tweetsearch/content/SearchDelegate.qml
diff --git a/examples/demos/tweetsearch/content/TweetDelegate.qml b/examples/quick/demos/tweetsearch/content/TweetDelegate.qml
similarity index 100%
rename from examples/demos/tweetsearch/content/TweetDelegate.qml
rename to examples/quick/demos/tweetsearch/content/TweetDelegate.qml
diff --git a/examples/demos/tweetsearch/content/TweetsModel.qml b/examples/quick/demos/tweetsearch/content/TweetsModel.qml
similarity index 100%
rename from examples/demos/tweetsearch/content/TweetsModel.qml
rename to examples/quick/demos/tweetsearch/content/TweetsModel.qml
diff --git a/examples/demos/tweetsearch/content/resources/anonymous.png b/examples/quick/demos/tweetsearch/content/resources/anonymous.png
similarity index 100%
rename from examples/demos/tweetsearch/content/resources/anonymous.png
rename to examples/quick/demos/tweetsearch/content/resources/anonymous.png
diff --git a/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png b/examples/quick/demos/tweetsearch/content/resources/bird-anim-sprites.png
similarity index 100%
rename from examples/demos/tweetsearch/content/resources/bird-anim-sprites.png
rename to examples/quick/demos/tweetsearch/content/resources/bird-anim-sprites.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-clear.png b/examples/quick/demos/tweetsearch/content/resources/icon-clear.png
similarity index 100%
rename from examples/demos/tweetsearch/content/resources/icon-clear.png
rename to examples/quick/demos/tweetsearch/content/resources/icon-clear.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-loading.png b/examples/quick/demos/tweetsearch/content/resources/icon-loading.png
similarity index 100%
rename from examples/demos/tweetsearch/content/resources/icon-loading.png
rename to examples/quick/demos/tweetsearch/content/resources/icon-loading.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-refresh.png b/examples/quick/demos/tweetsearch/content/resources/icon-refresh.png
similarity index 100%
rename from examples/demos/tweetsearch/content/resources/icon-refresh.png
rename to examples/quick/demos/tweetsearch/content/resources/icon-refresh.png
diff --git a/examples/demos/tweetsearch/content/resources/icon-search.png b/examples/quick/demos/tweetsearch/content/resources/icon-search.png
similarity index 100%
rename from examples/demos/tweetsearch/content/resources/icon-search.png
rename to examples/quick/demos/tweetsearch/content/resources/icon-search.png
diff --git a/examples/demos/tweetsearch/content/tweetsearch.js b/examples/quick/demos/tweetsearch/content/tweetsearch.js
similarity index 100%
rename from examples/demos/tweetsearch/content/tweetsearch.js
rename to examples/quick/demos/tweetsearch/content/tweetsearch.js
diff --git a/examples/demos/tweetsearch/main.cpp b/examples/quick/demos/tweetsearch/main.cpp
similarity index 100%
rename from examples/demos/tweetsearch/main.cpp
rename to examples/quick/demos/tweetsearch/main.cpp
diff --git a/examples/quick/demos/tweetsearch/tweetsearch.pro b/examples/quick/demos/tweetsearch/tweetsearch.pro
new file mode 100644
index 0000000000000000000000000000000000000000..887c05af88241d96b3500d39c3452a68cf416bf0
--- /dev/null
+++ b/examples/quick/demos/tweetsearch/tweetsearch.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/tweetsearch
+qml.files = tweetsearch.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/tweetsearch
+INSTALLS += target qml
diff --git a/examples/demos/tweetsearch/tweetsearch.qml b/examples/quick/demos/tweetsearch/tweetsearch.qml
similarity index 100%
rename from examples/demos/tweetsearch/tweetsearch.qml
rename to examples/quick/demos/tweetsearch/tweetsearch.qml
diff --git a/examples/demos/tweetsearch/tweetsearch.qmlproject b/examples/quick/demos/tweetsearch/tweetsearch.qmlproject
similarity index 100%
rename from examples/demos/tweetsearch/tweetsearch.qmlproject
rename to examples/quick/demos/tweetsearch/tweetsearch.qmlproject
diff --git a/examples/quick/draganddrop/draganddrop.pro b/examples/quick/draganddrop/draganddrop.pro
index 7ec3e0e58a90242633831b5c75d428188e56f7c0..451d03ad324006547528fafdabd6d4998bc695c9 100644
--- a/examples/quick/draganddrop/draganddrop.pro
+++ b/examples/quick/draganddrop/draganddrop.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/draganddrop
 qml.files = draganddrop.qml tiles views
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop
-sources.files = $$SOURCES draganddrop.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/draganddrop
+INSTALLS += target qml
diff --git a/examples/quick/draganddrop/draganddrop.qml b/examples/quick/draganddrop/draganddrop.qml
index 300a7abb201796a46b9069e43cf0855e06e0b9aa..234ea8b80637627aa1edc59b793da53b6e84430c 100644
--- a/examples/quick/draganddrop/draganddrop.qml
+++ b/examples/quick/draganddrop/draganddrop.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/draganddrop/main.cpp b/examples/quick/draganddrop/main.cpp
index cc08df9ff4b7bd26ff1c8228e7d82bad36a00dbb..7a7adf239133d38621fefd5c39ed9a8785ae3111 100644
--- a/examples/quick/draganddrop/main.cpp
+++ b/examples/quick/draganddrop/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(draganddrop)
diff --git a/examples/quick/imageelements/imageelements.pro b/examples/quick/imageelements/imageelements.pro
index eddfb7429a7497a73794f9764161cb9654743964..281b44f112d73206e1d9e52b94a5c6730ed08843 100644
--- a/examples/quick/imageelements/imageelements.pro
+++ b/examples/quick/imageelements/imageelements.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageelements
 qml.files = *.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements
-sources.files = $$SOURCES imageelements.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageelements
+INSTALLS += target qml
diff --git a/examples/quick/imageelements/imageelements.qml b/examples/quick/imageelements/imageelements.qml
index 22ab45866b99b0b79c96fb67c93a42f6d9a67a54..a68ed3e73a9941059d071c502e4a135708049af5 100644
--- a/examples/quick/imageelements/imageelements.qml
+++ b/examples/quick/imageelements/imageelements.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared"
+import "../shared"
 
 Item {
     height: 480
diff --git a/examples/quick/imageelements/main.cpp b/examples/quick/imageelements/main.cpp
index af4674e1029997dc2c656717e0d973f3006adb38..aa624e2229fdbe4cf80d7103c4178a57cae718b4 100644
--- a/examples/quick/imageelements/main.cpp
+++ b/examples/quick/imageelements/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(imageelements)
diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro
index 740001362e20bd986994d35ad345747c9db8dd0b..a0c65be2d1a69f5ca119d9f3508ec1cf34d0b177 100644
--- a/examples/quick/keyinteraction/keyinteraction.pro
+++ b/examples/quick/keyinteraction/keyinteraction.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/keyinteraction
 qml.files = keyinteraction.qml focus
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction
-sources.files = $$SOURCES keyinteraction.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/keyinteraction
+INSTALLS += target qml
diff --git a/examples/quick/keyinteraction/keyinteraction.qml b/examples/quick/keyinteraction/keyinteraction.qml
index 66a003172e5983d8d1263ba6c8809976b750ab33..6a227ae08b43bad9c01d2114df72e72010fe89ec 100644
--- a/examples/quick/keyinteraction/keyinteraction.qml
+++ b/examples/quick/keyinteraction/keyinteraction.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Loader {//Just loader, since there's only one.
     source: "focus/focus.qml"
diff --git a/examples/quick/keyinteraction/main.cpp b/examples/quick/keyinteraction/main.cpp
index bbef71aec7a146d19d4c3cda69fc94a447d08735..e82e1d86cd77ca84591d5f8c0a0bdc659c8c26d6 100644
--- a/examples/quick/keyinteraction/main.cpp
+++ b/examples/quick/keyinteraction/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(keyinteraction)
diff --git a/examples/localstorage/doc/src/localstorage.qdoc b/examples/quick/localstorage/doc/src/localstorage.qdoc
similarity index 100%
rename from examples/localstorage/doc/src/localstorage.qdoc
rename to examples/quick/localstorage/doc/src/localstorage.qdoc
diff --git a/examples/quick/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage.pro
new file mode 100644
index 0000000000000000000000000000000000000000..dd2eb8025011575235789a0215ff62386b11f933
--- /dev/null
+++ b/examples/quick/localstorage/localstorage.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += localstorage
diff --git a/examples/localstorage/localstorage/hello.qml b/examples/quick/localstorage/localstorage/hello.qml
similarity index 100%
rename from examples/localstorage/localstorage/hello.qml
rename to examples/quick/localstorage/localstorage/hello.qml
diff --git a/examples/quick/localstorage/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage/localstorage.pro
new file mode 100644
index 0000000000000000000000000000000000000000..ef90b6354630e76d239cba6ceafcc859bd6cf609
--- /dev/null
+++ b/examples/quick/localstorage/localstorage/localstorage.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage
+qml.files = localstorage.qml hello.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage
+INSTALLS += target qml
diff --git a/examples/localstorage/localstorage/localstorage.qml b/examples/quick/localstorage/localstorage/localstorage.qml
similarity index 100%
rename from examples/localstorage/localstorage/localstorage.qml
rename to examples/quick/localstorage/localstorage/localstorage.qml
diff --git a/examples/localstorage/localstorage/localstorage.qmlproject b/examples/quick/localstorage/localstorage/localstorage.qmlproject
similarity index 100%
rename from examples/localstorage/localstorage/localstorage.qmlproject
rename to examples/quick/localstorage/localstorage/localstorage.qmlproject
diff --git a/examples/localstorage/localstorage/main.cpp b/examples/quick/localstorage/localstorage/main.cpp
similarity index 100%
rename from examples/localstorage/localstorage/main.cpp
rename to examples/quick/localstorage/localstorage/main.cpp
diff --git a/examples/quick/modelviews/browser.prx b/examples/quick/modelviews/browser.prx
new file mode 100644
index 0000000000000000000000000000000000000000..e9beacf0fb47a966036a9a14638356a93bdcec7c
--- /dev/null
+++ b/examples/quick/modelviews/browser.prx
@@ -0,0 +1,18 @@
+TEMPLATE = app
+TARGET = modelviews
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/modelviews
+qml.files = \
+    modelviews.qml \
+    gridview \
+    listview \
+    package \
+    parallax \
+    pathview \
+    visualdatamodel \
+    visualitemmodel
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/modelviews
+INSTALLS += target qml
diff --git a/examples/quick/modelviews/main.cpp b/examples/quick/modelviews/main.cpp
index 082001cad2d5eaa5f5ad2af33b087f15905218e3..84d52cbc127b340f733ebe63160e20ed0437772b 100644
--- a/examples/quick/modelviews/main.cpp
+++ b/examples/quick/modelviews/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(modelviews)
diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro
index 695c010263face8ec67a3f26da4d12651ca02476..101408f28dba10fe9fdff22aa120fd98756efe48 100644
--- a/examples/quick/modelviews/modelviews.pro
+++ b/examples/quick/modelviews/modelviews.pro
@@ -1,19 +1,8 @@
-TEMPLATE = app
+TEMPLATE = subdirs
 
-QT += quick qml
-SOURCES += main.cpp
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews
-qml.files = \
-        modelviews.qml \
-        gridview \
-        listview \
-        package \
-        parallax \
-        pathview \
-        visualdatamodel \
-        visualitemmodel
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews
-sources.files = $$SOURCES modelviews.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+browser.file = browser.prx
+SUBDIRS = \
+    browser \
+#    abstractitemmodel \ # Does not build
+    objectlistmodel \
+    stringlistmodel
diff --git a/examples/quick/modelviews/modelviews.qml b/examples/quick/modelviews/modelviews.qml
index d86bbf3416fc5c1288c7076fa2d6bc405f3f4532..2df91db7ff79e50f03a2c10228c782165531d3cc 100644
--- a/examples/quick/modelviews/modelviews.qml
+++ b/examples/quick/modelviews/modelviews.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/mousearea/main.cpp b/examples/quick/mousearea/main.cpp
index d7fccf8f6caaa2374f3d68bcb1663cf1b15b8d67..34e0b3b396f6734c5b82d96f10ca56d6740bdd4d 100644
--- a/examples/quick/mousearea/main.cpp
+++ b/examples/quick/mousearea/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(mousearea)
diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro
index cb876e41b545fd9735f29512e6e47af93a44d0d8..eba203ba1842e34478adc3cccf4e78cd1d13866c 100644
--- a/examples/quick/mousearea/mousearea.pro
+++ b/examples/quick/mousearea/mousearea.pro
@@ -3,9 +3,10 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea
+EXAMPLE_FILES = \
+    mousearea-wheel-example.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/mousearea
 qml.files = mousearea.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea
-sources.files = $$SOURCES mousearea.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/mousearea
+INSTALLS += target qml
diff --git a/examples/quick/particles/affectors/affectors.pro b/examples/quick/particles/affectors/affectors.pro
new file mode 100644
index 0000000000000000000000000000000000000000..9d7c3de059d14a0e29e0c24e2a0721ee2a7b6e25
--- /dev/null
+++ b/examples/quick/particles/affectors/affectors.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/affectors
+qml.files = affectors.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/affectors
+INSTALLS += target qml
diff --git a/examples/particles/affectors/affectors.qml b/examples/quick/particles/affectors/affectors.qml
similarity index 100%
rename from examples/particles/affectors/affectors.qml
rename to examples/quick/particles/affectors/affectors.qml
diff --git a/examples/particles/affectors/affectors.qmlproject b/examples/quick/particles/affectors/affectors.qmlproject
similarity index 100%
rename from examples/particles/affectors/affectors.qmlproject
rename to examples/quick/particles/affectors/affectors.qmlproject
diff --git a/examples/particles/affectors/content/GreyButton.qml b/examples/quick/particles/affectors/content/GreyButton.qml
similarity index 100%
rename from examples/particles/affectors/content/GreyButton.qml
rename to examples/quick/particles/affectors/content/GreyButton.qml
diff --git a/examples/particles/affectors/content/age.qml b/examples/quick/particles/affectors/content/age.qml
similarity index 100%
rename from examples/particles/affectors/content/age.qml
rename to examples/quick/particles/affectors/content/age.qml
diff --git a/examples/particles/affectors/content/attractor.qml b/examples/quick/particles/affectors/content/attractor.qml
similarity index 100%
rename from examples/particles/affectors/content/attractor.qml
rename to examples/quick/particles/affectors/content/attractor.qml
diff --git a/examples/particles/affectors/content/customaffector.qml b/examples/quick/particles/affectors/content/customaffector.qml
similarity index 100%
rename from examples/particles/affectors/content/customaffector.qml
rename to examples/quick/particles/affectors/content/customaffector.qml
diff --git a/examples/particles/affectors/content/friction.qml b/examples/quick/particles/affectors/content/friction.qml
similarity index 100%
rename from examples/particles/affectors/content/friction.qml
rename to examples/quick/particles/affectors/content/friction.qml
diff --git a/examples/particles/affectors/content/gravity.qml b/examples/quick/particles/affectors/content/gravity.qml
similarity index 100%
rename from examples/particles/affectors/content/gravity.qml
rename to examples/quick/particles/affectors/content/gravity.qml
diff --git a/examples/particles/affectors/content/groupgoal.qml b/examples/quick/particles/affectors/content/groupgoal.qml
similarity index 100%
rename from examples/particles/affectors/content/groupgoal.qml
rename to examples/quick/particles/affectors/content/groupgoal.qml
diff --git a/examples/particles/affectors/content/move.qml b/examples/quick/particles/affectors/content/move.qml
similarity index 100%
rename from examples/particles/affectors/content/move.qml
rename to examples/quick/particles/affectors/content/move.qml
diff --git a/examples/particles/affectors/content/spritegoal.qml b/examples/quick/particles/affectors/content/spritegoal.qml
similarity index 100%
rename from examples/particles/affectors/content/spritegoal.qml
rename to examples/quick/particles/affectors/content/spritegoal.qml
diff --git a/examples/particles/affectors/content/turbulence.qml b/examples/quick/particles/affectors/content/turbulence.qml
similarity index 100%
rename from examples/particles/affectors/content/turbulence.qml
rename to examples/quick/particles/affectors/content/turbulence.qml
diff --git a/examples/particles/affectors/content/wander.qml b/examples/quick/particles/affectors/content/wander.qml
similarity index 100%
rename from examples/particles/affectors/content/wander.qml
rename to examples/quick/particles/affectors/content/wander.qml
diff --git a/examples/particles/affectors/doc/images/qml-affectors-example.png b/examples/quick/particles/affectors/doc/images/qml-affectors-example.png
similarity index 100%
rename from examples/particles/affectors/doc/images/qml-affectors-example.png
rename to examples/quick/particles/affectors/doc/images/qml-affectors-example.png
diff --git a/examples/particles/affectors/doc/src/affectors.qdoc b/examples/quick/particles/affectors/doc/src/affectors.qdoc
similarity index 100%
rename from examples/particles/affectors/doc/src/affectors.qdoc
rename to examples/quick/particles/affectors/doc/src/affectors.qdoc
diff --git a/examples/particles/affectors/main.cpp b/examples/quick/particles/affectors/main.cpp
similarity index 100%
rename from examples/particles/affectors/main.cpp
rename to examples/quick/particles/affectors/main.cpp
diff --git a/examples/particles/customparticle/content/blurparticles.qml b/examples/quick/particles/customparticle/content/blurparticles.qml
similarity index 100%
rename from examples/particles/customparticle/content/blurparticles.qml
rename to examples/quick/particles/customparticle/content/blurparticles.qml
diff --git a/examples/particles/customparticle/content/fragmentshader.qml b/examples/quick/particles/customparticle/content/fragmentshader.qml
similarity index 100%
rename from examples/particles/customparticle/content/fragmentshader.qml
rename to examples/quick/particles/customparticle/content/fragmentshader.qml
diff --git a/examples/particles/customparticle/content/imagecolors.qml b/examples/quick/particles/customparticle/content/imagecolors.qml
similarity index 100%
rename from examples/particles/customparticle/content/imagecolors.qml
rename to examples/quick/particles/customparticle/content/imagecolors.qml
diff --git a/examples/quick/particles/customparticle/customparticle.pro b/examples/quick/particles/customparticle/customparticle.pro
new file mode 100644
index 0000000000000000000000000000000000000000..77db1a6aab76d9edb6ebf364bcfc66c3adf71a06
--- /dev/null
+++ b/examples/quick/particles/customparticle/customparticle.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/customparticle
+qml.files = customparticle.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/customparticle
+INSTALLS += target qml
diff --git a/examples/particles/customparticle/customparticle.qml b/examples/quick/particles/customparticle/customparticle.qml
similarity index 100%
rename from examples/particles/customparticle/customparticle.qml
rename to examples/quick/particles/customparticle/customparticle.qml
diff --git a/examples/particles/customparticle/customparticle.qmlproject b/examples/quick/particles/customparticle/customparticle.qmlproject
similarity index 100%
rename from examples/particles/customparticle/customparticle.qmlproject
rename to examples/quick/particles/customparticle/customparticle.qmlproject
diff --git a/examples/particles/customparticle/doc/images/qml-customparticle-example.png b/examples/quick/particles/customparticle/doc/images/qml-customparticle-example.png
similarity index 100%
rename from examples/particles/customparticle/doc/images/qml-customparticle-example.png
rename to examples/quick/particles/customparticle/doc/images/qml-customparticle-example.png
diff --git a/examples/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc
similarity index 100%
rename from examples/particles/customparticle/doc/src/customparticle.qdoc
rename to examples/quick/particles/customparticle/doc/src/customparticle.qdoc
diff --git a/examples/particles/customparticle/main.cpp b/examples/quick/particles/customparticle/main.cpp
similarity index 100%
rename from examples/particles/customparticle/main.cpp
rename to examples/quick/particles/customparticle/main.cpp
diff --git a/examples/particles/emitters/content/burstandpulse.qml b/examples/quick/particles/emitters/content/burstandpulse.qml
similarity index 100%
rename from examples/particles/emitters/content/burstandpulse.qml
rename to examples/quick/particles/emitters/content/burstandpulse.qml
diff --git a/examples/particles/emitters/content/customemitter.qml b/examples/quick/particles/emitters/content/customemitter.qml
similarity index 100%
rename from examples/particles/emitters/content/customemitter.qml
rename to examples/quick/particles/emitters/content/customemitter.qml
diff --git a/examples/particles/emitters/content/emitmask.qml b/examples/quick/particles/emitters/content/emitmask.qml
similarity index 100%
rename from examples/particles/emitters/content/emitmask.qml
rename to examples/quick/particles/emitters/content/emitmask.qml
diff --git a/examples/particles/emitters/content/maximumemitted.qml b/examples/quick/particles/emitters/content/maximumemitted.qml
similarity index 100%
rename from examples/particles/emitters/content/maximumemitted.qml
rename to examples/quick/particles/emitters/content/maximumemitted.qml
diff --git a/examples/particles/emitters/content/shapeanddirection.qml b/examples/quick/particles/emitters/content/shapeanddirection.qml
similarity index 100%
rename from examples/particles/emitters/content/shapeanddirection.qml
rename to examples/quick/particles/emitters/content/shapeanddirection.qml
diff --git a/examples/particles/emitters/content/trailemitter.qml b/examples/quick/particles/emitters/content/trailemitter.qml
similarity index 100%
rename from examples/particles/emitters/content/trailemitter.qml
rename to examples/quick/particles/emitters/content/trailemitter.qml
diff --git a/examples/particles/emitters/content/velocityfrommotion.qml b/examples/quick/particles/emitters/content/velocityfrommotion.qml
similarity index 100%
rename from examples/particles/emitters/content/velocityfrommotion.qml
rename to examples/quick/particles/emitters/content/velocityfrommotion.qml
diff --git a/examples/particles/emitters/doc/images/qml-emitters-example.png b/examples/quick/particles/emitters/doc/images/qml-emitters-example.png
similarity index 100%
rename from examples/particles/emitters/doc/images/qml-emitters-example.png
rename to examples/quick/particles/emitters/doc/images/qml-emitters-example.png
diff --git a/examples/particles/emitters/doc/src/emitters.qdoc b/examples/quick/particles/emitters/doc/src/emitters.qdoc
similarity index 100%
rename from examples/particles/emitters/doc/src/emitters.qdoc
rename to examples/quick/particles/emitters/doc/src/emitters.qdoc
diff --git a/examples/quick/particles/emitters/emitters.pro b/examples/quick/particles/emitters/emitters.pro
new file mode 100644
index 0000000000000000000000000000000000000000..ea2e0d15baa734953ab3ecbead51790c8a4ba816
--- /dev/null
+++ b/examples/quick/particles/emitters/emitters.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/emitters
+qml.files = emitters.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/emitters
+INSTALLS += target qml
diff --git a/examples/particles/emitters/emitters.qml b/examples/quick/particles/emitters/emitters.qml
similarity index 100%
rename from examples/particles/emitters/emitters.qml
rename to examples/quick/particles/emitters/emitters.qml
diff --git a/examples/particles/emitters/emitters.qmlproject b/examples/quick/particles/emitters/emitters.qmlproject
similarity index 100%
rename from examples/particles/emitters/emitters.qmlproject
rename to examples/quick/particles/emitters/emitters.qmlproject
diff --git a/examples/particles/emitters/main.cpp b/examples/quick/particles/emitters/main.cpp
similarity index 100%
rename from examples/particles/emitters/main.cpp
rename to examples/quick/particles/emitters/main.cpp
diff --git a/examples/particles/imageparticle/content/allatonce.qml b/examples/quick/particles/imageparticle/content/allatonce.qml
similarity index 100%
rename from examples/particles/imageparticle/content/allatonce.qml
rename to examples/quick/particles/imageparticle/content/allatonce.qml
diff --git a/examples/particles/imageparticle/content/colored.qml b/examples/quick/particles/imageparticle/content/colored.qml
similarity index 100%
rename from examples/particles/imageparticle/content/colored.qml
rename to examples/quick/particles/imageparticle/content/colored.qml
diff --git a/examples/particles/imageparticle/content/colortable.qml b/examples/quick/particles/imageparticle/content/colortable.qml
similarity index 100%
rename from examples/particles/imageparticle/content/colortable.qml
rename to examples/quick/particles/imageparticle/content/colortable.qml
diff --git a/examples/particles/imageparticle/content/deformation.qml b/examples/quick/particles/imageparticle/content/deformation.qml
similarity index 100%
rename from examples/particles/imageparticle/content/deformation.qml
rename to examples/quick/particles/imageparticle/content/deformation.qml
diff --git a/examples/particles/imageparticle/content/rotation.qml b/examples/quick/particles/imageparticle/content/rotation.qml
similarity index 100%
rename from examples/particles/imageparticle/content/rotation.qml
rename to examples/quick/particles/imageparticle/content/rotation.qml
diff --git a/examples/particles/imageparticle/content/sharing.qml b/examples/quick/particles/imageparticle/content/sharing.qml
similarity index 100%
rename from examples/particles/imageparticle/content/sharing.qml
rename to examples/quick/particles/imageparticle/content/sharing.qml
diff --git a/examples/particles/imageparticle/content/sprites.qml b/examples/quick/particles/imageparticle/content/sprites.qml
similarity index 100%
rename from examples/particles/imageparticle/content/sprites.qml
rename to examples/quick/particles/imageparticle/content/sprites.qml
diff --git a/examples/particles/imageparticle/doc/images/qml-imageparticle-example.png b/examples/quick/particles/imageparticle/doc/images/qml-imageparticle-example.png
similarity index 100%
rename from examples/particles/imageparticle/doc/images/qml-imageparticle-example.png
rename to examples/quick/particles/imageparticle/doc/images/qml-imageparticle-example.png
diff --git a/examples/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
similarity index 100%
rename from examples/particles/imageparticle/doc/src/imageparticle.qdoc
rename to examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc
diff --git a/examples/quick/particles/imageparticle/imageparticle.pro b/examples/quick/particles/imageparticle/imageparticle.pro
new file mode 100644
index 0000000000000000000000000000000000000000..94ed5fc7c3646bb13cb11283ce7782e69d12ec12
--- /dev/null
+++ b/examples/quick/particles/imageparticle/imageparticle.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/imageparticle
+qml.files = imageparticle.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/imageparticle
+INSTALLS += target qml
diff --git a/examples/particles/imageparticle/imageparticle.qml b/examples/quick/particles/imageparticle/imageparticle.qml
similarity index 100%
rename from examples/particles/imageparticle/imageparticle.qml
rename to examples/quick/particles/imageparticle/imageparticle.qml
diff --git a/examples/particles/imageparticle/imageparticle.qmlproject b/examples/quick/particles/imageparticle/imageparticle.qmlproject
similarity index 100%
rename from examples/particles/imageparticle/imageparticle.qmlproject
rename to examples/quick/particles/imageparticle/imageparticle.qmlproject
diff --git a/examples/particles/imageparticle/main.cpp b/examples/quick/particles/imageparticle/main.cpp
similarity index 100%
rename from examples/particles/imageparticle/main.cpp
rename to examples/quick/particles/imageparticle/main.cpp
diff --git a/examples/particles/images/_explo.png b/examples/quick/particles/images/_explo.png
similarity index 100%
rename from examples/particles/images/_explo.png
rename to examples/quick/particles/images/_explo.png
diff --git a/examples/particles/images/backgroundLeaves.jpg b/examples/quick/particles/images/backgroundLeaves.jpg
similarity index 100%
rename from examples/particles/images/backgroundLeaves.jpg
rename to examples/quick/particles/images/backgroundLeaves.jpg
diff --git a/examples/particles/images/bear_tiles.png b/examples/quick/particles/images/bear_tiles.png
similarity index 100%
rename from examples/particles/images/bear_tiles.png
rename to examples/quick/particles/images/bear_tiles.png
diff --git a/examples/particles/images/candle.png b/examples/quick/particles/images/candle.png
similarity index 100%
rename from examples/particles/images/candle.png
rename to examples/quick/particles/images/candle.png
diff --git a/examples/particles/images/colortable.png b/examples/quick/particles/images/colortable.png
similarity index 100%
rename from examples/particles/images/colortable.png
rename to examples/quick/particles/images/colortable.png
diff --git a/examples/particles/images/finalfrontier.png b/examples/quick/particles/images/finalfrontier.png
similarity index 100%
rename from examples/particles/images/finalfrontier.png
rename to examples/quick/particles/images/finalfrontier.png
diff --git a/examples/particles/images/flower.png b/examples/quick/particles/images/flower.png
similarity index 100%
rename from examples/particles/images/flower.png
rename to examples/quick/particles/images/flower.png
diff --git a/examples/particles/images/matchmask.png b/examples/quick/particles/images/matchmask.png
similarity index 100%
rename from examples/particles/images/matchmask.png
rename to examples/quick/particles/images/matchmask.png
diff --git a/examples/particles/images/meteor.png b/examples/quick/particles/images/meteor.png
similarity index 100%
rename from examples/particles/images/meteor.png
rename to examples/quick/particles/images/meteor.png
diff --git a/examples/particles/images/meteor_explo.png b/examples/quick/particles/images/meteor_explo.png
similarity index 100%
rename from examples/particles/images/meteor_explo.png
rename to examples/quick/particles/images/meteor_explo.png
diff --git a/examples/particles/images/meteors.png b/examples/quick/particles/images/meteors.png
similarity index 100%
rename from examples/particles/images/meteors.png
rename to examples/quick/particles/images/meteors.png
diff --git a/examples/particles/images/nullRock.png b/examples/quick/particles/images/nullRock.png
similarity index 100%
rename from examples/particles/images/nullRock.png
rename to examples/quick/particles/images/nullRock.png
diff --git a/examples/particles/images/particle.png b/examples/quick/particles/images/particle.png
similarity index 100%
rename from examples/particles/images/particle.png
rename to examples/quick/particles/images/particle.png
diff --git a/examples/particles/images/particle2.png b/examples/quick/particles/images/particle2.png
similarity index 100%
rename from examples/particles/images/particle2.png
rename to examples/quick/particles/images/particle2.png
diff --git a/examples/particles/images/particle3.png b/examples/quick/particles/images/particle3.png
similarity index 100%
rename from examples/particles/images/particle3.png
rename to examples/quick/particles/images/particle3.png
diff --git a/examples/particles/images/particle4.png b/examples/quick/particles/images/particle4.png
similarity index 100%
rename from examples/particles/images/particle4.png
rename to examples/quick/particles/images/particle4.png
diff --git a/examples/particles/images/particleA.png b/examples/quick/particles/images/particleA.png
similarity index 100%
rename from examples/particles/images/particleA.png
rename to examples/quick/particles/images/particleA.png
diff --git a/examples/particles/images/portal_bg.png b/examples/quick/particles/images/portal_bg.png
similarity index 100%
rename from examples/particles/images/portal_bg.png
rename to examples/quick/particles/images/portal_bg.png
diff --git a/examples/particles/images/realLeaf1.png b/examples/quick/particles/images/realLeaf1.png
similarity index 100%
rename from examples/particles/images/realLeaf1.png
rename to examples/quick/particles/images/realLeaf1.png
diff --git a/examples/particles/images/realLeaf2.png b/examples/quick/particles/images/realLeaf2.png
similarity index 100%
rename from examples/particles/images/realLeaf2.png
rename to examples/quick/particles/images/realLeaf2.png
diff --git a/examples/particles/images/realLeaf3.png b/examples/quick/particles/images/realLeaf3.png
similarity index 100%
rename from examples/particles/images/realLeaf3.png
rename to examples/quick/particles/images/realLeaf3.png
diff --git a/examples/particles/images/realLeaf4.png b/examples/quick/particles/images/realLeaf4.png
similarity index 100%
rename from examples/particles/images/realLeaf4.png
rename to examples/quick/particles/images/realLeaf4.png
diff --git a/examples/particles/images/rocket.png b/examples/quick/particles/images/rocket.png
similarity index 100%
rename from examples/particles/images/rocket.png
rename to examples/quick/particles/images/rocket.png
diff --git a/examples/particles/images/rocket2.png b/examples/quick/particles/images/rocket2.png
similarity index 100%
rename from examples/particles/images/rocket2.png
rename to examples/quick/particles/images/rocket2.png
diff --git a/examples/particles/images/sizeInOut.png b/examples/quick/particles/images/sizeInOut.png
similarity index 100%
rename from examples/particles/images/sizeInOut.png
rename to examples/quick/particles/images/sizeInOut.png
diff --git a/examples/particles/images/snowflake.png b/examples/quick/particles/images/snowflake.png
similarity index 100%
rename from examples/particles/images/snowflake.png
rename to examples/quick/particles/images/snowflake.png
diff --git a/examples/particles/images/sparkleSize.png b/examples/quick/particles/images/sparkleSize.png
similarity index 100%
rename from examples/particles/images/sparkleSize.png
rename to examples/quick/particles/images/sparkleSize.png
diff --git a/examples/particles/images/star.png b/examples/quick/particles/images/star.png
similarity index 100%
rename from examples/particles/images/star.png
rename to examples/quick/particles/images/star.png
diff --git a/examples/particles/images/starfish_0.png b/examples/quick/particles/images/starfish_0.png
similarity index 100%
rename from examples/particles/images/starfish_0.png
rename to examples/quick/particles/images/starfish_0.png
diff --git a/examples/particles/images/starfish_1.png b/examples/quick/particles/images/starfish_1.png
similarity index 100%
rename from examples/particles/images/starfish_1.png
rename to examples/quick/particles/images/starfish_1.png
diff --git a/examples/particles/images/starfish_2.png b/examples/quick/particles/images/starfish_2.png
similarity index 100%
rename from examples/particles/images/starfish_2.png
rename to examples/quick/particles/images/starfish_2.png
diff --git a/examples/particles/images/starfish_3.png b/examples/quick/particles/images/starfish_3.png
similarity index 100%
rename from examples/particles/images/starfish_3.png
rename to examples/quick/particles/images/starfish_3.png
diff --git a/examples/particles/images/starfish_4.png b/examples/quick/particles/images/starfish_4.png
similarity index 100%
rename from examples/particles/images/starfish_4.png
rename to examples/quick/particles/images/starfish_4.png
diff --git a/examples/particles/images/starfish_mask.png b/examples/quick/particles/images/starfish_mask.png
similarity index 100%
rename from examples/particles/images/starfish_mask.png
rename to examples/quick/particles/images/starfish_mask.png
diff --git a/examples/particles/itemparticle/content/Delegate.qml b/examples/quick/particles/itemparticle/content/Delegate.qml
similarity index 100%
rename from examples/particles/itemparticle/content/Delegate.qml
rename to examples/quick/particles/itemparticle/content/Delegate.qml
diff --git a/examples/particles/itemparticle/content/Delegate2.qml b/examples/quick/particles/itemparticle/content/Delegate2.qml
similarity index 100%
rename from examples/particles/itemparticle/content/Delegate2.qml
rename to examples/quick/particles/itemparticle/content/Delegate2.qml
diff --git a/examples/particles/itemparticle/content/ExpandingDelegate.qml b/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml
similarity index 100%
rename from examples/particles/itemparticle/content/ExpandingDelegate.qml
rename to examples/quick/particles/itemparticle/content/ExpandingDelegate.qml
diff --git a/examples/particles/itemparticle/content/RssModel.qml b/examples/quick/particles/itemparticle/content/RssModel.qml
similarity index 100%
rename from examples/particles/itemparticle/content/RssModel.qml
rename to examples/quick/particles/itemparticle/content/RssModel.qml
diff --git a/examples/particles/itemparticle/content/bubble.png b/examples/quick/particles/itemparticle/content/bubble.png
similarity index 100%
rename from examples/particles/itemparticle/content/bubble.png
rename to examples/quick/particles/itemparticle/content/bubble.png
diff --git a/examples/particles/itemparticle/content/script.js b/examples/quick/particles/itemparticle/content/script.js
similarity index 100%
rename from examples/particles/itemparticle/content/script.js
rename to examples/quick/particles/itemparticle/content/script.js
diff --git a/examples/particles/itemparticle/delegates.qml b/examples/quick/particles/itemparticle/delegates.qml
similarity index 100%
rename from examples/particles/itemparticle/delegates.qml
rename to examples/quick/particles/itemparticle/delegates.qml
diff --git a/examples/particles/itemparticle/particleview.qml b/examples/quick/particles/itemparticle/particleview.qml
similarity index 100%
rename from examples/particles/itemparticle/particleview.qml
rename to examples/quick/particles/itemparticle/particleview.qml
diff --git a/examples/particles/particles.pro b/examples/quick/particles/particles.pro
similarity index 54%
rename from examples/particles/particles.pro
rename to examples/quick/particles/particles.pro
index 5592f70ee3bd03694703f7b36ddf82650a4a490e..9200113be80b8ef0fc014fdf9332bcd96d0586af 100644
--- a/examples/particles/particles.pro
+++ b/examples/quick/particles/particles.pro
@@ -5,9 +5,10 @@ SUBDIRS += affectors \
     imageparticle \
     system
 
+EXAMPLE_FILES = \
+    itemparticle
+
 #Install shared images too
 qml.files = images
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles
-sources.files = particles.pro
-sources.path = $$qml.path
-INSTALLS = sources qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles
+INSTALLS += qml
diff --git a/examples/particles/system/content/dynamiccomparison.qml b/examples/quick/particles/system/content/dynamiccomparison.qml
similarity index 100%
rename from examples/particles/system/content/dynamiccomparison.qml
rename to examples/quick/particles/system/content/dynamiccomparison.qml
diff --git a/examples/particles/system/content/dynamicemitters.qml b/examples/quick/particles/system/content/dynamicemitters.qml
similarity index 100%
rename from examples/particles/system/content/dynamicemitters.qml
rename to examples/quick/particles/system/content/dynamicemitters.qml
diff --git a/examples/particles/system/content/multiplepainters.qml b/examples/quick/particles/system/content/multiplepainters.qml
similarity index 100%
rename from examples/particles/system/content/multiplepainters.qml
rename to examples/quick/particles/system/content/multiplepainters.qml
diff --git a/examples/particles/system/content/startstop.qml b/examples/quick/particles/system/content/startstop.qml
similarity index 100%
rename from examples/particles/system/content/startstop.qml
rename to examples/quick/particles/system/content/startstop.qml
diff --git a/examples/particles/system/content/timedgroupchanges.qml b/examples/quick/particles/system/content/timedgroupchanges.qml
similarity index 100%
rename from examples/particles/system/content/timedgroupchanges.qml
rename to examples/quick/particles/system/content/timedgroupchanges.qml
diff --git a/examples/particles/system/doc/images/qml-system-example.png b/examples/quick/particles/system/doc/images/qml-system-example.png
similarity index 100%
rename from examples/particles/system/doc/images/qml-system-example.png
rename to examples/quick/particles/system/doc/images/qml-system-example.png
diff --git a/examples/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc
similarity index 100%
rename from examples/particles/system/doc/src/system.qdoc
rename to examples/quick/particles/system/doc/src/system.qdoc
diff --git a/examples/particles/system/main.cpp b/examples/quick/particles/system/main.cpp
similarity index 100%
rename from examples/particles/system/main.cpp
rename to examples/quick/particles/system/main.cpp
diff --git a/examples/quick/particles/system/system.pro b/examples/quick/particles/system/system.pro
new file mode 100644
index 0000000000000000000000000000000000000000..f2e356754351985a5a5582c304bab5efaba42bae
--- /dev/null
+++ b/examples/quick/particles/system/system.pro
@@ -0,0 +1,9 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/system
+qml.files = system.qml content
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/system
+INSTALLS += target qml
diff --git a/examples/particles/system/system.qml b/examples/quick/particles/system/system.qml
similarity index 100%
rename from examples/particles/system/system.qml
rename to examples/quick/particles/system/system.qml
diff --git a/examples/particles/system/system.qmlproject b/examples/quick/particles/system/system.qmlproject
similarity index 100%
rename from examples/particles/system/system.qmlproject
rename to examples/quick/particles/system/system.qmlproject
diff --git a/examples/quick/positioners/main.cpp b/examples/quick/positioners/main.cpp
index d8941b1165f550791779e227aa082b058ea1351d..4ee4c82c569fbc414a5d9cd90aa58ed5027073f3 100644
--- a/examples/quick/positioners/main.cpp
+++ b/examples/quick/positioners/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(positioners)
diff --git a/examples/quick/positioners/positioners.pro b/examples/quick/positioners/positioners.pro
index e219cdea7ad1afec743a6599c120aa8668959cf0..1a7622d0bc73b02d0de5ac6f6883758315c35a0b 100644
--- a/examples/quick/positioners/positioners.pro
+++ b/examples/quick/positioners/positioners.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/positioners
 qml.files = positioners.qml positioners-transitions.qml positioners-attachedproperties.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners
-sources.files = $$SOURCES positioners.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/positioners
+INSTALLS += target qml
diff --git a/examples/quick/positioners/positioners.qml b/examples/quick/positioners/positioners.qml
index e02848dc160a9ae362b21a105044109339a621ea..b020e1be3b94c658c1e43b7bf78babbc937b22a9 100644
--- a/examples/quick/positioners/positioners.qml
+++ b/examples/quick/positioners/positioners.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 2f0d4309176be4e5650220283c8591129a37ea58..cb4f7bfc6b9de486d144eda032ef76d6e225dc7e 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -5,6 +5,7 @@ SUBDIRS = accessibility \
             canvas \
             imageelements \
             keyinteraction \
+            localstorage \
             modelviews \
             mousearea \
             positioners \
@@ -14,9 +15,12 @@ SUBDIRS = accessibility \
             text \
             threading \
             touchinteraction \
-            customitems
+            tutorials \
+            customitems \
+            window \
+            particles \
+            demos
 
-# install
-sources.files = quick.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick
-INSTALLS += sources
+EXAMPLE_FILES = \
+    ui-components \
+    shared
diff --git a/examples/quick/righttoleft/main.cpp b/examples/quick/righttoleft/main.cpp
index 1fa9be963aff787f1442f7f9a008c3beb6a6d458..e1d102cfe323cfc004eb4aab3cfe8d8b0fd71d5e 100644
--- a/examples/quick/righttoleft/main.cpp
+++ b/examples/quick/righttoleft/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(righttoleft)
diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro
index d22aa0f5ffaf0ba23f2ef7cbc90cf124d6574bcb..e71030e196681b932b74ee3392aa1126b2ad81f0 100644
--- a/examples/quick/righttoleft/righttoleft.pro
+++ b/examples/quick/righttoleft/righttoleft.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/righttoleft
 qml.files = righttoleft.qml layoutdirection layoutmirroring textalignment
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft
-sources.files = $$SOURCES righttoleft.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/righttoleft
+INSTALLS += target qml
diff --git a/examples/quick/righttoleft/righttoleft.qml b/examples/quick/righttoleft/righttoleft.qml
index 90f964ac7515f9221b2642619fbcdc1ae3e073e1..7212d4751413d9946803b3e7b7f9b7c9b8ab5927 100644
--- a/examples/quick/righttoleft/righttoleft.qml
+++ b/examples/quick/righttoleft/righttoleft.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro
index 5198a3c44a9f44ffb680feee5f97ca245e06870c..8044c5c0344d5934bc037f1a93d782c0258d7a89 100644
--- a/examples/quick/scenegraph/customgeometry/customgeometry.pro
+++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro
@@ -8,9 +8,8 @@ SOURCES += \
 HEADERS += \
     beziercurve.h
 
-OTHER_FILES += main.qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry
+qml.files = main.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry
 
-sources.files = $$SOURCES $$HEADERS $$OTHER_FILES customgeometry.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/customgeometry
-target.path = $$sources.path
-INSTALLS += sources target
+INSTALLS += target qml
diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
index f2ad3d0d851744e4316eba905d0449dd0b1b9506..f86dd5f5f376431440f4d16deeb30bb32576d1e8 100644
--- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
+++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
@@ -3,9 +3,7 @@ QT += qml quick
 HEADERS += squircle.h
 SOURCES += squircle.cpp main.cpp
 
-OTHER_FILES += main.qml
-
-sources.files = $$SOURCES $$HEADERS $$OTHER_FILES openglunderqml.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/openglunderqml
-target.path = $$sources.path
-INSTALLS += sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml
+qml.files = main.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml
+INSTALLS += target qml
diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro
index 22506bcfebd955e51d3e2a5502ee527806b15f5a..88b8d03dc338d3e3e0dc944e8a227398a8cc266c 100644
--- a/examples/quick/scenegraph/scenegraph.pro
+++ b/examples/quick/scenegraph/scenegraph.pro
@@ -1,7 +1,2 @@
 TEMPLATE = subdirs
 SUBDIRS += customgeometry simplematerial openglunderqml
-
-# install
-sources.files = scenegraph.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph
-INSTALLS += sources
diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro
index f8be76132e3ca2db7cb742d952de2f6d1d4b8e04..ae4fb0fdd02a2d31e5707d8ec72d9ef674677ad6 100644
--- a/examples/quick/scenegraph/simplematerial/simplematerial.pro
+++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro
@@ -4,10 +4,8 @@ QT += quick
 SOURCES += \
     simplematerial.cpp
 
-OTHER_FILES += \
-    main.qml
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial
+qml.files = main.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial
 
-sources.files = $$SOURCES $$OTHER_FILES simplematerial.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/simplematerial
-target.path = $$sources.path
-INSTALLS += sources target
+INSTALLS += target qml
diff --git a/examples/quick/shadereffects/main.cpp b/examples/quick/shadereffects/main.cpp
index 2cbce15465122f77ddb1583d8896f55df3b3c5b4..2bb3224bd1dc0d3863342cea62895a13c4b7a9aa 100644
--- a/examples/quick/shadereffects/main.cpp
+++ b/examples/quick/shadereffects/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(shadereffects)
diff --git a/examples/quick/shadereffects/shadereffects.pro b/examples/quick/shadereffects/shadereffects.pro
index e85ccad38de4c9b88fe2718b7d6b68c08c91b7d6..265cb726e207c8b528e33a7950eaf9d545b46f59 100644
--- a/examples/quick/shadereffects/shadereffects.pro
+++ b/examples/quick/shadereffects/shadereffects.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/shadereffects
 qml.files = shadereffects.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects
-sources.files = $$SOURCES shadereffects.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/shadereffects
+INSTALLS += target qml
diff --git a/examples/shared/Button.qml b/examples/quick/shared/Button.qml
similarity index 100%
rename from examples/shared/Button.qml
rename to examples/quick/shared/Button.qml
diff --git a/examples/shared/LauncherList.qml b/examples/quick/shared/LauncherList.qml
similarity index 100%
rename from examples/shared/LauncherList.qml
rename to examples/quick/shared/LauncherList.qml
diff --git a/examples/shared/README b/examples/quick/shared/README
similarity index 100%
rename from examples/shared/README
rename to examples/quick/shared/README
diff --git a/examples/shared/SimpleLauncherDelegate.qml b/examples/quick/shared/SimpleLauncherDelegate.qml
similarity index 100%
rename from examples/shared/SimpleLauncherDelegate.qml
rename to examples/quick/shared/SimpleLauncherDelegate.qml
diff --git a/examples/shared/images/back.png b/examples/quick/shared/images/back.png
similarity index 100%
rename from examples/shared/images/back.png
rename to examples/quick/shared/images/back.png
diff --git a/examples/shared/qmldir b/examples/quick/shared/qmldir
similarity index 100%
rename from examples/shared/qmldir
rename to examples/quick/shared/qmldir
diff --git a/examples/shared/shared.h b/examples/quick/shared/shared.h
similarity index 100%
rename from examples/shared/shared.h
rename to examples/quick/shared/shared.h
diff --git a/examples/quick/text/main.cpp b/examples/quick/text/main.cpp
index 0e84b8de2fa48d5eba84c7d9fcfb08e91be72284..9b3c62657b362b9ced0d85a4009c9cdf98a19179 100644
--- a/examples/quick/text/main.cpp
+++ b/examples/quick/text/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(text)
diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro
index b3734e29f349c14993312eced44dea2ea6890eb1..2f78548d05162f83a3ec954b8e8560503e723ad0 100644
--- a/examples/quick/text/text.pro
+++ b/examples/quick/text/text.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/text
 qml.files = fonts imgtag styledtext-layout.qml text.qml textselection
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text
-sources.files = $$SOURCES text.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/text
+INSTALLS += target qml
diff --git a/examples/quick/text/text.qml b/examples/quick/text/text.qml
index 383e65e51cb02a239ea483660bda08fae4191ed2..b506fe53f8f42d533c30d0dd6cdd734c2706e2c7 100644
--- a/examples/quick/text/text.qml
+++ b/examples/quick/text/text.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared"
+import "../shared"
 
 Item {
     height: 480
diff --git a/examples/quick/threading/main.cpp b/examples/quick/threading/main.cpp
index 32399c988a0e70ff9d2f308524999da9b233941e..47ea0b5709991820bba136e4bdb437c163c35dc4 100644
--- a/examples/quick/threading/main.cpp
+++ b/examples/quick/threading/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(threading)
diff --git a/examples/quick/threading/threading.pro b/examples/quick/threading/threading.pro
index 303a13cbaff9cd8c566a9b7971754a70a9d4ea26..fa5488a47e5144aa2e7d561e3bafd61582b52849 100644
--- a/examples/quick/threading/threading.pro
+++ b/examples/quick/threading/threading.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/threading
 qml.files = threading.qml threadedlistmodel workerscript
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading
-sources.files = $$SOURCES threading.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/threading
+INSTALLS += target qml
diff --git a/examples/quick/threading/threading.qml b/examples/quick/threading/threading.qml
index 5a79cd9fa6f5d50d218bc035f18db92c143780dc..011fdc0106fb1f063b259df610402f0c95bf3a53 100644
--- a/examples/quick/threading/threading.qml
+++ b/examples/quick/threading/threading.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared" as Examples
+import "../shared" as Examples
 
 Item {
     height: 480
diff --git a/examples/quick/touchinteraction/main.cpp b/examples/quick/touchinteraction/main.cpp
index 68215b5d89ecbc52ac1ae2d87b3b81068c39a161..aac317574313614c3659b525f5cbf9eafd0fb0a0 100644
--- a/examples/quick/touchinteraction/main.cpp
+++ b/examples/quick/touchinteraction/main.cpp
@@ -37,5 +37,5 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "../../shared/shared.h"
+#include "../shared/shared.h"
 DECLARATIVE_EXAMPLE_MAIN(touchinteraction)
diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro
index 83919c4e8f5bcbc12306ff5c07d4517ae9a7cfd6..949651c9cf09a5a8b390d42b46d9a63748ba533f 100644
--- a/examples/quick/touchinteraction/touchinteraction.pro
+++ b/examples/quick/touchinteraction/touchinteraction.pro
@@ -3,9 +3,7 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction
 qml.files = flickable multipointtouch pincharea touchinteraction.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction
-sources.files = $$SOURCES touchinteraction.pro
-sources.path = $$qml.path
-INSTALLS += sources target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction
+INSTALLS += target qml
diff --git a/examples/quick/touchinteraction/touchinteraction.qml b/examples/quick/touchinteraction/touchinteraction.qml
index ab932e895f8e40300bb56c41a3809dd97f9b4d86..c561714d5028ec4a100156368a5587ac38f9cc31 100644
--- a/examples/quick/touchinteraction/touchinteraction.qml
+++ b/examples/quick/touchinteraction/touchinteraction.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import "../../shared"
+import "../shared"
 
 Item {
     height: 480
diff --git a/examples/tutorials/dynamicview/dynamicview1/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview1/PetsModel.qml
rename to examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview1/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview1/dynamicview.qml
rename to examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
diff --git a/examples/tutorials/dynamicview/dynamicview2/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview2/PetsModel.qml
rename to examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview2/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview2/dynamicview.qml
rename to examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
diff --git a/examples/tutorials/dynamicview/dynamicview3/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview3/PetsModel.qml
rename to examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview3/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview3/dynamicview.qml
rename to examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
diff --git a/examples/tutorials/dynamicview/dynamicview4/ListSelector.qml b/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview4/ListSelector.qml
rename to examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
diff --git a/examples/tutorials/dynamicview/dynamicview4/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview4/PetsModel.qml
rename to examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
diff --git a/examples/tutorials/dynamicview/dynamicview4/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
similarity index 100%
rename from examples/tutorials/dynamicview/dynamicview4/dynamicview.qml
rename to examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
diff --git a/examples/tutorials/extending/chapter1-basics/app.qml b/examples/quick/tutorials/extending/chapter1-basics/app.qml
similarity index 100%
rename from examples/tutorials/extending/chapter1-basics/app.qml
rename to examples/quick/tutorials/extending/chapter1-basics/app.qml
diff --git a/examples/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro
similarity index 100%
rename from examples/tutorials/extending/chapter1-basics/chapter1-basics.pro
rename to examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro
diff --git a/examples/tutorials/extending/chapter1-basics/main.cpp b/examples/quick/tutorials/extending/chapter1-basics/main.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter1-basics/main.cpp
rename to examples/quick/tutorials/extending/chapter1-basics/main.cpp
diff --git a/examples/tutorials/extending/chapter1-basics/piechart.cpp b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter1-basics/piechart.cpp
rename to examples/quick/tutorials/extending/chapter1-basics/piechart.cpp
diff --git a/examples/tutorials/extending/chapter1-basics/piechart.h b/examples/quick/tutorials/extending/chapter1-basics/piechart.h
similarity index 100%
rename from examples/tutorials/extending/chapter1-basics/piechart.h
rename to examples/quick/tutorials/extending/chapter1-basics/piechart.h
diff --git a/examples/tutorials/extending/chapter2-methods/app.qml b/examples/quick/tutorials/extending/chapter2-methods/app.qml
similarity index 100%
rename from examples/tutorials/extending/chapter2-methods/app.qml
rename to examples/quick/tutorials/extending/chapter2-methods/app.qml
diff --git a/examples/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/quick/tutorials/extending/chapter2-methods/chapter2-methods.pro
similarity index 100%
rename from examples/tutorials/extending/chapter2-methods/chapter2-methods.pro
rename to examples/quick/tutorials/extending/chapter2-methods/chapter2-methods.pro
diff --git a/examples/tutorials/extending/chapter2-methods/main.cpp b/examples/quick/tutorials/extending/chapter2-methods/main.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter2-methods/main.cpp
rename to examples/quick/tutorials/extending/chapter2-methods/main.cpp
diff --git a/examples/tutorials/extending/chapter2-methods/piechart.cpp b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter2-methods/piechart.cpp
rename to examples/quick/tutorials/extending/chapter2-methods/piechart.cpp
diff --git a/examples/tutorials/extending/chapter2-methods/piechart.h b/examples/quick/tutorials/extending/chapter2-methods/piechart.h
similarity index 100%
rename from examples/tutorials/extending/chapter2-methods/piechart.h
rename to examples/quick/tutorials/extending/chapter2-methods/piechart.h
diff --git a/examples/tutorials/extending/chapter3-bindings/app.qml b/examples/quick/tutorials/extending/chapter3-bindings/app.qml
similarity index 100%
rename from examples/tutorials/extending/chapter3-bindings/app.qml
rename to examples/quick/tutorials/extending/chapter3-bindings/app.qml
diff --git a/examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/quick/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
similarity index 100%
rename from examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
rename to examples/quick/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
diff --git a/examples/tutorials/extending/chapter3-bindings/main.cpp b/examples/quick/tutorials/extending/chapter3-bindings/main.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter3-bindings/main.cpp
rename to examples/quick/tutorials/extending/chapter3-bindings/main.cpp
diff --git a/examples/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter3-bindings/piechart.cpp
rename to examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp
diff --git a/examples/tutorials/extending/chapter3-bindings/piechart.h b/examples/quick/tutorials/extending/chapter3-bindings/piechart.h
similarity index 100%
rename from examples/tutorials/extending/chapter3-bindings/piechart.h
rename to examples/quick/tutorials/extending/chapter3-bindings/piechart.h
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml
similarity index 100%
rename from examples/tutorials/extending/chapter4-customPropertyTypes/app.qml
rename to examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
similarity index 100%
rename from examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
rename to examples/quick/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp
rename to examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
rename to examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h
similarity index 100%
rename from examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h
rename to examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
rename to examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp
diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
similarity index 100%
rename from examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
rename to examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
diff --git a/examples/tutorials/extending/chapter5-listproperties/app.qml b/examples/quick/tutorials/extending/chapter5-listproperties/app.qml
similarity index 100%
rename from examples/tutorials/extending/chapter5-listproperties/app.qml
rename to examples/quick/tutorials/extending/chapter5-listproperties/app.qml
diff --git a/examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/quick/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
similarity index 100%
rename from examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
rename to examples/quick/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
diff --git a/examples/tutorials/extending/chapter5-listproperties/main.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/main.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter5-listproperties/main.cpp
rename to examples/quick/tutorials/extending/chapter5-listproperties/main.cpp
diff --git a/examples/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter5-listproperties/piechart.cpp
rename to examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp
diff --git a/examples/tutorials/extending/chapter5-listproperties/piechart.h b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.h
similarity index 100%
rename from examples/tutorials/extending/chapter5-listproperties/piechart.h
rename to examples/quick/tutorials/extending/chapter5-listproperties/piechart.h
diff --git a/examples/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter5-listproperties/pieslice.cpp
rename to examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp
diff --git a/examples/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.h
similarity index 100%
rename from examples/tutorials/extending/chapter5-listproperties/pieslice.h
rename to examples/quick/tutorials/extending/chapter5-listproperties/pieslice.h
diff --git a/examples/tutorials/extending/chapter6-plugins/Charts/qmldir b/examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/Charts/qmldir
rename to examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
diff --git a/examples/tutorials/extending/chapter6-plugins/app.qml b/examples/quick/tutorials/extending/chapter6-plugins/app.qml
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/app.qml
rename to examples/quick/tutorials/extending/chapter6-plugins/app.qml
diff --git a/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
rename to examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp
rename to examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp
diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/chartsplugin.h
rename to examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h
diff --git a/examples/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/piechart.cpp
rename to examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp
diff --git a/examples/tutorials/extending/chapter6-plugins/piechart.h b/examples/quick/tutorials/extending/chapter6-plugins/piechart.h
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/piechart.h
rename to examples/quick/tutorials/extending/chapter6-plugins/piechart.h
diff --git a/examples/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/pieslice.cpp
rename to examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp
diff --git a/examples/tutorials/extending/chapter6-plugins/pieslice.h b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.h
similarity index 100%
rename from examples/tutorials/extending/chapter6-plugins/pieslice.h
rename to examples/quick/tutorials/extending/chapter6-plugins/pieslice.h
diff --git a/examples/tutorials/extending/extending.pro b/examples/quick/tutorials/extending/extending.pro
similarity index 100%
rename from examples/tutorials/extending/extending.pro
rename to examples/quick/tutorials/extending/extending.pro
diff --git a/examples/tutorials/gettingStartedQml/core/Button.qml b/examples/quick/tutorials/gettingStartedQml/core/Button.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/core/Button.qml
rename to examples/quick/tutorials/gettingStartedQml/core/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/core/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/core/EditMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/core/EditMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/core/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/core/FileDialog.qml b/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/core/FileDialog.qml
rename to examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml
diff --git a/examples/tutorials/gettingStartedQml/core/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/core/FileMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/core/FileMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/core/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/core/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/core/MenuBar.qml
rename to examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/core/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/core/TextArea.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/core/TextArea.qml
rename to examples/quick/tutorials/gettingStartedQml/core/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/core/qmldir b/examples/quick/tutorials/gettingStartedQml/core/qmldir
similarity index 100%
rename from examples/tutorials/gettingStartedQml/core/qmldir
rename to examples/quick/tutorials/gettingStartedQml/core/qmldir
diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
similarity index 100%
rename from examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
rename to examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp
diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
similarity index 100%
rename from examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
rename to examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.h
diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.cpp
similarity index 100%
rename from examples/tutorials/gettingStartedQml/filedialog/directory.cpp
rename to examples/quick/tutorials/gettingStartedQml/filedialog/directory.cpp
diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.h b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.h
similarity index 100%
rename from examples/tutorials/gettingStartedQml/filedialog/directory.h
rename to examples/quick/tutorials/gettingStartedQml/filedialog/directory.h
diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/file.cpp
similarity index 100%
rename from examples/tutorials/gettingStartedQml/filedialog/file.cpp
rename to examples/quick/tutorials/gettingStartedQml/filedialog/file.cpp
diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.h b/examples/quick/tutorials/gettingStartedQml/filedialog/file.h
similarity index 100%
rename from examples/tutorials/gettingStartedQml/filedialog/file.h
rename to examples/quick/tutorials/gettingStartedQml/filedialog/file.h
diff --git a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
similarity index 56%
rename from examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
rename to examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
index 36ae0fc7f4273e0df168acbbd7dd340e12ca9143..36d88588e40ff2db1bca70757804384efae68a9f 100644
--- a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
@@ -16,7 +16,7 @@ SOURCES +=    directory.cpp \
         file.cpp \
         dialogPlugin.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml/filedialog
-sources.files = $$SOURCES $$HEADERS filedialog.pro
-sources.path = $$target.path
-INSTALLS = sources target
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/gettingStartedQml/filedialog
+qml.files = qmldir
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/gettingStartedQml/filedialog
+INSTALLS += target qml
diff --git a/examples/tutorials/gettingStartedQml/filedialog/qmldir b/examples/quick/tutorials/gettingStartedQml/filedialog/qmldir
similarity index 100%
rename from examples/tutorials/gettingStartedQml/filedialog/qmldir
rename to examples/quick/tutorials/gettingStartedQml/filedialog/qmldir
diff --git a/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro
new file mode 100644
index 0000000000000000000000000000000000000000..1fc74b69f381818186dcfb4c8abb2a2ad42fc09d
--- /dev/null
+++ b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro
@@ -0,0 +1,10 @@
+TEMPLATE      = subdirs
+SUBDIRS       = \
+                filedialog\
+
+EXAMPLE_FILES = \
+    core \
+    images \
+    parts \
+    pics \
+    texteditor.qml
diff --git a/examples/tutorials/gettingStartedQml/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/images/arrow.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/images/arrow.png
rename to examples/quick/tutorials/gettingStartedQml/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part0/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part0/Button.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part0/Button.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part0/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/Button.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/Button.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject
rename to examples/quick/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/Button.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part2/Button.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part2/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part2/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part2/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part2/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png b/examples/quick/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject
rename to examples/quick/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/Button.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part3/images/arrow.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/images/arrow.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png b/examples/quick/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject
rename to examples/quick/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/Button.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/Button.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextArea.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/TextEditor.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part4/images/arrow.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/images/arrow.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png b/examples/quick/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject
rename to examples/quick/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/TextEditor.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/Button.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/core/Button.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/qmldir b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/qmldir
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/core/qmldir
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/core/qmldir
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.h
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/images/arrow.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/images/arrow.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/images/arrow.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png
diff --git a/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
similarity index 100%
rename from examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
rename to examples/quick/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject
diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png
rename to examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png
diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png
rename to examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png
diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png
similarity index 100%
rename from examples/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png
rename to examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png
diff --git a/examples/tutorials/gettingStartedQml/texteditor.qml b/examples/quick/tutorials/gettingStartedQml/texteditor.qml
similarity index 100%
rename from examples/tutorials/gettingStartedQml/texteditor.qml
rename to examples/quick/tutorials/gettingStartedQml/texteditor.qml
diff --git a/examples/tutorials/helloworld/Cell.qml b/examples/quick/tutorials/helloworld/Cell.qml
similarity index 100%
rename from examples/tutorials/helloworld/Cell.qml
rename to examples/quick/tutorials/helloworld/Cell.qml
diff --git a/examples/tutorials/helloworld/tutorial1.qml b/examples/quick/tutorials/helloworld/tutorial1.qml
similarity index 100%
rename from examples/tutorials/helloworld/tutorial1.qml
rename to examples/quick/tutorials/helloworld/tutorial1.qml
diff --git a/examples/tutorials/helloworld/tutorial2.qml b/examples/quick/tutorials/helloworld/tutorial2.qml
similarity index 100%
rename from examples/tutorials/helloworld/tutorial2.qml
rename to examples/quick/tutorials/helloworld/tutorial2.qml
diff --git a/examples/tutorials/helloworld/tutorial3.qml b/examples/quick/tutorials/helloworld/tutorial3.qml
similarity index 100%
rename from examples/tutorials/helloworld/tutorial3.qml
rename to examples/quick/tutorials/helloworld/tutorial3.qml
diff --git a/examples/tutorials/samegame/samegame1/Block.qml b/examples/quick/tutorials/samegame/samegame1/Block.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame1/Block.qml
rename to examples/quick/tutorials/samegame/samegame1/Block.qml
diff --git a/examples/tutorials/samegame/samegame1/Button.qml b/examples/quick/tutorials/samegame/samegame1/Button.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame1/Button.qml
rename to examples/quick/tutorials/samegame/samegame1/Button.qml
diff --git a/examples/tutorials/samegame/samegame1/samegame.qml b/examples/quick/tutorials/samegame/samegame1/samegame.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame1/samegame.qml
rename to examples/quick/tutorials/samegame/samegame1/samegame.qml
diff --git a/examples/tutorials/samegame/samegame1/samegame1.qmlproject b/examples/quick/tutorials/samegame/samegame1/samegame1.qmlproject
similarity index 100%
rename from examples/tutorials/samegame/samegame1/samegame1.qmlproject
rename to examples/quick/tutorials/samegame/samegame1/samegame1.qmlproject
diff --git a/examples/tutorials/samegame/samegame2/Block.qml b/examples/quick/tutorials/samegame/samegame2/Block.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame2/Block.qml
rename to examples/quick/tutorials/samegame/samegame2/Block.qml
diff --git a/examples/tutorials/samegame/samegame2/Button.qml b/examples/quick/tutorials/samegame/samegame2/Button.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame2/Button.qml
rename to examples/quick/tutorials/samegame/samegame2/Button.qml
diff --git a/examples/tutorials/samegame/samegame2/samegame.js b/examples/quick/tutorials/samegame/samegame2/samegame.js
similarity index 100%
rename from examples/tutorials/samegame/samegame2/samegame.js
rename to examples/quick/tutorials/samegame/samegame2/samegame.js
diff --git a/examples/tutorials/samegame/samegame2/samegame.qml b/examples/quick/tutorials/samegame/samegame2/samegame.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame2/samegame.qml
rename to examples/quick/tutorials/samegame/samegame2/samegame.qml
diff --git a/examples/tutorials/samegame/samegame2/samegame2.qmlproject b/examples/quick/tutorials/samegame/samegame2/samegame2.qmlproject
similarity index 100%
rename from examples/tutorials/samegame/samegame2/samegame2.qmlproject
rename to examples/quick/tutorials/samegame/samegame2/samegame2.qmlproject
diff --git a/examples/tutorials/samegame/samegame3/Block.qml b/examples/quick/tutorials/samegame/samegame3/Block.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame3/Block.qml
rename to examples/quick/tutorials/samegame/samegame3/Block.qml
diff --git a/examples/tutorials/samegame/samegame3/Button.qml b/examples/quick/tutorials/samegame/samegame3/Button.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame3/Button.qml
rename to examples/quick/tutorials/samegame/samegame3/Button.qml
diff --git a/examples/tutorials/samegame/samegame3/Dialog.qml b/examples/quick/tutorials/samegame/samegame3/Dialog.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame3/Dialog.qml
rename to examples/quick/tutorials/samegame/samegame3/Dialog.qml
diff --git a/examples/tutorials/samegame/samegame3/samegame.js b/examples/quick/tutorials/samegame/samegame3/samegame.js
similarity index 100%
rename from examples/tutorials/samegame/samegame3/samegame.js
rename to examples/quick/tutorials/samegame/samegame3/samegame.js
diff --git a/examples/tutorials/samegame/samegame3/samegame.qml b/examples/quick/tutorials/samegame/samegame3/samegame.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame3/samegame.qml
rename to examples/quick/tutorials/samegame/samegame3/samegame.qml
diff --git a/examples/tutorials/samegame/samegame3/samegame3.qmlproject b/examples/quick/tutorials/samegame/samegame3/samegame3.qmlproject
similarity index 100%
rename from examples/tutorials/samegame/samegame3/samegame3.qmlproject
rename to examples/quick/tutorials/samegame/samegame3/samegame3.qmlproject
diff --git a/examples/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame4/content/BoomBlock.qml
rename to examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
diff --git a/examples/tutorials/samegame/samegame4/content/Button.qml b/examples/quick/tutorials/samegame/samegame4/content/Button.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame4/content/Button.qml
rename to examples/quick/tutorials/samegame/samegame4/content/Button.qml
diff --git a/examples/tutorials/samegame/samegame4/content/Dialog.qml b/examples/quick/tutorials/samegame/samegame4/content/Dialog.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame4/content/Dialog.qml
rename to examples/quick/tutorials/samegame/samegame4/content/Dialog.qml
diff --git a/examples/tutorials/samegame/samegame4/content/samegame.js b/examples/quick/tutorials/samegame/samegame4/content/samegame.js
similarity index 100%
rename from examples/tutorials/samegame/samegame4/content/samegame.js
rename to examples/quick/tutorials/samegame/samegame4/content/samegame.js
diff --git a/examples/tutorials/samegame/samegame4/highscores/README b/examples/quick/tutorials/samegame/samegame4/highscores/README
similarity index 100%
rename from examples/tutorials/samegame/samegame4/highscores/README
rename to examples/quick/tutorials/samegame/samegame4/highscores/README
diff --git a/examples/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml
similarity index 100%
rename from examples/tutorials/samegame/samegame4/highscores/score_data.xml
rename to examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml
diff --git a/examples/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
similarity index 100%
rename from examples/tutorials/samegame/samegame4/highscores/score_style.xsl
rename to examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
diff --git a/examples/tutorials/samegame/samegame4/highscores/scores.php b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php
similarity index 100%
rename from examples/tutorials/samegame/samegame4/highscores/scores.php
rename to examples/quick/tutorials/samegame/samegame4/highscores/scores.php
diff --git a/examples/tutorials/samegame/samegame4/samegame.qml b/examples/quick/tutorials/samegame/samegame4/samegame.qml
similarity index 100%
rename from examples/tutorials/samegame/samegame4/samegame.qml
rename to examples/quick/tutorials/samegame/samegame4/samegame.qml
diff --git a/examples/tutorials/samegame/samegame4/samegame4.qmlproject b/examples/quick/tutorials/samegame/samegame4/samegame4.qmlproject
similarity index 100%
rename from examples/tutorials/samegame/samegame4/samegame4.qmlproject
rename to examples/quick/tutorials/samegame/samegame4/samegame4.qmlproject
diff --git a/examples/tutorials/samegame/shared/pics/background.jpg b/examples/quick/tutorials/samegame/shared/pics/background.jpg
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/background.jpg
rename to examples/quick/tutorials/samegame/shared/pics/background.jpg
diff --git a/examples/tutorials/samegame/shared/pics/blueStar.png b/examples/quick/tutorials/samegame/shared/pics/blueStar.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/blueStar.png
rename to examples/quick/tutorials/samegame/shared/pics/blueStar.png
diff --git a/examples/tutorials/samegame/shared/pics/blueStone.png b/examples/quick/tutorials/samegame/shared/pics/blueStone.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/blueStone.png
rename to examples/quick/tutorials/samegame/shared/pics/blueStone.png
diff --git a/examples/tutorials/samegame/shared/pics/greenStar.png b/examples/quick/tutorials/samegame/shared/pics/greenStar.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/greenStar.png
rename to examples/quick/tutorials/samegame/shared/pics/greenStar.png
diff --git a/examples/tutorials/samegame/shared/pics/greenStone.png b/examples/quick/tutorials/samegame/shared/pics/greenStone.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/greenStone.png
rename to examples/quick/tutorials/samegame/shared/pics/greenStone.png
diff --git a/examples/tutorials/samegame/shared/pics/redStar.png b/examples/quick/tutorials/samegame/shared/pics/redStar.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/redStar.png
rename to examples/quick/tutorials/samegame/shared/pics/redStar.png
diff --git a/examples/tutorials/samegame/shared/pics/redStone.png b/examples/quick/tutorials/samegame/shared/pics/redStone.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/redStone.png
rename to examples/quick/tutorials/samegame/shared/pics/redStone.png
diff --git a/examples/tutorials/samegame/shared/pics/star.png b/examples/quick/tutorials/samegame/shared/pics/star.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/star.png
rename to examples/quick/tutorials/samegame/shared/pics/star.png
diff --git a/examples/tutorials/samegame/shared/pics/yellowStone.png b/examples/quick/tutorials/samegame/shared/pics/yellowStone.png
similarity index 100%
rename from examples/tutorials/samegame/shared/pics/yellowStone.png
rename to examples/quick/tutorials/samegame/shared/pics/yellowStone.png
diff --git a/examples/quick/tutorials/tutorials.pro b/examples/quick/tutorials/tutorials.pro
new file mode 100644
index 0000000000000000000000000000000000000000..fd6117b2d0ec54dccf783c4e41d69d74729a6bb5
--- /dev/null
+++ b/examples/quick/tutorials/tutorials.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+SUBDIRS += gettingStartedQml
+
+EXAMPLE_FILES = \
+    dynamicview \
+    extending \
+    helloworld \
+    samegame
diff --git a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
index c694e9ad635002865353bf98f51a87b7880ad667..4e302e7256a727d7a75e331954814aff7cdf69bf 100644
--- a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
+++ b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc
@@ -34,7 +34,7 @@
 
 This example shows how to create a reusable switch component in QML.
 
-The code for this example can be found in the \c examples/tutorials/ui-components/slideswitch directory.
+The code for this example can be found in the \c examples/quick/tutorials/ui-components/slideswitch directory.
 
 The elements that compose the switch are:
 
diff --git a/examples/window/screen/screenInfo.qml b/examples/quick/window/screen/screenInfo.qml
similarity index 100%
rename from examples/window/screen/screenInfo.qml
rename to examples/quick/window/screen/screenInfo.qml
diff --git a/examples/quick/window/window.pro b/examples/quick/window/window.pro
new file mode 100644
index 0000000000000000000000000000000000000000..93e43fcd654fcef2f5fbf90bd4b8d7d09e6835b1
--- /dev/null
+++ b/examples/quick/window/window.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+    window
+
+EXAMPLE_FILES = \
+    screen
diff --git a/examples/window/window/Window.qml b/examples/quick/window/window/Window.qml
similarity index 100%
rename from examples/window/window/Window.qml
rename to examples/quick/window/window/Window.qml
diff --git a/examples/window/window/nogui.qml b/examples/quick/window/window/nogui.qml
similarity index 100%
rename from examples/window/window/nogui.qml
rename to examples/quick/window/window/nogui.qml
diff --git a/examples/window/window/standalone.qml b/examples/quick/window/window/standalone.qml
similarity index 100%
rename from examples/window/window/standalone.qml
rename to examples/quick/window/window/standalone.qml
diff --git a/examples/window/window/twowindows.qml b/examples/quick/window/window/twowindows.qml
similarity index 100%
rename from examples/window/window/twowindows.qml
rename to examples/quick/window/window/twowindows.qml
diff --git a/examples/window/window/window.cpp b/examples/quick/window/window/window.cpp
similarity index 100%
rename from examples/window/window/window.cpp
rename to examples/quick/window/window/window.cpp
diff --git a/examples/quick/window/window/window.pro b/examples/quick/window/window/window.pro
new file mode 100644
index 0000000000000000000000000000000000000000..e8a022361f499b54479b3fc35b5d2fe33be68456
--- /dev/null
+++ b/examples/quick/window/window/window.pro
@@ -0,0 +1,11 @@
+TEMPLATE = app
+CONFIG += qt
+QT += qml
+
+SOURCES += window.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window
+qml.files = Window.qml nogui.qml standalone.qml twowindows.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window
+
+INSTALLS = target qml
diff --git a/examples/shared/shared.pro b/examples/shared/shared.pro
deleted file mode 100644
index 3bc9bfebbe002f184247118bbcfeaa80477a9fca..0000000000000000000000000000000000000000
--- a/examples/shared/shared.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-#just install the files, all QML for now
-TEMPLATE = aux
-
-qml.files = images \
-            LauncherList.qml \
-            SimpleLauncherDelegate.qml \
-            Button.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/shared
-INSTALLS = qml
diff --git a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/tutorials/gettingStartedQml/gettingStartedQml.pro
deleted file mode 100644
index 10ce079896810b05c82569169c1f594e60e32d29..0000000000000000000000000000000000000000
--- a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS       = \
-                filedialog\
-
-# install
-sources.files = gettingStartedQml.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml
-INSTALLS += sources
diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
deleted file mode 100644
index 9cb5c57c3f6e9968907d892bca569703b60ac843..0000000000000000000000000000000000000000
--- a/examples/tutorials/tutorials.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += gettingStartedQml
-
-# install
-sources.files = tutorials.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials
-INSTALLS += sources
diff --git a/examples/window/window.pro b/examples/window/window.pro
deleted file mode 100644
index 5dea5d621f56d75c9c27bdc596b4f547466d1817..0000000000000000000000000000000000000000
--- a/examples/window/window.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-    #screen \
-    window
-
-# install
-sources.files = window.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window
-INSTALLS += sources
diff --git a/examples/window/window/window.pro b/examples/window/window/window.pro
deleted file mode 100644
index 7939773b17cec72d92e9692d991f81e4ca393fd1..0000000000000000000000000000000000000000
--- a/examples/window/window/window.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-CONFIG += qt
-QT += qml
-
-SOURCES += window.cpp
-OTHER_FILES = Window.qml nogui.qml standalone.qml twowindows.qml
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window/window
-sources.files = $$SOURCES $$OTHER_FILES window.pro
-sources.path = $$target.path
-INSTALLS = sources target
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index 2d70b15764fd5cf60be194539fbc0497bf86f069..58c33f27cacc16d2f4baed83ef3264e8868eb181 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -1,2 +1 @@
 load(qt_parts)
-
diff --git a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
index d59a8cd827b4436d0ffda91370d6bc90aa3a911a..8ed3aa8279c5abe60414ecbb16518692c7d67806 100644
--- a/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
+++ b/src/qml/doc/src/cppintegration/extending-tutorial.qdoc
@@ -44,12 +44,12 @@ examples/quick/tutorials/extending directory.
 Tutorial chapters:
 
 \list 1
-\li \l{examples/tutorials/extending/chapter1-basics}{Creating a New Type}
-\li \l{examples/tutorials/extending/chapter2-methods}{Connecting to C++ Methods and Signals}
-\li \l{examples/tutorials/extending/chapter3-bindings}{Property Binding}
-\li \l{examples/tutorials/extending/chapter4-customPropertyTypes}{Using Custom Property Types}
-\li \l{examples/tutorials/extending/chapter5-listproperties}{Using List Property Types}
-\li \l{examples/tutorials/extending/chapter6-plugins}{Writing an Extension Plugin}
+\li \l{examples/quick/tutorials/extending/chapter1-basics}{Creating a New Type}
+\li \l{examples/quick/tutorials/extending/chapter2-methods}{Connecting to C++ Methods and Signals}
+\li \l{examples/quick/tutorials/extending/chapter3-bindings}{Property Binding}
+\li \l{examples/quick/tutorials/extending/chapter4-customPropertyTypes}{Using Custom Property Types}
+\li \l{examples/quick/tutorials/extending/chapter5-listproperties}{Using List Property Types}
+\li \l{examples/quick/tutorials/extending/chapter6-plugins}{Writing an Extension Plugin}
 \li \l{qml-extending-tutorial7.html}{In Summary}
 \endlist
 
@@ -64,7 +64,7 @@ and \l {qtqml-cppintegration-definetypes.html}{Defining QML Types from C++}.
 /*!
 \title Chapter 1: Creating a New Type
 
-\example examples/tutorials/extending/chapter1-basics
+\example examples/quick/tutorials/extending/chapter1-basics
 
 A common task when extending QML is to provide a new QML type that supports some
  custom functionality beyond what is provided by the built-in \l {Qt Quick QML Types}{QtQuick types}.
@@ -104,7 +104,7 @@ this new class must:
 
 Here is our \c PieChart class, defined in \c piechart.h:
 
-\snippet examples/tutorials/extending/chapter1-basics/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/piechart.h 0
 
 The class inherits from QQuickPaintedItem because we want to override
 QQuickPaintedItem::paint() in perform drawing operations with the QPainter API.
@@ -120,15 +120,15 @@ simply sets and returns the \c m_name and \c m_color values as appropriate, and
 implements \c paint() to draw a simple pie chart. It also turns off the
 QGraphicsItem::ItemHasNoContents flag to enable painting:
 
-\snippet examples/tutorials/extending/chapter1-basics/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/piechart.cpp 0
 \dots 0
-\snippet examples/tutorials/extending/chapter1-basics/piechart.cpp 1
+\snippet examples/quick/tutorials/extending/chapter1-basics/piechart.cpp 1
 
 Now that we have defined the \c PieChart type, we will use it from QML. The \c app.qml
 file creates a \c PieChart item and display the pie chart's details
 using a standard QML \l Text item:
 
-\snippet examples/tutorials/extending/chapter1-basics/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/app.qml 0
 
 Notice that although the color is specified as a string in QML, it is automatically
 converted to a QColor object for the PieChart \c color property. Automatic conversions are
@@ -142,46 +142,46 @@ you don't register the type, \c app.qml won't be able to create a \c PieChart.
 
 Here is the application \c main.cpp:
 
-\snippet examples/tutorials/extending/chapter1-basics/main.cpp 0
+\snippet examples/quick/tutorials/extending/chapter1-basics/main.cpp 0
 
 This call to qmlRegisterType() registers the \c PieChart type as a type called "PieChart",
 in a type namespace called "Charts", with a version of 1.0.
 
 Lastly, we write a \c .pro project file that includes the files and the \c declarative library:
 
-\quotefile examples/tutorials/extending/chapter1-basics/chapter1-basics.pro
+\quotefile examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro
 
 Now we can build and run the application:
 
 \image extending-tutorial-chapter1.png
 
-Try it yourself with the code in Qt's \c examples/tutorials/extending/chapter1-basics directory.
+Try it yourself with the code in Qt's \c examples/quick/tutorials/extending/chapter1-basics directory.
 */
 
 
 /*!
 \title Chapter 2: Connecting to C++ Methods and Signals
 
-\example examples/tutorials/extending/chapter2-methods
+\example examples/quick/tutorials/extending/chapter2-methods
 
 Suppose we want \c PieChart to have a "clearChart()" method that erases the
 chart and then emits a "chartCleared" signal. Our \c app.qml would be able
 to call \c clearChart() and receive \c chartCleared() signals like this:
 
-\snippet examples/tutorials/extending/chapter2-methods/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter2-methods/app.qml 0
 
 \image extending-tutorial-chapter2.png
 
 To do this, we add a \c clearChart() method and a \c chartCleared() signal
 to our C++ class:
 
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 2
 \dots
-\snippet examples/tutorials/extending/chapter2-methods/piechart.h 3
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.h 3
 
 The use of Q_INVOKABLE makes the \c clearChart() method available to the
 Qt Meta-Object system, and in turn, to QML. Note that it could have
@@ -191,7 +191,7 @@ slots are also callable from QML. Both of these approaches are valid.
 The \c clearChart() method simply changes the color to Qt::transparent,
 repaints the chart, then emits the \c chartCleared() signal:
 
-\snippet examples/tutorials/extending/chapter2-methods/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter2-methods/piechart.cpp 0
 
 Now when we run the application and click the window, the pie chart
 disappears, and the application outputs:
@@ -200,14 +200,14 @@ disappears, and the application outputs:
     The chart has been cleared
 \endcode
 
-Try out the example yourself with the updated code in Qt's \c examples/tutorials/extending/chapter2-methods directory.
+Try out the example yourself with the updated code in Qt's \c examples/quick/tutorials/extending/chapter2-methods directory.
 
 */
 
 /*!
 \title Chapter 3: Adding Property Bindings
 
-\example examples/tutorials/extending/chapter3-bindings
+\example examples/quick/tutorials/extending/chapter3-bindings
 
 Property binding is a powerful feature of QML that allows values of different
 elements to be synchronized automatically. It uses signals to notify and update
@@ -216,7 +216,7 @@ other elements' values when property values are changed.
 Let's enable property bindings for the \c color property. That means
 if we have code like this:
 
-\snippet examples/tutorials/extending/chapter3-bindings/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter3-bindings/app.qml 0
 
 \image extending-tutorial-chapter3.png
 
@@ -231,17 +231,17 @@ It's easy to enable property binding for the \c color property.
 We add a \l{Qt's Property System}{NOTIFY} feature to its Q_PROPERTY() declaration to indicate that a "colorChanged" signal
 is emitted whenever the value changes.
 
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 2
 \dots
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.h 3
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.h 3
 
 Then, we emit this signal in \c setPieSlice():
 
-\snippet examples/tutorials/extending/chapter3-bindings/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp 0
 
 It's important for \c setColor() to check that the color value has actually changed
 before emitting \c colorChanged(). This ensures the signal is not emitted unnecessarily and
@@ -259,7 +259,7 @@ custom QML types may see unexpected behavior if bindings are not implemented.
 /*!
 \title Chapter 4: Using Custom Property Types
 
-\example examples/tutorials/extending/chapter4-customPropertyTypes
+\example examples/quick/tutorials/extending/chapter4-customPropertyTypes
 
 The \c PieChart type currently has a string-type property and a color-type property.
 It could have many other types of properties. For example, it could have an
@@ -299,43 +299,43 @@ For example, let's replace the use of the \c property with a type called
 "PieSlice" that has a \c color property. Instead of assigning a color,
 we assign an \c PieSlice value which itself contains a \c color:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml 0
 
 Like \c PieChart, this new \c PieSlice type inherits from QQuickPaintedItem and declares
 its properties with Q_PROPERTY():
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h 0
 
 To use it in \c PieChart, we modify the \c color property declaration
 and associated method signatures:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 2
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h 3
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h 3
 
 There is one thing to be aware of when implementing \c setPieSlice(). The \c PieSlice
 is a visual item, so it must be set as a child of the \c PieChart using
 QQuickItem::setParentItem() so that the \c PieChart knows to paint this child
 item when its contents are drawn:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp 0
 
 
 Like the \c PieChart type, the \c PieSlice type has to be registered
 using qmlRegisterType() to be used from QML. As with \c PieChart, we'll add the
 type to the "Charts" type namespace, version 1.0:
 
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp 0
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp 0
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp 1
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp 1
 \dots
-\snippet examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp 2
+\snippet examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp 2
 
-Try it out with the code in Qt's \c examples/tutorials/extending/chapter4-customPropertyTypes directory.
+Try it out with the code in Qt's \c examples/quick/tutorials/extending/chapter4-customPropertyTypes directory.
 
 */
 
@@ -343,13 +343,13 @@ Try it out with the code in Qt's \c examples/tutorials/extending/chapter4-custom
 /*!
 \title Chapter 5: Using List Property Types
 
-\example examples/tutorials/extending/chapter5-listproperties
+\example examples/quick/tutorials/extending/chapter5-listproperties
 
 Right now, a \c PieChart can only have one \c PieSlice. Ideally a chart would
 have multiple slices, with different colors and sizes. To do this, we could
 have a \c slices property that accepts a list of \c PieSlice items:
 
-\snippet examples/tutorials/extending/chapter5-listproperties/app.qml 0
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/app.qml 0
 
 \image extending-tutorial-chapter5.png
 
@@ -360,11 +360,11 @@ function with a \c slices() function that returns a list of slices, and add
 an internal \c append_slice() function (discussed below). We also use a QList to
 store the internal list of slices as \c m_slices:
 
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.h 0
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.h 0
 \dots
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.h 1
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.h 1
 \dots
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.h 2
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.h 2
 
 Although the \c slices property does not have an associated \c WRITE function,
 it is still modifiable because of the way QQmlListProperty works.
@@ -373,7 +373,7 @@ return a QQmlListProperty value and indicate that the internal
 \c PieChart::append_slice() function is to be called whenever a request is made from QML
 to add items to the list:
 
-\snippet examples/tutorials/extending/chapter5-listproperties/piechart.cpp 0
+\snippet examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp 0
 
 The \c append_slice() function simply sets the parent item as before,
 and adds the new item to the \c m_slices list. As you can see, the append function for a
@@ -384,7 +384,7 @@ The \c PieSlice class has also been modified to include \c fromAngle and \c angl
 properties and to draw the slice according to these values. This is a straightforward
 modification if you have read the previous pages in this tutorial, so the code is not shown here.
 
-The complete code can be seen in the updated \c examples/tutorials/extending/chapter5-listproperties directory.
+The complete code can be seen in the updated \c examples/quick/tutorials/extending/chapter5-listproperties directory.
 
 */
 
@@ -392,7 +392,7 @@ The complete code can be seen in the updated \c examples/tutorials/extending/cha
 /*!
 \title Chapter 6: Writing an Extension Plugin
 
-\example examples/tutorials/extending/chapter6-plugins
+\example examples/quick/tutorials/extending/chapter6-plugins
 
 Currently the \c PieChart and \c PieSlice types are used by \c app.qml,
 which is displayed using a QQuickView in a C++ application. An alternative
@@ -407,22 +407,22 @@ and registers our QML types in the inherited \l{QQmlExtensionPlugin::}{registerT
 
 Here is the \c ChartsPlugin definition in \c chartsplugin.h:
 
-\snippet examples/tutorials/extending/chapter6-plugins/chartsplugin.h 0
+\snippet examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h 0
 
 And its implementation in \c chartsplugin.cpp:
 
-\snippet examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp 0
+\snippet examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp 0
 
 Then, we write a \c .pro project file that defines the project as a plugin library
 and specifies with DESTDIR that library files should be built into a "lib" subdirectory:
 
-\quotefile examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+\quotefile examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
 
 Finally, we add a \l{qtqml-modules-qmldir.html}{qmldir} file that is
 parsed by the QML engine.  In this file, we specify that a plugin named
 "chapter6-plugin" (the name of the example project) can be found in the "lib" subdirectory:
 
-\quotefile examples/tutorials/extending/chapter6-plugins/Charts/qmldir
+\quotefile examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
 
 Now we have a plugin, and instead of having a main.cpp and an executable, we can build
 the project and then load the QML file using the \l{Prototyping with qmlscene}{qmlscene tool},
diff --git a/src/quick/doc/src/advtutorial.qdoc b/src/quick/doc/src/advtutorial.qdoc
index f5b3e8b7db779621f8b6360b6d3ddd8b05eb73fc..d4468d1a6f72dc197087be971b57d1b0f5ceddab 100644
--- a/src/quick/doc/src/advtutorial.qdoc
+++ b/src/quick/doc/src/advtutorial.qdoc
@@ -59,7 +59,7 @@ Tutorial chapters:
 \li \l {tutorials/samegame/samegame4}{Finishing Touches}
 \endlist
 
-All the code in this tutorial can be found in Qt's \c examples/tutorials/samegame
+All the code in this tutorial can be found in Qt's \c examples/quick/tutorials/samegame
 directory.
 */
 
diff --git a/src/quick/doc/src/dynamicview-tutorial.qdoc b/src/quick/doc/src/dynamicview-tutorial.qdoc
index 0b5f2b4f604d4ddd9926608b3c8307da2688d328..3edfdc65c07d9a58502a62f2a4f8170951c9f6b8 100644
--- a/src/quick/doc/src/dynamicview-tutorial.qdoc
+++ b/src/quick/doc/src/dynamicview-tutorial.qdoc
@@ -45,7 +45,7 @@ Tutorial chapters:
 \li \l {tutorials/dynamicview/dynamicview4}{Sorting Items}
 \endlist
 
-All the code in this tutorial can be found in Qt's \c examples/tutorials/dynamicview
+All the code in this tutorial can be found in Qt's \c examples/quick/tutorials/dynamicview
 directory.
 */
 
@@ -139,7 +139,7 @@ so that is above other items in the stacking order and isn't obscured as it is d
 \previouspage QML Dynamic View Ordering Tutorial 2 - Dragging View Items
 \nextpage QML Dynamic View Ordering Tutorial 4 - Sorting Items
 
-\example examples/tutorials/dynamicview/dynamicview3
+\example examples/quick/tutorials/dynamicview/dynamicview3
 
 The next step in our application to move items within the list as they're dragged so that we
 can re-order the list.  To achieve this we introduce three new elements to our application;
diff --git a/src/quick/doc/src/tutorial.qdoc b/src/quick/doc/src/tutorial.qdoc
index 67951b0abd65ceddbdb59e07afd1dcbf1ec5e671..619f75469640a5de8ba39c34aa973529e2476cdc 100644
--- a/src/quick/doc/src/tutorial.qdoc
+++ b/src/quick/doc/src/tutorial.qdoc
@@ -41,7 +41,7 @@ with properties and signals, and we will create a simple animation with the help
 
 Chapter one starts with a minimal "Hello world" program and the following chapters introduce new concepts.
 
-The tutorial's source code is located in the \c{examples/tutorials/helloworld} directory.
+The tutorial's source code is located in the \c{examples/quick/tutorials/helloworld} directory.
 
 Tutorial chapters: