17 files changed, 22 insertions, 22 deletions

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index 95729954..8f2d3c52 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -20,8 +20,8 @@ import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.kube.actions 1.0 as KubeAction
-import org.kde.kube.settings 1.0 as KubeSettings
+import org.kube.framework.actions 1.0 as KubeAction
+import org.kube.framework.settings 1.0 as KubeSettings
 import org.kube.components 1.0 as KubeComponents
 
 ApplicationWindow {
diff --git a/components/mail/metadata.desktop b/components/mail/metadata.desktop
index 630cc133..470ad18c 100644
--- a/components/mail/metadata.desktop
+++ b/components/mail/metadata.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Kube Mail
-X-KDE-PluginInfo-Name=org.kde.kube.mail
-Exec=kpackagelauncherqml -a org.kde.kube.mail
+X-KDE-PluginInfo-Name=org.kube.components.mail
+Exec=kpackagelauncherqml -a org.kube.components.mail
 X-Plasma-MainScript=ui/main.qml
 X-KDE-ServiceTypes=KPackage/GenericQML
 Icon=kmail2
diff --git a/components/package/contents/ui/Composer.qml b/components/package/contents/ui/Composer.qml
index 1a6a4cc4..b64d64db 100644
--- a/components/package/contents/ui/Composer.qml
+++ b/components/package/contents/ui/Composer.qml
@@ -20,7 +20,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.kube.mail 1.0 as Mail
+import org.kube.framework.domain 1.0 as Mail
 
 
 Item {
diff --git a/components/package/contents/ui/FolderListView.qml b/components/package/contents/ui/FolderListView.qml
index 1934932c..b63235bb 100644
--- a/components/package/contents/ui/FolderListView.qml
+++ b/components/package/contents/ui/FolderListView.qml
@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.kube.mail 1.0 as Mail
+import org.kube.framework.domain 1.0 as Mail
 
 Item {
     id: root
diff --git a/components/package/contents/ui/MailListView.qml b/components/package/contents/ui/MailListView.qml
index ff773e0e..22f5eb81 100644
--- a/components/package/contents/ui/MailListView.qml
+++ b/components/package/contents/ui/MailListView.qml
@@ -23,7 +23,7 @@ import QtQml 2.2
 
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.kube.mail 1.0 as Mail
+import org.kube.framework.domain 1.0 as Mail
 
 ScrollView {
     id: root
diff --git a/components/package/contents/ui/MailViewer.qml b/components/package/contents/ui/MailViewer.qml
index 1d305297..f42ec8de 100644
--- a/components/package/contents/ui/MailViewer.qml
+++ b/components/package/contents/ui/MailViewer.qml
@@ -3,7 +3,7 @@ import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 import QtWebKit 3.0
 
-import org.kde.kube.mail 1.0 as Mail
+import org.kube.framework.domain 1.0 as Mail
 
 Item {
     id: root
diff --git a/components/package/contents/ui/Settings.qml b/components/package/contents/ui/Settings.qml
index da44d331..6d653c7b 100644
--- a/components/package/contents/ui/Settings.qml
+++ b/components/package/contents/ui/Settings.qml
@@ -19,7 +19,7 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.1
 
-import org.kde.kube.settings 1.0 as KubeSettings
+import org.kube.framework.settings 1.0 as KubeSettings
 import org.kde.kube.accounts.maildir 1.0 as Maildir
 
 Rectangle {
diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index d6ae4bfa..7fadc960 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -19,7 +19,7 @@ import QtQuick 2.4
 import QtQuick.Controls 1.3
 import QtQuick.Layouts 1.1
 
-import org.kde.kube.mail 1.0 as Mail
+import org.kube.framework.domain 1.0 as Mail
 
 Item {
     id: root
diff --git a/framework/actions/CMakeLists.txt b/framework/actions/CMakeLists.txt
index 1151878c..a09445b0 100644
--- a/framework/actions/CMakeLists.txt
+++ b/framework/actions/CMakeLists.txt
@@ -10,5 +10,5 @@ add_library(actionplugin SHARED ${SRCS})
 
 qt5_use_modules(actionplugin Core Quick Qml)
 
-install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/actions)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/actions)
+install(TARGETS actionplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/actions)
diff --git a/framework/actions/actionplugin.cpp b/framework/actions/actionplugin.cpp
index 710ba08a..87bc4d7b 100644
--- a/framework/actions/actionplugin.cpp
+++ b/framework/actions/actionplugin.cpp
@@ -8,7 +8,7 @@
 
 void KubePlugin::registerTypes (const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.kube.actions"));
+    Q_ASSERT(uri == QLatin1String("org.kube.framework.actions"));
     qmlRegisterType<Kube::Context>(uri, 1, 0, "Context");
     qmlRegisterType<Kube::Action>(uri, 1, 0, "Action");
     qmlRegisterType<Kube::ActionHandler>(uri, 1, 0, "ActionHandler");
diff --git a/framework/actions/qmldir b/framework/actions/qmldir
index de2e4b46..f6dccbda 100644
--- a/framework/actions/qmldir
+++ b/framework/actions/qmldir
@@ -1,3 +1,3 @@
-module org.kde.kube.actions
+module org.kube.framework.actions
 
 plugin actionplugin
diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt
index 822b2981..b14e410e 100644
--- a/framework/domain/CMakeLists.txt
+++ b/framework/domain/CMakeLists.txt
@@ -28,5 +28,5 @@ qt5_use_modules(mailplugin Core Quick Qml WebKitWidgets)
 
 target_link_libraries(mailplugin actionplugin settingsplugin sink KF5::Otp KF5::Codecs ${CURL_LIBRARIES})
 
-install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
+install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/domain)
diff --git a/framework/domain/mailplugin.cpp b/framework/domain/mailplugin.cpp
index 2d19a437..eaebd843 100644
--- a/framework/domain/mailplugin.cpp
+++ b/framework/domain/mailplugin.cpp
@@ -30,7 +30,7 @@
 
 void MailPlugin::registerTypes (const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.kube.mail"));
+    Q_ASSERT(uri == QLatin1String("org.kube.framework.domain"));
 
     qmlRegisterType<FolderListModel>(uri, 1, 0, "FolderListModel");
     qmlRegisterType<MailListModel>(uri, 1, 0, "MailListModel");
diff --git a/framework/domain/qmldir b/framework/domain/qmldir
index fd54e5ee..54a3a98b 100644
--- a/framework/domain/qmldir
+++ b/framework/domain/qmldir
@@ -1,3 +1,3 @@
-module org.kde.kube.mail
+module org.kube.framework.domain
 
 plugin mailplugin
diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt
index 15ab7584..9d876850 100644
--- a/framework/settings/CMakeLists.txt
+++ b/framework/settings/CMakeLists.txt
@@ -12,5 +12,5 @@ qt5_use_modules(settingsplugin Core Quick Qml)
 
 target_link_libraries(settingsplugin)
 
-install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/settings)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/settings)
+install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kube/framework/settings)
diff --git a/framework/settings/qmldir b/framework/settings/qmldir
index 7b756aea..22fec334 100644
--- a/framework/settings/qmldir
+++ b/framework/settings/qmldir
@@ -1,3 +1,3 @@
-module org.kde.kube.settings
+module org.kube.framework.settings
 
 plugin settingsplugin
diff --git a/framework/settings/settingsplugin.cpp b/framework/settings/settingsplugin.cpp
index a1888669..3a582d1f 100644
--- a/framework/settings/settingsplugin.cpp
+++ b/framework/settings/settingsplugin.cpp
@@ -9,7 +9,7 @@
 
 void SettingsPlugin::registerTypes (const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.kube.settings"));
+    Q_ASSERT(uri == QLatin1String("org.kube.framework.settings"));
 
     // qmlRegisterType<ResourceListModel>();
     // qmlRegisterType<ResourcesController>(uri, 1, 0, "Resources");