Split the QtApplicationManager qml module

Into QtApplicationManager, QtApplicationManager.SystemUI and
QtApplicationManager.Application

Task-number: AUTOSUITE-671
Change-Id: I09eb914e026e230280c426dd00884f2883b5e7bd
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

92 files changed, 214 insertions, 138 deletions

diff --git a/benchmarks/appman-bench/system-ui/main.qml b/benchmarks/appman-bench/system-ui/main.qml
index a20a7464..de8f50cb 100644
--- a/benchmarks/appman-bench/system-ui/main.qml
+++ b/benchmarks/appman-bench/system-ui/main.qml
@@ -52,8 +52,7 @@
 
 import QtQuick 2.8
 import QtQuick.Window 2.2
-import QtApplicationManager 1.0
-import QtApplicationManager 1.0 as AppMan
+import QtApplicationManager.SystemUI 1.0
 
 Window {
     id: root
diff --git a/benchmarks/appman-bench/templates/appman-qml/main.qml b/benchmarks/appman-bench/templates/appman-qml/main.qml
index 97211c40..02fa0fe4 100644
--- a/benchmarks/appman-bench/templates/appman-qml/main.qml
+++ b/benchmarks/appman-bench/templates/appman-qml/main.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/doc/elements-apps.qdoc b/doc/elements-apps.qdoc
index da117bce..da6d9ed7 100644
--- a/doc/elements-apps.qdoc
+++ b/doc/elements-apps.qdoc
@@ -28,11 +28,10 @@
 /*!
 
 \page qml-apps.html
-\title Applications QML Types
-\brief A listing of standard QML types used in applications.
+\title QtApplicationManager.Application QML module
+\brief Qt Application Manager module to be used in applications
 
-These are the functionally grouped lists of QML types as part of \c
-QtApplicationManager.
+The QtApplicationManager.Application QML module contains the components and types to be used in an application.
 
 Singleton QML types need not be declared, they are referenced by just their type name.
 
diff --git a/doc/elements-common.qdoc b/doc/elements-common.qdoc
new file mode 100644
index 00000000..a134409f
--- /dev/null
+++ b/doc/elements-common.qdoc
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 Pelagicore AG
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Pelagicore Application Manager.
+**
+** $QT_BEGIN_LICENSE:FDL-QTAS$
+** Commercial License Usage
+** Licensees holding valid commercial Qt Automotive Suite licenses may use
+** this file in accordance with the commercial license agreement provided
+** with the Software or, alternatively, in accordance with the terms
+** contained in a written agreement between you and The Qt Company.  For
+** licensing terms and conditions see https://www.qt.io/terms-conditions.
+** For further information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+
+\page qml-common.html
+\title QtApplicationManager QML module
+\brief Qt Application Manager module common to both System-UI and applications
+
+The QtApplicationManager QML module contains the components and types available to both System-UI and applications.
+
+Singleton QML types need not be declared, they are referenced by just their type name.
+
+\section1 QML Singletons
+\annotatedlist common-singletons
+
+*/
diff --git a/doc/elements-systemui.qdoc b/doc/elements-systemui.qdoc
index 29ec974b..d1a7aabe 100644
--- a/doc/elements-systemui.qdoc
+++ b/doc/elements-systemui.qdoc
@@ -28,11 +28,10 @@
 /*!
 
 \page qml-sysui.html
-\title System-UI QML Types
-\brief A listing of standard QML types used in the System-UI.
+\title QtApplicationManager.SystemUI QML module
+\brief Qt Application Manager module to be used in a System-UI
 
-These are the functionally grouped lists of QML types as part of \c
-QtApplicationManager.
+The QtApplicationManager.SystemUI QML module contains the components and types to be used in a System-UI.
 
 Singleton QML types need not be declared, they are referenced by just their type name.
 
diff --git a/doc/index.qdoc b/doc/index.qdoc
index 8b0bd911..516e8b30 100644
--- a/doc/index.qdoc
+++ b/doc/index.qdoc
@@ -63,8 +63,9 @@ high-level overview of the package.
 \section1 Reference
 \list
     \li \l{Manifest Definition}{Applications Manifest Definition (info.yaml)}
-    \li \l{System-UI QML Types}
-    \li \l{Applications QML Types}
+    \li \l{QtApplicationManager QML module}
+    \li \l{QtApplicationManager.SystemUI QML module}
+    \li \l{QtApplicationManager.Application QML module}
 \endlist
 
 \section1 Examples
diff --git a/doc/migration-guide-5.12.qdoc b/doc/migration-guide-5.12.qdoc
index e5360f7b..50d9df8a 100644
--- a/doc/migration-guide-5.12.qdoc
+++ b/doc/migration-guide-5.12.qdoc
@@ -37,6 +37,32 @@ solely on the System-UI side, therefore application code remains unchanged.
 There are also cases where there's no API break but instead new, better, APIs for achieving the same
 result in 5.12. This document also covers some of such situations.
 
+\section1 Import statements
+
+Most of the content of the QtApplicationManager QML module was moved into two new modules:
+\l{QtApplicationManager.SystemUI QML module}{QtApplicationManager.SystemUI}
+and \l{QtApplicationManager.Application QML module}{QtApplicationManager.Application}. The following
+table briefly explains each of them:
+
+\table
+\header
+    \li QML Module Name
+    \li Content
+\row
+    \li \l{QtApplicationManager QML module}{QtApplicationManager}
+    \li Components and types in common to applications and System-UI. Both
+        System-UI and application code can import this module.
+\row
+    \li \l{QtApplicationManager.SystemUI QML module}{QtApplicationManager.SystemUI}
+    \li Components and types that a System-UI can use. Applications should
+        not import this module.
+\row
+    \li \l{QtApplicationManager.Application QML module}{QtApplicationManager.Application}
+    \li Components and types that an application can use. System-UI code should
+        not import this module.
+\endtable
+
+
 \section1 ApplicationManager and applications
 
 \section2 ApplicationObject
@@ -53,7 +79,7 @@ if (application.state === AppMan.Application.Installed) {
     ...
 }
 \newcode
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 ...
 if (application.state === ApplicationObject.Installed) {
     ...
diff --git a/doc/qmlmodule.qdoc b/doc/qmlmodule.qdoc
index cc468ba0..0190be63 100644
--- a/doc/qmlmodule.qdoc
+++ b/doc/qmlmodule.qdoc
@@ -27,7 +27,21 @@
 
 /*!
 
+    \qmlmodule QtApplicationManager.SystemUI 1.0
+    \title Qt Application Manager System-UI QML types
+    \ingroup qmlmodules
+*/
+
+/*!
+
+    \qmlmodule QtApplicationManager.Application 1.0
+    \title Qt Application Manager Application QML types
+    \ingroup qmlmodules
+*/
+
+/*!
+
     \qmlmodule QtApplicationManager 1.0
-    \title Qt Application Manager QML Types
+    \title Qt Application Manager QML types common to System-UI and applications
     \ingroup qmlmodules
 */
diff --git a/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml b/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml
index b2a29033..7739a992 100644
--- a/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml
+++ b/dummyimports/QtApplicationManager/ApplicationManagerWindow.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Item {
     id: root
diff --git a/dummyimports/QtApplicationManager/WindowManager.qml b/dummyimports/QtApplicationManager/WindowManager.qml
index 8ae27477..262e976f 100644
--- a/dummyimports/QtApplicationManager/WindowManager.qml
+++ b/dummyimports/QtApplicationManager/WindowManager.qml
@@ -41,7 +41,7 @@
 
 pragma Singleton
 import QtQuick 2.2
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 QtObject {
     id: root
diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml
index 46000b84..6a4127e8 100644
--- a/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml
+++ b/examples/applicationmanager/animated-windows/apps/animated-windows.fish/fish.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml
index 6077f046..4e38ce61 100644
--- a/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml
+++ b/examples/applicationmanager/animated-windows/apps/animated-windows.rabbit/rabbit.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/examples/applicationmanager/animated-windows/system-ui/main.qml b/examples/applicationmanager/animated-windows/system-ui/main.qml
index 3f0cafc3..818eeeae 100644
--- a/examples/applicationmanager/animated-windows/system-ui/main.qml
+++ b/examples/applicationmanager/animated-windows/system-ui/main.qml
@@ -52,7 +52,7 @@
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.11
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Rectangle {
     width: 1024
diff --git a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml
index 142fd518..5d1afac7 100644
--- a/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml
+++ b/examples/applicationmanager/hello-world/apps/hello-world.blue/main.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: "blue"
diff --git a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml
index 2c0dea9e..916e2827 100644
--- a/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml
+++ b/examples/applicationmanager/hello-world/apps/hello-world.green/main.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: "Green"
diff --git a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml
index 648b2fba..bba3216c 100644
--- a/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml
+++ b/examples/applicationmanager/hello-world/apps/hello-world.red/main.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: "red"
diff --git a/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc b/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc
index f3fc79f0..b07b4aab 100644
--- a/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc
+++ b/examples/applicationmanager/hello-world/doc/src/hello-world.qdoc
@@ -100,7 +100,7 @@ For information on these and other command line options you can run \tt{appman -
 \section1 System-UI implementation
 
 Our Hello World System-UI code starts like any simple QML application, with some imports and a plain
-Item at the root. The only difference is that it also imports the \c QtApplicationManager module,
+Item at the root. The only difference is that it also imports the \c QtApplicationManager.SystemUI module,
 besides \c QtQuick.
 
 \quotefromfile applicationmanager/hello-world/system-ui.qml
@@ -139,7 +139,7 @@ Our Hello World applications just display a "Hello World!" text against a colore
 \printuntil /^\}/
 
 The only difference from a plain QML application is that the root element is an ApplicationManagerWindow,
-provided by the \c QtApplicationManager module.
+provided by the \c QtApplicationManager.Application module.
 
 \section2 Application metadata
 
diff --git a/examples/applicationmanager/hello-world/system-ui.qml b/examples/applicationmanager/hello-world/system-ui.qml
index 9bca06a3..5cad6306 100644
--- a/examples/applicationmanager/hello-world/system-ui.qml
+++ b/examples/applicationmanager/hello-world/system-ui.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Item {
     width: 800
diff --git a/examples/applicationmanager/intents/shared/IntentClient.qml b/examples/applicationmanager/intents/shared/IntentClient.qml
index 1328aacb..8d837d67 100644
--- a/examples/applicationmanager/intents/shared/IntentClient.qml
+++ b/examples/applicationmanager/intents/shared/IntentClient.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.11
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/examples/applicationmanager/intents/shared/IntentPage.qml b/examples/applicationmanager/intents/shared/IntentPage.qml
index 7709a236..de0d8f2f 100644
--- a/examples/applicationmanager/intents/shared/IntentPage.qml
+++ b/examples/applicationmanager/intents/shared/IntentPage.qml
@@ -53,7 +53,6 @@
 import QtQuick 2.11
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.4
-import QtApplicationManager 1.0
 
 Rectangle {
     id: root
diff --git a/examples/applicationmanager/intents/system-ui.qml b/examples/applicationmanager/intents/system-ui.qml
index 830c84bd..a407579e 100644
--- a/examples/applicationmanager/intents/system-ui.qml
+++ b/examples/applicationmanager/intents/system-ui.qml
@@ -53,7 +53,7 @@
 import QtQuick 2.11
 import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.4
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 import "shared"
 
 Item {
diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
index 76ab5dc0..ecf65b85 100644
--- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
index 88b1f745..045afbb9 100644
--- a/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: ApplicationInterface.systemProperties.light ? "peachpuff" : "black"
diff --git a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
index ccc19941..c2dfa685 100644
--- a/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
+++ b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
@@ -86,7 +86,7 @@ path/to/bin/appman -c am-config.yaml -r --start-session-dbus
 \printline }
 \dots
 
-The \l{QtApplicationManager} module has to be imported to be able to access the application-manager
+The \l{QtApplicationManager.SystemUI} module has to be imported to be able to access the application-manager
 APIs. The System-UI window has a fixed size and linen background color. Instead of a \l{Rectangle},
 the root element could as well be a \l{Window}. On top of the background the
 \l{minidesk/system-ui/Readme.qml}{Readme} element is shown that displays a usage how-to. At the
diff --git a/examples/applicationmanager/minidesk/system-ui/main.qml b/examples/applicationmanager/minidesk/system-ui/main.qml
index b587b1c4..b4a309d2 100644
--- a/examples/applicationmanager/minidesk/system-ui/main.qml
+++ b/examples/applicationmanager/minidesk/system-ui/main.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Rectangle {
     width: 1024
diff --git a/examples/applicationmanager/monitor/apps/tld.monitor.app/ApplicationWindow.qml b/examples/applicationmanager/monitor/apps/tld.monitor.app/ApplicationWindow.qml
index d326205a..bcafcc7a 100644
--- a/examples/applicationmanager/monitor/apps/tld.monitor.app/ApplicationWindow.qml
+++ b/examples/applicationmanager/monitor/apps/tld.monitor.app/ApplicationWindow.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/examples/applicationmanager/monitor/apps/tld.monitor.app/app.qml b/examples/applicationmanager/monitor/apps/tld.monitor.app/app.qml
index e8c57e0a..a199d467 100644
--- a/examples/applicationmanager/monitor/apps/tld.monitor.app/app.qml
+++ b/examples/applicationmanager/monitor/apps/tld.monitor.app/app.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationWindow {
     title: "Primary Window"
diff --git a/examples/applicationmanager/monitor/system-ui/WindowContainer.qml b/examples/applicationmanager/monitor/system-ui/WindowContainer.qml
index f3ca4dfb..66215eb9 100644
--- a/examples/applicationmanager/monitor/system-ui/WindowContainer.qml
+++ b/examples/applicationmanager/monitor/system-ui/WindowContainer.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.6
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Rectangle {
     property bool active: false
diff --git a/examples/applicationmanager/monitor/system-ui/main.qml b/examples/applicationmanager/monitor/system-ui/main.qml
index 5ea54ff5..8d3a1327 100644
--- a/examples/applicationmanager/monitor/system-ui/main.qml
+++ b/examples/applicationmanager/monitor/system-ui/main.qml
@@ -52,7 +52,7 @@
 
 import QtQuick 2.6
 import QtQuick.Window 2.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Window {
     id: root
diff --git a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml
index dff73e7a..9627ff1b 100644
--- a/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml
+++ b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/examples/applicationmanager/multi-views/system-ui/main.qml b/examples/applicationmanager/multi-views/system-ui/main.qml
index 64d5ce4f..301d29a1 100644
--- a/examples/applicationmanager/multi-views/system-ui/main.qml
+++ b/examples/applicationmanager/multi-views/system-ui/main.qml
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Rectangle {
     width: 1024
diff --git a/src/application-lib/applicationinterface.cpp b/src/application-lib/applicationinterface.cpp
index 04802d67..c85ff592 100644
--- a/src/application-lib/applicationinterface.cpp
+++ b/src/application-lib/applicationinterface.cpp
@@ -41,7 +41,7 @@
 
 /*!
     \qmltype ApplicationInterface
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.Application
     \ingroup app-singletons
     \brief The main interface between apps and the application-manager.
 
diff --git a/src/common-lib/startuptimer.cpp b/src/common-lib/startuptimer.cpp
index fba5354f..3077a94b 100644
--- a/src/common-lib/startuptimer.cpp
+++ b/src/common-lib/startuptimer.cpp
@@ -68,8 +68,7 @@
 /*!
     \qmltype StartupTimer
     \inqmlmodule QtApplicationManager
-    \ingroup system-ui-singletons
-    \ingroup app-singletons
+    \ingroup common-singletons
     \brief A tool for startup performance analysis.
 
     The StartupTimer is a class for measuring the startup performance of the System-UI, as well as
diff --git a/src/installer-lib/applicationinstaller.cpp b/src/installer-lib/applicationinstaller.cpp
index 4f921d0b..efe704da 100644
--- a/src/installer-lib/applicationinstaller.cpp
+++ b/src/installer-lib/applicationinstaller.cpp
@@ -59,7 +59,7 @@
 
 /*!
     \qmltype ApplicationInstaller
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-singletons
     \brief The package installation/removal/update part of the application-manager.
 
@@ -246,7 +246,7 @@ ApplicationInstaller *ApplicationInstaller::createInstance(const QVector<Install
         return nullptr;
     }
 
-    qmlRegisterSingletonType<ApplicationInstaller>("QtApplicationManager", 1, 0, "ApplicationInstaller",
+    qmlRegisterSingletonType<ApplicationInstaller>("QtApplicationManager.SystemUI", 1, 0, "ApplicationInstaller",
                                                    &ApplicationInstaller::instanceForQml);
 
     return s_instance = new ApplicationInstaller(installationLocations, manifestDir.take(), imageMountDir.take(),
diff --git a/src/installer-lib/applicationinstaller.h b/src/installer-lib/applicationinstaller.h
index 94885800..d4b47483 100644
--- a/src/installer-lib/applicationinstaller.h
+++ b/src/installer-lib/applicationinstaller.h
@@ -64,7 +64,7 @@ class ApplicationInstaller : public QObject
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationInstaller")
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/ApplicationInstaller 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationInstaller 1.0")
 
     // both are const on purpose - these should never change in a running system
     Q_PROPERTY(bool allowInstallationOfUnsignedPackages READ allowInstallationOfUnsignedPackages CONSTANT)
diff --git a/src/intent-client-lib/intentclient.cpp b/src/intent-client-lib/intentclient.cpp
index 0c09e560..1808ac66 100644
--- a/src/intent-client-lib/intentclient.cpp
+++ b/src/intent-client-lib/intentclient.cpp
@@ -78,7 +78,7 @@ IntentClient *IntentClient::createInstance(IntentClientSystemInterface *systemIn
 
     qmlRegisterUncreatableType<IntentClientRequest>("QtApplicationManager", 1, 0, "IntentRequest",
                                                     qSL("Cannot create objects of type IntentRequest"));
-    qmlRegisterType<IntentHandler>("QtApplicationManager", 1, 0, "IntentHandler");
+    qmlRegisterType<IntentHandler>("QtApplicationManager.Application", 1, 0, "IntentHandler");
 
     return s_instance = ic.take();
 }
diff --git a/src/intent-server-lib/intentserver.cpp b/src/intent-server-lib/intentserver.cpp
index 0e26cb29..e47390b9 100644
--- a/src/intent-server-lib/intentserver.cpp
+++ b/src/intent-server-lib/intentserver.cpp
@@ -75,12 +75,12 @@ IntentServer *IntentServer::createInstance(IntentServerSystemInterface *systemIn
     qRegisterMetaType<QVariantList>("IntentList");
 
     // needed to get access to the Visibility enum from QML
-    qmlRegisterUncreatableType<Intent>("QtApplicationManager", 1, 0, "Intent",
+    qmlRegisterUncreatableType<Intent>("QtApplicationManager.SystemUI", 1, 0, "Intent",
                                        qSL("Cannot create objects of type Intent"));
 
-    qmlRegisterUncreatableType<IntentServerRequest>("QtApplicationManager", 1, 0, "IntentServerRequest",
+    qmlRegisterUncreatableType<IntentServerRequest>("QtApplicationManager.SystemUI", 1, 0, "IntentServerRequest",
                                                     qSL("Cannot create objects of type IntentServerRequest"));
-    qmlRegisterSingletonType<IntentServer>("QtApplicationManager", 1, 0, "IntentServer",
+    qmlRegisterSingletonType<IntentServer>("QtApplicationManager.SystemUI", 1, 0, "IntentServer",
                                            [](QQmlEngine *, QJSEngine *) -> QObject * {
         QQmlEngine::setObjectOwnership(instance(), QQmlEngine::CppOwnership);
         return instance();
diff --git a/src/launcher-lib/applicationmanagerwindow.cpp b/src/launcher-lib/applicationmanagerwindow.cpp
index 2f5688a5..9caf9f2f 100644
--- a/src/launcher-lib/applicationmanagerwindow.cpp
+++ b/src/launcher-lib/applicationmanagerwindow.cpp
@@ -59,7 +59,7 @@ public:
 
 /*!
     \qmltype ApplicationManagerWindow
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.Application
     \ingroup system-ui-and-app
     \ingroup app
     \brief The window root item required in a multi-process environment.
@@ -72,13 +72,13 @@ public:
 
     The QML import for this item is
 
-    \c{import QtApplicationManager 1.0}
+    \c{import QtApplicationManager.Application 1.0}
 
     After importing, you can instantiate the QML item like so:
 
     \qml
     import QtQuick 2.0
-    import QtApplicationManager 1.0
+    import QtApplicationManager.Application 1.0
 
     ApplicationManagerWindow {
         Text {
@@ -92,7 +92,7 @@ public:
     little dummy import to your application.
 
     \list 1
-    \li Pick a base dir and create a \c{QtApplicationManager} directory in it
+    \li Pick a base dir and create a \c{QtApplicationManager.Application} directory in it
     \li Add a file named \c qmldir there, consisting of the single line \c{ApplicationManagerWindow 1.0 ApplicationManagerWindow.qml}
     \li Add a second file named \c ApplicationManagerWindow.qml, with the following content
 
diff --git a/src/launcher-lib/applicationmanagerwindow_p.h b/src/launcher-lib/applicationmanagerwindow_p.h
index 1c773cd6..25a0b2c1 100644
--- a/src/launcher-lib/applicationmanagerwindow_p.h
+++ b/src/launcher-lib/applicationmanagerwindow_p.h
@@ -53,7 +53,7 @@ class ApplicationManagerWindowPrivate;
 class ApplicationManagerWindow : public QQuickWindowQmlImpl
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/ApplicationManagerWindow 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationManagerWindow 1.0")
 
 public:
     explicit ApplicationManagerWindow(QWindow *parent = nullptr);
diff --git a/src/launcher-lib/qmlapplicationinterface.h b/src/launcher-lib/qmlapplicationinterface.h
index 054dd257..8a431ef1 100644
--- a/src/launcher-lib/qmlapplicationinterface.h
+++ b/src/launcher-lib/qmlapplicationinterface.h
@@ -63,7 +63,7 @@ class QmlApplicationInterfaceExtension;
 class QmlApplicationInterface : public ApplicationInterface
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/ApplicationInterface 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/ApplicationInterface 1.0")
 
 public:
     explicit QmlApplicationInterface(const QString &dbusConnectionName,
diff --git a/src/launcher-lib/qmlapplicationinterfaceextension.h b/src/launcher-lib/qmlapplicationinterfaceextension.h
index 82233922..148ee556 100644
--- a/src/launcher-lib/qmlapplicationinterfaceextension.h
+++ b/src/launcher-lib/qmlapplicationinterfaceextension.h
@@ -54,7 +54,7 @@ class QmlApplicationInterfaceExtensionPrivate;
 class QmlApplicationInterfaceExtension : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/ApplicationInterfaceExtension 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationInterfaceExtension 1.0")
     Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(QString name READ name WRITE setName)
diff --git a/src/launchers/qml/main.cpp b/src/launchers/qml/main.cpp
index 538f55cc..f7cdd9e9 100644
--- a/src/launchers/qml/main.cpp
+++ b/src/launchers/qml/main.cpp
@@ -218,10 +218,10 @@ Controller::Controller(LauncherMain *a, bool quickLaunched, const QString &direc
     CrashHandler::setQmlEngine(&m_engine);
 
 #if !defined(AM_HEADLESS)
-    qmlRegisterType<ApplicationManagerWindow>("QtApplicationManager", 1, 0, "ApplicationManagerWindow");
+    qmlRegisterType<ApplicationManagerWindow>("QtApplicationManager.Application", 1, 0, "ApplicationManagerWindow");
 #endif
-    qmlRegisterType<QmlNotification>("QtApplicationManager", 1, 0, "Notification");
-    qmlRegisterType<QmlApplicationInterfaceExtension>("QtApplicationManager", 1, 0, "ApplicationInterfaceExtension");
+    qmlRegisterType<QmlNotification>("QtApplicationManager.Application", 1, 0, "Notification");
+    qmlRegisterType<QmlApplicationInterfaceExtension>("QtApplicationManager.Application", 1, 0, "ApplicationInterfaceExtension");
 
     m_configuration = a->runtimeConfiguration();
 
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index 85f307c4..b3021951 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -607,14 +607,14 @@ void Main::setupQmlEngine(const QStringList &importPaths, const QString &quickCo
     if (!quickControlsStyle.isEmpty())
         qputenv("QT_QUICK_CONTROLS_STYLE", quickControlsStyle.toLocal8Bit());
 
-    qmlRegisterType<QmlInProcessNotification>("QtApplicationManager", 1, 0, "Notification");
-    qmlRegisterType<QmlInProcessApplicationInterfaceExtension>("QtApplicationManager", 1, 0, "ApplicationInterfaceExtension");
+    qmlRegisterType<QmlInProcessNotification>("QtApplicationManager.Application", 1, 0, "Notification");
+    qmlRegisterType<QmlInProcessApplicationInterfaceExtension>("QtApplicationManager.Application", 1, 0, "ApplicationInterfaceExtension");
 
 #if !defined(AM_HEADLESS)
-    qmlRegisterType<QmlInProcessApplicationManagerWindow>("QtApplicationManager", 1, 0, "ApplicationManagerWindow");
+    qmlRegisterType<QmlInProcessApplicationManagerWindow>("QtApplicationManager.Application", 1, 0, "ApplicationManagerWindow");
 #endif
-    qmlRegisterType<ProcessMonitor>("QtApplicationManager", 1, 0, "ProcessMonitor");
-    qmlRegisterType<SystemMonitor>("QtApplicationManager", 1, 0, "SystemMonitor");
+    qmlRegisterType<ProcessMonitor>("QtApplicationManager.SystemUI", 1, 0, "ProcessMonitor");
+    qmlRegisterType<SystemMonitor>("QtApplicationManager.SystemUI", 1, 0, "SystemMonitor");
 
     StartupTimer::instance()->checkpoint("after QML registrations");
 
diff --git a/src/manager-lib/abstractcontainer.cpp b/src/manager-lib/abstractcontainer.cpp
index 64ff8c0f..469378a2 100644
--- a/src/manager-lib/abstractcontainer.cpp
+++ b/src/manager-lib/abstractcontainer.cpp
@@ -47,7 +47,7 @@
 
 /*!
     \qmltype Container
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-non-instantiable
     \brief The handle for a container, that an application's \l Runtime is using.
 
diff --git a/src/manager-lib/abstractcontainer.h b/src/manager-lib/abstractcontainer.h
index 108386d5..dd7a70a5 100644
--- a/src/manager-lib/abstractcontainer.h
+++ b/src/manager-lib/abstractcontainer.h
@@ -99,7 +99,7 @@ signals:
 class AbstractContainer : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/Container 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Container 1.0")
 
     Q_PROPERTY(QString controlGroup READ controlGroup WRITE setControlGroup)
 
diff --git a/src/manager-lib/abstractruntime.cpp b/src/manager-lib/abstractruntime.cpp
index 2a3f629f..e2eb073a 100644
--- a/src/manager-lib/abstractruntime.cpp
+++ b/src/manager-lib/abstractruntime.cpp
@@ -50,7 +50,7 @@
 
 /*!
     \qmltype Runtime
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-non-instantiable
     \brief The handle for a runtime that is executing an \l Application.
 
diff --git a/src/manager-lib/abstractruntime.h b/src/manager-lib/abstractruntime.h
index 691cfff4..765391e6 100644
--- a/src/manager-lib/abstractruntime.h
+++ b/src/manager-lib/abstractruntime.h
@@ -104,7 +104,7 @@ private:
 class AbstractRuntime : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/Runtime 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/Runtime 1.0")
 
     Q_PROPERTY(AbstractContainer *container READ container)
 
diff --git a/src/manager-lib/application.cpp b/src/manager-lib/application.cpp
index 996720b5..620614ab 100644
--- a/src/manager-lib/application.cpp
+++ b/src/manager-lib/application.cpp
@@ -53,7 +53,7 @@
 
 /*!
     \qmltype ApplicationObject
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-non-instantiable
     \brief The handle for an application known to the ApplicationManager.
 
diff --git a/src/manager-lib/application.h b/src/manager-lib/application.h
index 9f6ac6e2..3a8d51af 100644
--- a/src/manager-lib/application.h
+++ b/src/manager-lib/application.h
@@ -67,7 +67,7 @@ signals:
 class AbstractApplication : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/ApplicationObject 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationObject 1.0")
 
     Q_PROPERTY(QString id READ id CONSTANT)
     Q_PROPERTY(QString runtimeName READ runtimeName NOTIFY bulkChange)
diff --git a/src/manager-lib/applicationipcinterface.cpp b/src/manager-lib/applicationipcinterface.cpp
index ec1695b6..ad8e626a 100644
--- a/src/manager-lib/applicationipcinterface.cpp
+++ b/src/manager-lib/applicationipcinterface.cpp
@@ -64,7 +64,7 @@
 /*!
     \qmltype ApplicationIPCInterface
     \ingroup system-ui
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \brief The definition of an IPC interface between the ApplicationManager and applications.
 
     Using ApplicationIPCInterface items, you can define an IPC interface between your System-UI and
diff --git a/src/manager-lib/applicationipcmanager.cpp b/src/manager-lib/applicationipcmanager.cpp
index d7fc5794..d20ade7f 100644
--- a/src/manager-lib/applicationipcmanager.cpp
+++ b/src/manager-lib/applicationipcmanager.cpp
@@ -55,7 +55,7 @@
 
 /*!
     \qmltype ApplicationIPCManager
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-singletons
     \brief Central registry for interfaces for System-UI-to-app communication.
 
@@ -82,8 +82,8 @@ ApplicationIPCManager *ApplicationIPCManager::createInstance()
         qFatal("ApplicationIPCManager::createInstance() was called a second time.");
 
     qmlRegisterType<ApplicationIPCInterfaceAttached>();
-    qmlRegisterType<ApplicationIPCInterface>("QtApplicationManager", 1, 0, "ApplicationIPCInterface");
-    qmlRegisterSingletonType<ApplicationIPCManager>("QtApplicationManager", 1, 0, "ApplicationIPCManager",
+    qmlRegisterType<ApplicationIPCInterface>("QtApplicationManager.SystemUI", 1, 0, "ApplicationIPCInterface");
+    qmlRegisterSingletonType<ApplicationIPCManager>("QtApplicationManager.SystemUI", 1, 0, "ApplicationIPCManager",
                                                     &ApplicationIPCManager::instanceForQml);
     return s_instance = new ApplicationIPCManager();
 }
@@ -195,7 +195,7 @@ ApplicationIPCManager::ApplicationIPCManager(QObject *parent)
 
     \qml
     import QtQuick 2.0
-    import QtApplicationManager 1.0
+    import QtApplicationManager.SystemUI 1.0
 
     ApplicationIPCInterface {
         id: extension
diff --git a/src/manager-lib/applicationipcmanager.h b/src/manager-lib/applicationipcmanager.h
index e00e105a..5c63e4d8 100644
--- a/src/manager-lib/applicationipcmanager.h
+++ b/src/manager-lib/applicationipcmanager.h
@@ -64,7 +64,7 @@ class Application;
 class ApplicationIPCManager : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/ApplicationIPCManager 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationIPCManager 1.0")
 
 public:
     ~ApplicationIPCManager();
diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp
index a224ae7c..405f1413 100644
--- a/src/manager-lib/applicationmanager.cpp
+++ b/src/manager-lib/applicationmanager.cpp
@@ -76,7 +76,7 @@
 
 /*!
     \qmltype ApplicationManager
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-singletons
     \brief The application model and controller.
 
@@ -173,7 +173,7 @@
 
     \qml
     import QtQuick 2.0
-    import QtApplicationManager 1.0
+    import QtApplicationManager.SystemUI 1.0
 
     ListView {
         id: appList
@@ -384,20 +384,20 @@ ApplicationManager *ApplicationManager::createInstance(bool singleProcess)
 
     QScopedPointer<ApplicationManager> am(new ApplicationManager(singleProcess));
 
-    qmlRegisterSingletonType<ApplicationManager>("QtApplicationManager", 1, 0, "ApplicationManager",
+    qmlRegisterSingletonType<ApplicationManager>("QtApplicationManager.SystemUI", 1, 0, "ApplicationManager",
                                                  &ApplicationManager::instanceForQml);
-    qmlRegisterType<ApplicationModel>("QtApplicationManager", 1, 0, "ApplicationModel");
-    qmlRegisterUncreatableType<AbstractApplication>("QtApplicationManager", 1, 0, "ApplicationObject",
+    qmlRegisterType<ApplicationModel>("QtApplicationManager.SystemUI", 1, 0, "ApplicationModel");
+    qmlRegisterUncreatableType<AbstractApplication>("QtApplicationManager.SystemUI", 1, 0, "ApplicationObject",
                                                   qSL("Cannot create objects of type ApplicationObject"));
     qRegisterMetaType<AbstractApplication*>("AbstractApplication*");
-    qmlRegisterUncreatableType<AbstractRuntime>("QtApplicationManager", 1, 0, "Runtime",
+    qmlRegisterUncreatableType<AbstractRuntime>("QtApplicationManager.SystemUI", 1, 0, "Runtime",
                                                 qSL("Cannot create objects of type Runtime"));
     qRegisterMetaType<AbstractRuntime*>("AbstractRuntime*");
-    qmlRegisterUncreatableType<AbstractContainer>("QtApplicationManager", 1, 0, "Container",
+    qmlRegisterUncreatableType<AbstractContainer>("QtApplicationManager.SystemUI", 1, 0, "Container",
                                                   qSL("Cannot create objects of type Container"));
     qRegisterMetaType<AbstractContainer*>("AbstractContainer*");
 
-    qmlRegisterUncreatableType<Am>("QtApplicationManager", 1, 0, "Am",
+    qmlRegisterUncreatableType<Am>("QtApplicationManager.SystemUI", 1, 0, "Am",
                                    qSL("Cannot create objects of type Am"));
 
     qRegisterMetaType<Am::RunState>();
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index a44af1b1..56e0ba80 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -74,7 +74,7 @@ class ApplicationManager : public QAbstractListModel
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "io.qt.ApplicationManager")
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/ApplicationManager 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/ApplicationManager 1.0")
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(bool singleProcess READ isSingleProcess CONSTANT)
diff --git a/src/manager-lib/applicationmodel.cpp b/src/manager-lib/applicationmodel.cpp
index 7631e2a6..df1cd2f8 100644
--- a/src/manager-lib/applicationmodel.cpp
+++ b/src/manager-lib/applicationmodel.cpp
@@ -54,7 +54,7 @@
     \qmltype ApplicationModel
     \inherits QSortFilterProxyModel
     \ingroup system-ui
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \brief A proxy model for the ApplicationManager singleton.
 
     The ApplicationModel type provides a customizable model of applications. It can be used to
@@ -72,7 +72,7 @@
 
     \qml
     import QtQuick 2.6
-    import QtApplicationManager 1.0
+    import QtApplicationManager.SystemUI 1.0
 
     ListView {
         model: ApplicationModel {
diff --git a/src/manager-lib/notificationmanager.cpp b/src/manager-lib/notificationmanager.cpp
index a319452a..ffdd2742 100644
--- a/src/manager-lib/notificationmanager.cpp
+++ b/src/manager-lib/notificationmanager.cpp
@@ -58,7 +58,7 @@
 */
 /*!
     \qmltype NotificationManager
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-singletons
     \brief The notification model, which handles freedesktop.org compliant notification requests.
 
@@ -268,7 +268,7 @@ NotificationManager *NotificationManager::createInstance()
     if (Q_UNLIKELY(s_instance))
         qFatal("NotificationManager::createInstance() was called a second time.");
 
-    qmlRegisterSingletonType<NotificationManager>("QtApplicationManager", 1, 0, "NotificationManager",
+    qmlRegisterSingletonType<NotificationManager>("QtApplicationManager.SystemUI", 1, 0, "NotificationManager",
                                                  &NotificationManager::instanceForQml);
     return s_instance = new NotificationManager();
 }
diff --git a/src/manager-lib/notificationmanager.h b/src/manager-lib/notificationmanager.h
index b88e8545..1551dbfd 100644
--- a/src/manager-lib/notificationmanager.h
+++ b/src/manager-lib/notificationmanager.h
@@ -56,7 +56,7 @@ class NotificationManager : public QAbstractListModel
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Notifications")
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/NotificationManager 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/NotificationManager 1.0")
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
diff --git a/src/manager-lib/qmlinprocessapplicationinterface.cpp b/src/manager-lib/qmlinprocessapplicationinterface.cpp
index b8b5b0dd..0ac5252b 100644
--- a/src/manager-lib/qmlinprocessapplicationinterface.cpp
+++ b/src/manager-lib/qmlinprocessapplicationinterface.cpp
@@ -206,7 +206,7 @@ uint QmlInProcessNotification::libnotifyShow()
 
 /*!
     \qmltype ApplicationInterfaceExtension
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.Application
     \ingroup system-ui-and-app
     \ingroup app
     \brief Client side access to IPC interface extensions in the System-UI.
diff --git a/src/monitor-lib/processmonitor.cpp b/src/monitor-lib/processmonitor.cpp
index 2ffc6210..314c646d 100644
--- a/src/monitor-lib/processmonitor.cpp
+++ b/src/monitor-lib/processmonitor.cpp
@@ -48,7 +48,7 @@
 
 /*!
     \qmltype ProcessMonitor
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui
     \brief A type for monitoring process resource usage
 
@@ -62,7 +62,7 @@
     Here is an example, how the ProcessMonitor can be used:
 
     \qml
-    import QtApplicationManager 1.0
+    import QtApplicationManager.SystemUI 1.0
 
     ProcessMonitor {
         applicationId: ""
diff --git a/src/monitor-lib/systemmonitor.cpp b/src/monitor-lib/systemmonitor.cpp
index f7dcaebe..2df730c2 100644
--- a/src/monitor-lib/systemmonitor.cpp
+++ b/src/monitor-lib/systemmonitor.cpp
@@ -63,7 +63,7 @@
 
 /*!
     \qmltype SystemMonitor
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui
     \brief The system monitoring model, giving access to a range of measurements, e.g. CPU load,
     frame rate, etc.
@@ -125,11 +125,11 @@
     \note The model will be updated each \l reportingInterval milliseconds. The roles will only
           be populated, if the corresponding reporting parts (memory, CPU, etc.) have been enabled.
 
-    After importing \c QtApplicationManager you could use the SystemMonitor singleton as follows:
+    After importing \c QtApplicationManager.SystemUI you could use the SystemMonitor singleton as follows:
 
     \qml
     import QtQuick 2.4
-    import QtApplicationManager 1.0
+    import QtApplicationManager.SystemUI 1.0
 
     ListView {
         width: 200; height: 200
diff --git a/src/notification-lib/notification.cpp b/src/notification-lib/notification.cpp
index 3ab7016b..d705f8b5 100644
--- a/src/notification-lib/notification.cpp
+++ b/src/notification-lib/notification.cpp
@@ -44,7 +44,7 @@
 
 /*!
     \qmltype Notification
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.Application
     \ingroup system-ui-and-app
     \ingroup app
     \brief An abstraction layer to enable QML applications to issue notifications to the System-UI.
diff --git a/src/notification-lib/notification.h b/src/notification-lib/notification.h
index e69a6113..610f2498 100644
--- a/src/notification-lib/notification.h
+++ b/src/notification-lib/notification.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE_AM
 class Notification : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/Notification 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.Application/Notification 1.0")
     Q_INTERFACES(QQmlParserStatus)
 
     Q_PROPERTY(uint notificationId READ notificationId NOTIFY notificationIdChanged)
diff --git a/src/window-lib/window.cpp b/src/window-lib/window.cpp
index 7bf7f0b4..17e0c151 100644
--- a/src/window-lib/window.cpp
+++ b/src/window-lib/window.cpp
@@ -43,7 +43,7 @@
 
 /*!
     \qmltype WindowObject
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-non-instantiable
     \brief A client window surface
 
diff --git a/src/window-lib/windowitem.cpp b/src/window-lib/windowitem.cpp
index ccdfd4e4..59725c19 100644
--- a/src/window-lib/windowitem.cpp
+++ b/src/window-lib/windowitem.cpp
@@ -60,7 +60,7 @@
 
 /*!
     \qmltype WindowItem
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui
     \brief An Item that renders a given WindowObject
 
diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp
index 132fc01a..dac603de 100644
--- a/src/window-lib/windowmanager.cpp
+++ b/src/window-lib/windowmanager.cpp
@@ -71,7 +71,7 @@
 
 /*!
     \qmltype WindowManager
-    \inqmlmodule QtApplicationManager
+    \inqmlmodule QtApplicationManager.SystemUI
     \ingroup system-ui-singletons
     \brief The window model and controller.
 
@@ -129,7 +129,7 @@
 
     \qml
     import QtQuick 2.10
-    import QtApplicationManager 1.0
+    import QtApplicationManager.SystemUI 1.0
 
     // Simple solution for a full-screen setup
     Item {
@@ -243,13 +243,13 @@ WindowManager *WindowManager::createInstance(QQmlEngine *qmlEngine, const QStrin
     if (s_instance)
         qFatal("WindowManager::createInstance() was called a second time.");
 
-    qmlRegisterSingletonType<WindowManager>("QtApplicationManager", 1, 0, "WindowManager",
+    qmlRegisterSingletonType<WindowManager>("QtApplicationManager.SystemUI", 1, 0, "WindowManager",
                                             &WindowManager::instanceForQml);
 
-    qmlRegisterUncreatableType<Window>("QtApplicationManager", 1, 0, "WindowObject", qSL("Cannot create objects of type WindowObject"));
+    qmlRegisterUncreatableType<Window>("QtApplicationManager.SystemUI", 1, 0, "WindowObject", qSL("Cannot create objects of type WindowObject"));
     qRegisterMetaType<Window*>("Window*");
 
-    qmlRegisterType<WindowItem>("QtApplicationManager", 1, 0, "WindowItem");
+    qmlRegisterType<WindowItem>("QtApplicationManager.SystemUI", 1, 0, "WindowItem");
 
     qRegisterMetaType<InProcessSurfaceItem*>("InProcessSurfaceItem*");
     qRegisterMetaType<QSharedPointer<InProcessSurfaceItem>>("QSharedPointer<InProcessSurfaceItem>");
diff --git a/src/window-lib/windowmanager.h b/src/window-lib/windowmanager.h
index 306e9cd9..72270f29 100644
--- a/src/window-lib/windowmanager.h
+++ b/src/window-lib/windowmanager.h
@@ -69,7 +69,7 @@ class WindowManager : public QAbstractListModel
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "io.qt.WindowManager")
-    Q_CLASSINFO("AM-QmlType", "QtApplicationManager/WindowManager 1.0")
+    Q_CLASSINFO("AM-QmlType", "QtApplicationManager.SystemUI/WindowManager 1.0")
 
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(bool runningOnDesktop READ isRunningOnDesktop CONSTANT)
diff --git a/tests/data/hello-world.red/main.qml b/tests/data/hello-world.red/main.qml
index 71abf2a0..1cdd6d91 100644
--- a/tests/data/hello-world.red/main.qml
+++ b/tests/data/hello-world.red/main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: "crimson"
diff --git a/tests/main/builtin-apps/hello-world.red/main.qml b/tests/main/builtin-apps/hello-world.red/main.qml
index 67fa68b9..5d66635e 100644
--- a/tests/main/builtin-apps/hello-world.red/main.qml
+++ b/tests/main/builtin-apps/hello-world.red/main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: "red"
diff --git a/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml b/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml
index 71abf2a0..1cdd6d91 100644
--- a/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml
+++ b/tests/main/dir-with-update-already-installed/apps/hello-world.red/main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: "crimson"
diff --git a/tests/qml/crash/apps/tld.test.crash/app.qml b/tests/qml/crash/apps/tld.test.crash/app.qml
index fb909b62..84d0c414 100644
--- a/tests/qml/crash/apps/tld.test.crash/app.qml
+++ b/tests/qml/crash/apps/tld.test.crash/app.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.3
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 import Terminator 2.0
 
 ApplicationManagerWindow {
diff --git a/tests/qml/crash/tst_crash.qml b/tests/qml/crash/tst_crash.qml
index 699b79db..cb08b701 100644
--- a/tests/qml/crash/tst_crash.qml
+++ b/tests/qml/crash/tst_crash.qml
@@ -41,9 +41,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
-import QtApplicationManager 1.0
-import QtApplicationManager 1.0 as AM
-
+import QtApplicationManager.SystemUI 1.0
 
 TestCase {
     id: testCase
@@ -60,7 +58,7 @@ TestCase {
     }
 
     function initTestCase() {
-        compare(app.lastExitStatus, AM.ApplicationObject.NormalExit)
+        compare(app.lastExitStatus, ApplicationObject.NormalExit)
     }
 
     function test_crash_data() {
@@ -81,15 +79,15 @@ TestCase {
         ApplicationManager.startApplication(appId);
         runStateChangedSpy.wait(3000);
         runStateChangedSpy.wait(3000);
-        compare(app.runState, AM.ApplicationObject.Running);
+        compare(app.runState, ApplicationObject.Running);
         ApplicationManager.startApplication(appId, data.tag);
         runStateChangedSpy.wait(3000);
-        compare(app.runState, AM.ApplicationObject.NotRunning);
+        compare(app.runState, ApplicationObject.NotRunning);
         if (data.tag === "gracefully") {
-            compare(app.lastExitStatus, AM.ApplicationObject.NormalExit);
+            compare(app.lastExitStatus, ApplicationObject.NormalExit);
             compare(app.lastExitCode, 5);
         } else {
-            compare(app.lastExitStatus, AM.ApplicationObject.CrashExit);
+            compare(app.lastExitStatus, ApplicationObject.CrashExit);
             console.info("================================");
             console.info("=== INTENDED CRASH (TESTING) ===");
             console.info("================================");
diff --git a/tests/qml/installer/tst_installer.qml b/tests/qml/installer/tst_installer.qml
index 3a6909c4..3ca91866 100644
--- a/tests/qml/installer/tst_installer.qml
+++ b/tests/qml/installer/tst_installer.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 TestCase {
     name: "Installer"
diff --git a/tests/qml/monitoring/tst_monitoring.qml b/tests/qml/monitoring/tst_monitoring.qml
index f4a398da..db8aca47 100644
--- a/tests/qml/monitoring/tst_monitoring.qml
+++ b/tests/qml/monitoring/tst_monitoring.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.6
 import QtTest 1.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 TestCase {
     id: testCase
diff --git a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml b/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml
index aeee7172..34293fa0 100644
--- a/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml
+++ b/tests/qml/quicklaunch/apps/tld.test.quicklaunch/app.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     width: 320
diff --git a/tests/qml/quicklaunch/tst_quicklaunch.qml b/tests/qml/quicklaunch/tst_quicklaunch.qml
index 91e67215..e9fea1f9 100644
--- a/tests/qml/quicklaunch/tst_quicklaunch.qml
+++ b/tests/qml/quicklaunch/tst_quicklaunch.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 // Tests are meaningless in single-process mode, but still work
 
diff --git a/tests/qml/simple/apps/tld.test.simple1/app1.qml b/tests/qml/simple/apps/tld.test.simple1/app1.qml
index 20289de4..25c570fd 100644
--- a/tests/qml/simple/apps/tld.test.simple1/app1.qml
+++ b/tests/qml/simple/apps/tld.test.simple1/app1.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/tests/qml/simple/apps/tld.test.simple2/app.qml b/tests/qml/simple/apps/tld.test.simple2/app.qml
index 405e2f41..e7ddb8e9 100644
--- a/tests/qml/simple/apps/tld.test.simple2/app.qml
+++ b/tests/qml/simple/apps/tld.test.simple2/app.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/tests/qml/simple/tst_applicationmanager.qml b/tests/qml/simple/tst_applicationmanager.qml
index ec5a5962..2b7bc9d7 100644
--- a/tests/qml/simple/tst_applicationmanager.qml
+++ b/tests/qml/simple/tst_applicationmanager.qml
@@ -42,7 +42,7 @@
 import QtQuick 2.3
 import QtQuick.Window 2.0
 import QtTest 1.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 TestCase {
     id: testCase
diff --git a/tests/qml/windowitem/apps/test.windowitem.app/main.qml b/tests/qml/windowitem/apps/test.windowitem.app/main.qml
index 281abc34..fc18043d 100644
--- a/tests/qml/windowitem/apps/test.windowitem.app/main.qml
+++ b/tests/qml/windowitem/apps/test.windowitem.app/main.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml b/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml
index 27e87fb8..64650cd0 100644
--- a/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml
+++ b/tests/qml/windowitem/apps/test.windowitem.multiwin/main.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 /*
  A simple test app that displays two windows
diff --git a/tests/qml/windowitem/tst_windowitem.qml b/tests/qml/windowitem/tst_windowitem.qml
index 6349350b..c388e11e 100644
--- a/tests/qml/windowitem/tst_windowitem.qml
+++ b/tests/qml/windowitem/tst_windowitem.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Item {
     id: root
diff --git a/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml b/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml
index 2ca5878b..5f26a35b 100644
--- a/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml
+++ b/tests/qml/windowitem2/apps/test.windowitem2.app/main.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     color: "red"
diff --git a/tests/qml/windowitem2/tst_windowitem2.qml b/tests/qml/windowitem2/tst_windowitem2.qml
index d75277fa..ce7ab42b 100644
--- a/tests/qml/windowitem2/tst_windowitem2.qml
+++ b/tests/qml/windowitem2/tst_windowitem2.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
-import QtApplicationManager 1.0
+import QtApplicationManager.SystemUI 1.0
 
 Item {
     id: root
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml b/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml
index 7022fc99..f7309d61 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.amwin/amwin.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml b/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml
index 40dd99d6..3da73886 100644
--- a/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.amwin2/amwin2.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml b/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml
index d8f6bafe..b665c66a 100644
--- a/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.loader/SubWin.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     Component.onCompleted: setWindowProperty("type", "sub");
diff --git a/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml b/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml
index 44d769e5..644c149d 100644
--- a/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.loader/loader.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     id: root
diff --git a/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml b/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml
index 11e24a7b..9860be8f 100644
--- a/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.ping/ping.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 ApplicationManagerWindow {
     Timer {
diff --git a/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml b/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml
index f0fdc7cb..00bfff83 100644
--- a/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.qtobject/qtobject.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 QtObject {
     id: root
diff --git a/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml b/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml
index 0fb09261..f77d10d4 100644
--- a/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.rectangle/rectangle.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 Rectangle {
     id: root
diff --git a/tests/qml/windowmapping/apps/test.winmap.window/window.qml b/tests/qml/windowmapping/apps/test.winmap.window/window.qml
index 6eabc125..c3892859 100644
--- a/tests/qml/windowmapping/apps/test.winmap.window/window.qml
+++ b/tests/qml/windowmapping/apps/test.winmap.window/window.qml
@@ -41,7 +41,7 @@
 
 import QtQuick 2.4
 import QtQuick.Window 2.0
-import QtApplicationManager 1.0
+import QtApplicationManager.Application 1.0
 
 Window {
     id: root
diff --git a/tests/qml/windowmapping/tst_windowmapping.qml b/tests/qml/windowmapping/tst_windowmapping.qml
index 14a7cbd8..702ed13e 100644
--- a/tests/qml/windowmapping/tst_windowmapping.qml
+++ b/tests/qml/windowmapping/tst_windowmapping.qml
@@ -41,6 +41,7 @@
 
 import QtQuick 2.3
 import QtTest 1.0
+import QtApplicationManager.SystemUI 1.0
 import QtApplicationManager 1.0
 
 TestCase {