Adjust examples to follow Qt conventions

Adjust examples' file and directory naming to be consistent with Qt-wide
conventions.

Task-number: QTBUG-59229
Change-Id: I5c4eb66e91a12590600446a35b2656361561e2a3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

67 files changed, 48 insertions, 70 deletions

diff --git a/examples/RemoteObjects/ClientApp/ClientApp.desktop b/examples/RemoteObjects/ClientApp/ClientApp.desktop
deleted file mode 100644
index e85a515..0000000
--- a/examples/RemoteObjects/ClientApp/ClientApp.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=ClientApp
-Exec=/opt/ClientApp/bin/ClientApp
-Icon=ClientApp64
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/RemoteObjects/ClientApp/ClientApp64.png b/examples/RemoteObjects/ClientApp/ClientApp64.png
deleted file mode 100644
index 707d5c4..0000000
--- a/examples/RemoteObjects/ClientApp/ClientApp64.png
+++ /dev/null
diff --git a/examples/RemoteObjects/ClientApp/ClientApp80.png b/examples/RemoteObjects/ClientApp/ClientApp80.png
deleted file mode 100644
index 6ad8096..0000000
--- a/examples/RemoteObjects/ClientApp/ClientApp80.png
+++ /dev/null
diff --git a/examples/RemoteObjects/ClientApp/ClientApp_harmattan.desktop b/examples/RemoteObjects/ClientApp/ClientApp_harmattan.desktop
deleted file mode 100644
index d3da899..0000000
--- a/examples/RemoteObjects/ClientApp/ClientApp_harmattan.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Name=ClientApp
-Exec=/usr/bin/single-instance /opt/ClientApp/bin/ClientApp
-Icon=/usr/share/icons/hicolor/80x80/apps/ClientApp80.png
-X-Window-Icon=
-X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
diff --git a/examples/RemoteObjects/RemoteObjects.pro b/examples/RemoteObjects/RemoteObjects.pro
deleted file mode 100644
index 04b371c..0000000
--- a/examples/RemoteObjects/RemoteObjects.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += debug_and_release ordered
-SUBDIRS = \
-    server \
-    CppClient \
-    ModelViewClient \
-    ModelViewServer \
-    SimpleSwitch
-
-qtHaveModule(quick) {
-    SUBDIRS += \
-        plugins \
-        ClientApp
-
-    unix:!android: SUBDIRS += QMLModelViewClient
-}
diff --git a/examples/RemoteObjects/SimpleSwitch/SimpleSwitch.pro b/examples/RemoteObjects/SimpleSwitch/SimpleSwitch.pro
deleted file mode 100644
index 80473cb..0000000
--- a/examples/RemoteObjects/SimpleSwitch/SimpleSwitch.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    DirectConnectClient \
-    DirectConnectDynamicClient \
-    DirectConnectServer \
-    RegistryConnectedClient \
-    RegistryConnectedServer
diff --git a/examples/examples.pro b/examples/examples.pro
index 698f31d..09f19f7 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS = \
-          RemoteObjects
+          remoteobjects
diff --git a/examples/RemoteObjects/ClientApp/ClientApp.pro b/examples/remoteobjects/clientapp/clientapp.pro
index bb891fc..6d5a25d 100644
--- a/examples/RemoteObjects/ClientApp/ClientApp.pro
+++ b/examples/remoteobjects/clientapp/clientapp.pro
@@ -7,5 +7,5 @@ QT += remoteobjects quick
 
 contains(QT_CONFIG, c++11): CONFIG += c++11
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/ClientApp
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/clientapp
 INSTALLS += target
diff --git a/examples/RemoteObjects/ClientApp/clientapp.qrc b/examples/remoteobjects/clientapp/clientapp.qrc
index 7e6bf64..7e6bf64 100644
--- a/examples/RemoteObjects/ClientApp/clientapp.qrc
+++ b/examples/remoteobjects/clientapp/clientapp.qrc
diff --git a/examples/RemoteObjects/ClientApp/main.cpp b/examples/remoteobjects/clientapp/main.cpp
index 9155f05..9155f05 100644
--- a/examples/RemoteObjects/ClientApp/main.cpp
+++ b/examples/remoteobjects/clientapp/main.cpp
diff --git a/examples/RemoteObjects/ClientApp/qml/plugins.qml b/examples/remoteobjects/clientapp/qml/plugins.qml
index 7f7a3f3..7f7a3f3 100644
--- a/examples/RemoteObjects/ClientApp/qml/plugins.qml
+++ b/examples/remoteobjects/clientapp/qml/plugins.qml
diff --git a/examples/RemoteObjects/ClientApp/qml/plugins0.qml b/examples/remoteobjects/clientapp/qml/plugins0.qml
index 3ae39ea..3ae39ea 100644
--- a/examples/RemoteObjects/ClientApp/qml/plugins0.qml
+++ b/examples/remoteobjects/clientapp/qml/plugins0.qml
diff --git a/examples/RemoteObjects/ClientApp/qml/plugins1.qml b/examples/remoteobjects/clientapp/qml/plugins1.qml
index 3982991..3982991 100644
--- a/examples/RemoteObjects/ClientApp/qml/plugins1.qml
+++ b/examples/remoteobjects/clientapp/qml/plugins1.qml
diff --git a/examples/RemoteObjects/ClientApp/qml/plugins2.qml b/examples/remoteobjects/clientapp/qml/plugins2.qml
index 3538f37..3538f37 100644
--- a/examples/RemoteObjects/ClientApp/qml/plugins2.qml
+++ b/examples/remoteobjects/clientapp/qml/plugins2.qml
diff --git a/examples/RemoteObjects/CppClient/CppClient.pro b/examples/remoteobjects/cppclient/cppclient.pro
index 14a1390..7b57442 100644
--- a/examples/RemoteObjects/CppClient/CppClient.pro
+++ b/examples/remoteobjects/cppclient/cppclient.pro
@@ -15,5 +15,5 @@ SOURCES += main.cpp
 OTHER_FILES += \
     timemodel.rep
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/CppClient
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/cppclient
 INSTALLS += target
diff --git a/examples/RemoteObjects/CppClient/main.cpp b/examples/remoteobjects/cppclient/main.cpp
index 516eba4..516eba4 100644
--- a/examples/RemoteObjects/CppClient/main.cpp
+++ b/examples/remoteobjects/cppclient/main.cpp
diff --git a/examples/RemoteObjects/CppClient/timemodel.rep b/examples/remoteobjects/cppclient/timemodel.rep
index cbfaf24..cbfaf24 100644
--- a/examples/RemoteObjects/CppClient/timemodel.rep
+++ b/examples/remoteobjects/cppclient/timemodel.rep
diff --git a/examples/RemoteObjects/ModelViewClient/main.cpp b/examples/remoteobjects/modelviewclient/main.cpp
index 0d9328b..0d9328b 100644
--- a/examples/RemoteObjects/ModelViewClient/main.cpp
+++ b/examples/remoteobjects/modelviewclient/main.cpp
diff --git a/examples/RemoteObjects/ModelViewClient/ModelViewClient.pro b/examples/remoteobjects/modelviewclient/modelviewclient.pro
index 797925b..f2ab294 100644
--- a/examples/RemoteObjects/ModelViewClient/ModelViewClient.pro
+++ b/examples/remoteobjects/modelviewclient/modelviewclient.pro
@@ -3,7 +3,7 @@ SOURCES = main.cpp
 CONFIG   -= app_bundle
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/ModelViewClient
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/modelviewclient
 INSTALLS += target
 
 QT += widgets remoteobjects
diff --git a/examples/RemoteObjects/ModelViewServer/main.cpp b/examples/remoteobjects/modelviewserver/main.cpp
index 6ed56b3..6ed56b3 100644
--- a/examples/RemoteObjects/ModelViewServer/main.cpp
+++ b/examples/remoteobjects/modelviewserver/main.cpp
diff --git a/examples/RemoteObjects/ModelViewServer/ModelViewServer.pro b/examples/remoteobjects/modelviewserver/modelviewserver.pro
index 76f7ab2..53abb6b 100644
--- a/examples/RemoteObjects/ModelViewServer/ModelViewServer.pro
+++ b/examples/remoteobjects/modelviewserver/modelviewserver.pro
@@ -6,5 +6,5 @@ CONFIG += c++11
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/ModelViewServer
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/modelviewserver
 INSTALLS += target
diff --git a/examples/RemoteObjects/plugins/imports/TimeExample/Clock.qml b/examples/remoteobjects/plugins/imports/TimeExample/Clock.qml
index 8576b60..8576b60 100644
--- a/examples/RemoteObjects/plugins/imports/TimeExample/Clock.qml
+++ b/examples/remoteobjects/plugins/imports/TimeExample/Clock.qml
diff --git a/examples/RemoteObjects/plugins/imports/TimeExample/center.png b/examples/remoteobjects/plugins/imports/TimeExample/center.png
index 7fbd802..7fbd802 100644
--- a/examples/RemoteObjects/plugins/imports/TimeExample/center.png
+++ b/examples/remoteobjects/plugins/imports/TimeExample/center.png
diff --git a/examples/RemoteObjects/plugins/imports/TimeExample/clock.png b/examples/remoteobjects/plugins/imports/TimeExample/clock.png
index 462edac..462edac 100644
--- a/examples/RemoteObjects/plugins/imports/TimeExample/clock.png
+++ b/examples/remoteobjects/plugins/imports/TimeExample/clock.png
diff --git a/examples/RemoteObjects/plugins/imports/TimeExample/hour.png b/examples/remoteobjects/plugins/imports/TimeExample/hour.png
index f8061a1..f8061a1 100644
--- a/examples/RemoteObjects/plugins/imports/TimeExample/hour.png
+++ b/examples/remoteobjects/plugins/imports/TimeExample/hour.png
diff --git a/examples/RemoteObjects/plugins/imports/TimeExample/minute.png b/examples/remoteobjects/plugins/imports/TimeExample/minute.png
index 1297ec7..1297ec7 100644
--- a/examples/RemoteObjects/plugins/imports/TimeExample/minute.png
+++ b/examples/remoteobjects/plugins/imports/TimeExample/minute.png
diff --git a/examples/RemoteObjects/plugins/imports/TimeExample/qmldir b/examples/remoteobjects/plugins/imports/TimeExample/qmldir
index 252e662..252e662 100644
--- a/examples/RemoteObjects/plugins/imports/TimeExample/qmldir
+++ b/examples/remoteobjects/plugins/imports/TimeExample/qmldir
diff --git a/examples/RemoteObjects/plugins/plugin.cpp b/examples/remoteobjects/plugins/plugin.cpp
index a6f8c3b..a6f8c3b 100644
--- a/examples/RemoteObjects/plugins/plugin.cpp
+++ b/examples/remoteobjects/plugins/plugin.cpp
diff --git a/examples/RemoteObjects/plugins/plugins.pro b/examples/remoteobjects/plugins/plugins.pro
index 7753d18..34ade94 100644
--- a/examples/RemoteObjects/plugins/plugins.pro
+++ b/examples/remoteobjects/plugins/plugins.pro
@@ -19,9 +19,9 @@ pluginfiles.files += \
     imports/TimeExample/minute.png
 
 qml.files = plugins.qml
-qml.path += $$[QT_INSTALL_EXAMPLES]/RemoteObjects/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/RemoteObjects/plugins/imports/TimeExample
-pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/RemoteObjects/plugins/imports/TimeExample
+qml.path += $$[QT_INSTALL_EXAMPLES]/remoteobjects/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/remoteobjects/plugins/imports/TimeExample
+pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/remoteobjects/plugins/imports/TimeExample
 
 INSTALLS += target qml pluginfiles
 
diff --git a/examples/RemoteObjects/plugins/plugins.qml b/examples/remoteobjects/plugins/plugins.qml
index beea953..beea953 100644
--- a/examples/RemoteObjects/plugins/plugins.qml
+++ b/examples/remoteobjects/plugins/plugins.qml
diff --git a/examples/RemoteObjects/plugins/plugins0.qml b/examples/remoteobjects/plugins/plugins0.qml
index 3ae39ea..3ae39ea 100644
--- a/examples/RemoteObjects/plugins/plugins0.qml
+++ b/examples/remoteobjects/plugins/plugins0.qml
diff --git a/examples/RemoteObjects/plugins/plugins1.qml b/examples/remoteobjects/plugins/plugins1.qml
index 3982991..3982991 100644
--- a/examples/RemoteObjects/plugins/plugins1.qml
+++ b/examples/remoteobjects/plugins/plugins1.qml
diff --git a/examples/RemoteObjects/plugins/plugins2.qml b/examples/remoteobjects/plugins/plugins2.qml
index 3538f37..3538f37 100644
--- a/examples/RemoteObjects/plugins/plugins2.qml
+++ b/examples/remoteobjects/plugins/plugins2.qml
diff --git a/examples/RemoteObjects/QMLModelViewClient/main.cpp b/examples/remoteobjects/qmlmodelviewclient/main.cpp
index 3682995..3682995 100644
--- a/examples/RemoteObjects/QMLModelViewClient/main.cpp
+++ b/examples/remoteobjects/qmlmodelviewclient/main.cpp
diff --git a/examples/RemoteObjects/QMLModelViewClient/main.qml b/examples/remoteobjects/qmlmodelviewclient/main.qml
index ca7c943..ca7c943 100644
--- a/examples/RemoteObjects/QMLModelViewClient/main.qml
+++ b/examples/remoteobjects/qmlmodelviewclient/main.qml
diff --git a/examples/RemoteObjects/QMLModelViewClient/qml.qrc b/examples/remoteobjects/qmlmodelviewclient/qml.qrc
index 5f6483a..5f6483a 100644
--- a/examples/RemoteObjects/QMLModelViewClient/qml.qrc
+++ b/examples/remoteobjects/qmlmodelviewclient/qml.qrc
diff --git a/examples/RemoteObjects/QMLModelViewClient/QMLModelViewClient.pro b/examples/remoteobjects/qmlmodelviewclient/qmlmodelviewclient.pro
index 849face..4e9c12d 100644
--- a/examples/RemoteObjects/QMLModelViewClient/QMLModelViewClient.pro
+++ b/examples/remoteobjects/qmlmodelviewclient/qmlmodelviewclient.pro
@@ -7,5 +7,5 @@ SOURCES += main.cpp
 
 RESOURCES += qml.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/QMLModelViewClient
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/qmlmodelviewclient
 INSTALLS += target
diff --git a/examples/remoteobjects/remoteobjects.pro b/examples/remoteobjects/remoteobjects.pro
new file mode 100644
index 0000000..afe5a24
--- /dev/null
+++ b/examples/remoteobjects/remoteobjects.pro
@@ -0,0 +1,16 @@
+TEMPLATE = subdirs
+CONFIG += debug_and_release ordered
+SUBDIRS = \
+    server \
+    cppclient \
+    modelviewclient \
+    modelviewserver \
+    simpleswitch
+
+qtHaveModule(quick) {
+    SUBDIRS += \
+        plugins \
+        clientapp
+
+    unix:!android: SUBDIRS += qmlmodelviewclient
+}
diff --git a/examples/RemoteObjects/server/main.cpp b/examples/remoteobjects/server/main.cpp
index db9f4f6..07b5fca 100644
--- a/examples/RemoteObjects/server/main.cpp
+++ b/examples/remoteobjects/server/main.cpp
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-#include "TimeModel.h"
+#include "timemodel.h"
 
 #include <QCoreApplication>
 /*
diff --git a/examples/RemoteObjects/server/server.pro b/examples/remoteobjects/server/server.pro
index d619686..dc88d28 100644
--- a/examples/RemoteObjects/server/server.pro
+++ b/examples/remoteobjects/server/server.pro
@@ -4,10 +4,10 @@ CONFIG   += console
 REPC_SOURCE += ../timemodel.rep
 QT = remoteobjects core
 
-SOURCES += TimeModel.cpp main.cpp
-HEADERS += TimeModel.h
+SOURCES += timemodel.cpp main.cpp
+HEADERS += timemodel.h
 
 contains(QT_CONFIG, c++11): CONFIG += c++11
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/server
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/server
 INSTALLS += target
diff --git a/examples/RemoteObjects/server/TimeModel.cpp b/examples/remoteobjects/server/timemodel.cpp
index 9390483..578c3ef 100644
--- a/examples/RemoteObjects/server/TimeModel.cpp
+++ b/examples/remoteobjects/server/timemodel.cpp
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-#include "TimeModel.h"
+#include "timemodel.h"
 
 MinuteTimer::MinuteTimer(QObject *parent) : MinuteTimerSimpleSource(parent)
 {
diff --git a/examples/RemoteObjects/server/TimeModel.h b/examples/remoteobjects/server/timemodel.h
index dcfd9d3..dcfd9d3 100644
--- a/examples/RemoteObjects/server/TimeModel.h
+++ b/examples/remoteobjects/server/timemodel.h
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.cpp b/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp
index d528f05..d528f05 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectclient/client.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.h b/examples/remoteobjects/simpleswitch/directconnectclient/client.h
index 5078273..5078273 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/client.h
+++ b/examples/remoteobjects/simpleswitch/directconnectclient/client.h
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/DirectConnectClient.pro b/examples/remoteobjects/simpleswitch/directconnectclient/directconnectclient.pro
index 631cce9..3624821 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/DirectConnectClient.pro
+++ b/examples/remoteobjects/simpleswitch/directconnectclient/directconnectclient.pro
@@ -2,7 +2,7 @@ QT       += remoteobjects core
 
 QT       -= gui
 
-TARGET = DirectConnectClient
+TARGET = directconnectclient
 CONFIG   += console
 CONFIG   -= app_bundle
 
@@ -10,7 +10,7 @@ REPC_REPLICA = simpleswitch.rep
 
 TEMPLATE = app
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/SimpleSwitch/DirectConnectClient
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/simpleswitch/directconnectclient
 INSTALLS += target
 
 SOURCES += main.cpp \
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/main.cpp b/examples/remoteobjects/simpleswitch/directconnectclient/main.cpp
index 79930c8..79930c8 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/main.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectclient/main.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/simpleswitch.rep b/examples/remoteobjects/simpleswitch/directconnectclient/simpleswitch.rep
index b2d7cd2..b2d7cd2 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectClient/simpleswitch.rep
+++ b/examples/remoteobjects/simpleswitch/directconnectclient/simpleswitch.rep
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/DirectConnectDynamicClient.pro b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/directconnectdynamicclient.pro
index 9b797ef..8b907de 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/DirectConnectDynamicClient.pro
+++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/directconnectdynamicclient.pro
@@ -2,13 +2,13 @@ QT       += remoteobjects core
 
 QT       -= gui
 
-TARGET = DirectConnectDynamicClient
+TARGET = directconnectdynamicclient
 CONFIG   += console
 CONFIG   -= app_bundle
 
 TEMPLATE = app
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/simpleswitch/directconnectdynamicclient
 INSTALLS += target
 
 SOURCES += main.cpp \
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/dynamicclient.cpp b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp
index 629e7e4..629e7e4 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/dynamicclient.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/dynamicclient.h b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.h
index e4b2286..e4b2286 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/dynamicclient.h
+++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/dynamicclient.h
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/main.cpp b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/main.cpp
index b2b459c..b2b459c 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectDynamicClient/main.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/main.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/DirectConnectServer.pro b/examples/remoteobjects/simpleswitch/directconnectserver/directconnectserver.pro
index f477f3c..bbc3d7e 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/DirectConnectServer.pro
+++ b/examples/remoteobjects/simpleswitch/directconnectserver/directconnectserver.pro
@@ -2,7 +2,7 @@ QT       += remoteobjects core
 
 QT       -= gui
 
-TARGET = DirectConnectServer
+TARGET = directconnectserver
 CONFIG   += console
 CONFIG   -= app_bundle
 
@@ -10,7 +10,7 @@ REPC_SOURCE = simpleswitch.rep
 
 TEMPLATE = app
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/SimpleSwitch/DirectConnectServer
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/simpleswitch/directconnectserver
 INSTALLS += target
 
 SOURCES += main.cpp \
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/main.cpp b/examples/remoteobjects/simpleswitch/directconnectserver/main.cpp
index 34869ba..34869ba 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/main.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectserver/main.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.cpp b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.cpp
index dddce28..dddce28 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.cpp
+++ b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.h b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h
index 916a09d..916a09d 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.h
+++ b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.h
diff --git a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.rep b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.rep
index b2d7cd2..b2d7cd2 100644
--- a/examples/RemoteObjects/SimpleSwitch/DirectConnectServer/simpleswitch.rep
+++ b/examples/remoteobjects/simpleswitch/directconnectserver/simpleswitch.rep
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/dynamicclient.cpp b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp
index 629e7e4..629e7e4 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/dynamicclient.cpp
+++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/dynamicclient.h b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.h
index e4b2286..e4b2286 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/dynamicclient.h
+++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/dynamicclient.h
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/main.cpp b/examples/remoteobjects/simpleswitch/registryconnectedclient/main.cpp
index d7b38cd..d7b38cd 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/main.cpp
+++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/main.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/RegistryConnectedClient.pro b/examples/remoteobjects/simpleswitch/registryconnectedclient/registryconnectedclient.pro
index 6dd01ac..02aa54c 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedClient/RegistryConnectedClient.pro
+++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/registryconnectedclient.pro
@@ -8,13 +8,13 @@ QT       += remoteobjects core
 
 QT       -= gui
 
-TARGET = RegistryConnectedClient
+TARGET = registryconnectedclient
 CONFIG   += console
 CONFIG   -= app_bundle
 
 TEMPLATE = app
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/SimpleSwitch/RegistryConnectedClient
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/simpleswitch/registryconnectedclient
 INSTALLS += target
 
 SOURCES += main.cpp \
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/main.cpp b/examples/remoteobjects/simpleswitch/registryconnectedserver/main.cpp
index 61ce173..61ce173 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/main.cpp
+++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/main.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/RegistryConnectedServer.pro b/examples/remoteobjects/simpleswitch/registryconnectedserver/registryconnectedserver.pro
index 9ca7bac..d00687f 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/RegistryConnectedServer.pro
+++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/registryconnectedserver.pro
@@ -8,7 +8,7 @@ QT       += remoteobjects core
 
 QT       -= gui
 
-TARGET = RegistryConnectedServer
+TARGET = registryconnectedserver
 CONFIG   += console
 CONFIG   -= app_bundle
 
@@ -17,7 +17,7 @@ REPC_SOURCE = simpleswitch.rep
 
 TEMPLATE = app
 
-target.path = $$[QT_INSTALL_EXAMPLES]/RemoteObjects/SimpleSwitch/RegistryConnectedServer
+target.path = $$[QT_INSTALL_EXAMPLES]/remoteobjects/simpleswitch/registryconnectedserver
 INSTALLS += target
 
 SOURCES += main.cpp \
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.cpp b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.cpp
index dddce28..dddce28 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.cpp
+++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.cpp
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.h b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h
index 916a09d..916a09d 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.h
+++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.h
diff --git a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.rep b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.rep
index 4f7c9c7..4f7c9c7 100644
--- a/examples/RemoteObjects/SimpleSwitch/RegistryConnectedServer/simpleswitch.rep
+++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/simpleswitch.rep
diff --git a/examples/remoteobjects/simpleswitch/simpleswitch.pro b/examples/remoteobjects/simpleswitch/simpleswitch.pro
new file mode 100644
index 0000000..8b70a12
--- /dev/null
+++ b/examples/remoteobjects/simpleswitch/simpleswitch.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+    directconnectclient \
+    directconnectdynamicclient \
+    directconnectserver \
+    registryconnectedclient \
+    registryconnectedserver
diff --git a/examples/RemoteObjects/timemodel.rep b/examples/remoteobjects/timemodel.rep
index 0c9ca6a..0c9ca6a 100644
--- a/examples/RemoteObjects/timemodel.rep
+++ b/examples/remoteobjects/timemodel.rep