Move QML files to src/qml and don't use internal qml modules

.reuse/dep5

@@ -6,15 +6,11 @@ Files: 128-logo.png icons/* logo.png org.kde.neochat.svg org.kde.neochat.tray.sv
 Copyright: 2020 Carson Black <uhhadd@gmail.com>
 License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
 
-Files: qtquickcontrols2.conf
-Copyright: 2020 Tobias Fella <fella@posteo.de>
-License: CC0-1.0
-
 Files: android/res/drawable/splash.xml
 Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
-Files: */qmldir .gitignore
+Files: .gitignore
 Copyright: None
 License: CC0-1.0
 
@@ -22,7 +18,7 @@ Files: .gitlab/issue_templates/bug.md
 Copyright: 2021 Carl Schwan <carlschwan@kde.org>
 License: CC0-1.0
 
-Files: res.qrc res_android.qrc res_desktop.qrc
+Files: src/res.qrc src/res_android.qrc src/res_desktop.qrc
 Copyright: None
 License: CC0-1.0
 
@@ -38,7 +34,7 @@ Files: src/neochat.notifyrc
 Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
 
-Files: imports/NeoChat/Component/confetti.png imports/NeoChat/Component/glowdot.png
+Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png
 Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
 License: CC0-1.0
 

imports/NeoChat/Component/ChatBox/qmldir

@@ -1,7 +0,0 @@
-module NeoChat.Component.ChatBox
-ChatBox 1.0 ChatBox.qml
-ChatBar 1.0 ChatBar.qml
-ReplyPane 1.0 ReplyPane.qml
-AttachmentPane 1.0 AttachmentPane.qml
-CompletionMenu 1.0 CompletionMenu.qml
-EmojiPickerPane 1.0 EmojiPickerPane.qml

imports/NeoChat/Component/Emoji/qmldir

@@ -1,2 +0,0 @@
-module NeoChat.Component.Emoji
-EmojiPicker 1.0 EmojiPicker.qml

imports/NeoChat/Component/Login/qmldir

@@ -1,7 +0,0 @@
-module NeoChat.Component.Login
-Login 1.0 Login.qml
-Password 1.0 Password.qml
-LoginRegister 1.0 LoginRegister.qml
-Loading 1.0 Loading.qml
-LoginMethod 1.0 LoginMethod.qml
-LoginStep 1.0 LoginStep.qml

imports/NeoChat/Component/Timeline/qmldir

@@ -1,16 +0,0 @@
-module NeoChat.Component.Timeline
-RichLabel 1.0 RichLabel.qml
-TimelineContainer 1.0 TimelineContainer.qml
-StateDelegate 1.0 StateDelegate.qml
-SectionDelegate 1.0 SectionDelegate.qml
-ImageDelegate 1.0 ImageDelegate.qml
-FileDelegate 1.0 FileDelegate.qml
-VideoDelegate 1.0 VideoDelegate.qml
-ReactionDelegate 1.0 ReactionDelegate.qml
-AudioDelegate 1.0 AudioDelegate.qml
-EncryptedDelegate 1.0 EncryptedDelegate.qml
-EventDelegate 1.0 EventDelegate.qml
-MessageDelegate 1.0 MessageDelegate.qml
-ReadMarkerDelegate 1.0 ReadMarkerDelegate.qml
-LinkPreviewDelegate 1.0 LinkPreviewDelegate.qml
-MimeComponent 1.0 MimeComponent.qml

imports/NeoChat/Component/qmldir

@@ -1,7 +0,0 @@
-module NeoChat.Component
-FullScreenImage 1.0 FullScreenImage.qml
-ChatTextInput 1.0 ChatTextInput.qml
-FancyEffectsContainer 1.0 FancyEffectsContainer.qml
-TypingPane 1.0 TypingPane.qml
-QuickSwitcher 1.0 QuickSwitcher.qml
-ShimmerGradient 1.0 ShimmerGradient.qml

imports/NeoChat/Dialog/KeyVerification/qmldir

@@ -1,7 +0,0 @@
-module NeoChat.Dialog.KeyVerification
-KeyVerificationDialog 1.0 KeyVerificationDialog.qml
-Message 1.0 Message.qml
-VerificationCanceled 1.0 VerificationCanceled.qml
-EmojiItem 1.0 EmojiItem.qml
-EmojiRow 1.0 EmojiRow.qml
-EmojiSas 1.0 EmojiSas.qml

imports/NeoChat/Dialog/qmldir

@@ -1,10 +0,0 @@
-module NeoChat.Dialog
-UserDetailDialog 1.0 UserDetailDialog.qml
-LoginDialog 1.0 LoginDialog.qml
-CreateRoomDialog 1.0 CreateRoomDialog.qml
-AcceptInvitationDialog 1.0 AcceptInvitationDialog.qml
-OpenFileDialog 1.0 OpenFileDialog.qml
-ImageClipboardDialog 1.0 ImageClipboardDialog.qml
-StartChatDialog 1.0 StartChatDialog.qml
-EmojiDialog 1.0 EmojiDialog.qml
-KeyVerificationDialog 1.0 KeyVerificationDialog.qml

imports/NeoChat/Menu/Timeline/qmldir

@@ -1,5 +0,0 @@
-module NeoChat.Menu.Timeline
-MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml
-FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml
-MessageSourceSheet 1.0 MessageSourceSheet.qml
-ReportSheet 1.0 ReportSheet.qml

imports/NeoChat/Menu/qmldir

@@ -1,6 +0,0 @@
-module NeoChat.Menu
-RoomListContextMenu 1.0 RoomListContextMenu.qml
-GlobalMenu 1.0 GlobalMenu.qml
-EditMenu 1.0 EditMenu.qml
-ShareAction 1.0 ShareAction.qml
-ShareDialog 1.0 ShareDialog.qml

imports/NeoChat/Page/qmldir

@@ -1,9 +0,0 @@
-module NeoChat.Page
-LoadingPage 1.0 LoadingPage.qml
-RoomListPage 1.0 RoomListPage.qml
-RoomPage 1.0 RoomPage.qml
-RoomWindow 1.0 RoomWindow.qml
-JoinRoomPage 1.0 JoinRoomPage.qml
-InviteUserPage 1.0 InviteUserPage.qml
-ImageEditorPage 1.0 ImageEditorPage.qml
-

imports/NeoChat/Panel/qmldir

@@ -1,2 +0,0 @@
-module NeoChat.Panel
-RoomDrawer 1.0 RoomDrawer.qml

imports/NeoChat/Settings/qmldir

@@ -1,4 +0,0 @@
-module NeoChat.Settings
-ThemeRadioButton 1.0 ThemeRadioButton.qml
-SettingsPage 1.0 SettingsPage.qml
-SonnetConfigPage 1.0 SonnetConfigPage.qml

qtquickcontrols2.conf

@@ -1,4 +0,0 @@
-[Material]
-Primary=Blue
-Accent=Blue
-Theme=System

res.qrc

@@ -1,100 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="icons/org.kde.neochat.svg">org.kde.neochat.svg</file>
-        <file alias="icons/org.kde.neochat.tray.svg">org.kde.neochat.tray.svg</file>
-        <file>qml/main.qml</file>
-        <file>imports/NeoChat/Page/qmldir</file>
-        <file>imports/NeoChat/Page/LoadingPage.qml</file>
-        <file>imports/NeoChat/Page/RoomListPage.qml</file>
-        <file>imports/NeoChat/Page/RoomPage.qml</file>
-        <file>imports/NeoChat/Page/RoomWindow.qml</file>
-        <file>imports/NeoChat/Page/JoinRoomPage.qml</file>
-        <file>imports/NeoChat/Page/InviteUserPage.qml</file>
-        <file>imports/NeoChat/Page/StartChatPage.qml</file>
-        <file>imports/NeoChat/Page/ImageEditorPage.qml</file>
-        <file>imports/NeoChat/Page/WelcomePage.qml</file>
-        <file>imports/NeoChat/RoomSettings/General.qml</file>
-        <file>imports/NeoChat/RoomSettings/Security.qml</file>
-        <file>imports/NeoChat/RoomSettings/PushNotification.qml</file>
-        <file>imports/NeoChat/RoomSettings/Categories.qml</file>
-        <file>imports/NeoChat/Component/qmldir</file>
-        <file>imports/NeoChat/Component/FullScreenImage.qml</file>
-        <file>imports/NeoChat/Component/FancyEffectsContainer.qml</file>
-        <file>imports/NeoChat/Component/TypingPane.qml</file>
-        <file>imports/NeoChat/Component/ShimmerGradient.qml</file>
-        <file>imports/NeoChat/Component/QuickSwitcher.qml</file>
-        <file>imports/NeoChat/Component/ChatBox</file>
-        <file>imports/NeoChat/Component/ChatBox/ChatBox.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/ChatBar.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/AttachmentPane.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/ReplyPane.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/CompletionMenu.qml</file>
-        <file>imports/NeoChat/Component/ChatBox/qmldir</file>
-        <file>imports/NeoChat/Component/Emoji/EmojiPicker.qml</file>
-        <file>imports/NeoChat/Component/Emoji/qmldir</file>
-        <file>imports/NeoChat/Component/Timeline/qmldir</file>
-        <file>imports/NeoChat/Component/Timeline/ReplyComponent.qml</file>
-        <file>imports/NeoChat/Component/Timeline/StateDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/RichLabel.qml</file>
-        <file>imports/NeoChat/Component/Timeline/TimelineContainer.qml</file>
-        <file>imports/NeoChat/Component/Timeline/SectionDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/VideoDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/ReactionDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/AudioDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/FileDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/ImageDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/EncryptedDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/EventDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/MessageDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/ReadMarkerDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/MimeComponent.qml</file>
-        <file>imports/NeoChat/Component/Login/qmldir</file>
-        <file>imports/NeoChat/Component/Login/LoginStep.qml</file>
-        <file>imports/NeoChat/Component/Login/Login.qml</file>
-        <file>imports/NeoChat/Component/Login/Password.qml</file>
-        <file>imports/NeoChat/Component/Login/LoginRegister.qml</file>
-        <file>imports/NeoChat/Component/Login/Loading.qml</file>
-        <file>imports/NeoChat/Component/Login/Homeserver.qml</file>
-        <file>imports/NeoChat/Component/Login/LoginMethod.qml</file>
-        <file>imports/NeoChat/Component/Login/Sso.qml</file>
-        <file>imports/NeoChat/Panel/qmldir</file>
-        <file>imports/NeoChat/Panel/RoomDrawer.qml</file>
-        <file>imports/NeoChat/Dialog/qmldir</file>
-        <file>imports/NeoChat/Dialog/UserDetailDialog.qml</file>
-        <file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
-        <file>imports/NeoChat/Dialog/EmojiDialog.qml</file>
-        <file>imports/NeoChat/Dialog/OpenFileDialog.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/KeyVerificationDialog.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/Message.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/EmojiItem.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/EmojiRow.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/EmojiSas.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/VerificationCanceled.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/qmldir</file>
-        <file>imports/NeoChat/Menu/qmldir</file>
-        <file>imports/NeoChat/Menu/GlobalMenu.qml</file>
-        <file>imports/NeoChat/Menu/EditMenu.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/qmldir</file>
-        <file>imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/ReportSheet.qml</file>
-        <file>imports/NeoChat/Menu/RoomListContextMenu.qml</file>
-        <file>qtquickcontrols2.conf</file>
-        <file>imports/NeoChat/Component/glowdot.png</file>
-        <file>imports/NeoChat/Component/confetti.png</file>
-        <file>imports/NeoChat/Settings/SettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/ThemeRadioButton.qml</file>
-        <file>imports/NeoChat/Settings/ColorScheme.qml</file>
-        <file>imports/NeoChat/Settings/GeneralSettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/Emoticons.qml</file>
-        <file>imports/NeoChat/Settings/AppearanceSettingsPage.qml</file>
-        <file>imports/NeoChat/Settings/AccountsPage.qml</file>
-        <file>imports/NeoChat/Settings/AccountEditorPage.qml</file>
-        <file>imports/NeoChat/Settings/DevicesPage.qml</file>
-        <file>imports/NeoChat/Settings/About.qml</file>
-        <file>imports/NeoChat/Settings/SonnetConfigPage.qml</file>
-        <file>imports/NeoChat/Settings/qmldir</file>
-    </qresource>
-</RCC>

res_android.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="imports/NeoChat/Menu/ShareAction.qml">imports/NeoChat/Menu/ShareActionAndroid.qml</file>
-    </qresource>
-</RCC>

res_desktop.qrc

@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>imports/NeoChat/Menu/ShareAction.qml</file>
-        <file>imports/NeoChat/Menu/ShareDialog.qml</file>
-    </qresource>
-</RCC>

src/CMakeLists.txt

@@ -44,7 +44,7 @@ add_library(neochat STATIC
 
 add_executable(neochat-app
     main.cpp
-    ../res.qrc
+    res.qrc
 )
 
 target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
@@ -76,11 +76,11 @@ if(NOT ANDROID)
 endif()
 
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    target_sources(neochat-app PRIVATE ../res_desktop.qrc)
+    target_sources(neochat-app PRIVATE res_desktop.qrc)
     target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
     target_sources(neochat PRIVATE runner.cpp)
 else()
-    target_sources(neochat-app PRIVATE ../res_android.qrc)
+    target_sources(neochat-app PRIVATE res_android.qrc)
 endif()
 
 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})

src/main.cpp

@@ -251,11 +251,10 @@ int main(int argc, char *argv[])
 
     Controller::instance().setAboutData(about);
 
-    engine.addImportPath("qrc:/imports");
     engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider);
     engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);
 
-    engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
     if (engine.rootObjects().isEmpty()) {
         return -1;
     }

src/qml/Component/ChatBox/AttachmentPane.qml

@@ -9,7 +9,6 @@ import QtQuick.Controls 2.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Page 1.0
 
 Loader {
     id: attachmentPaneLoader

src/qml/Component/ChatBox/ChatBox.qml

@@ -8,8 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component.ChatBox 1.0
-import NeoChat.Component.Emoji 1.0
 
 ColumnLayout {
     id: chatBox

src/qml/Component/Emoji/EmojiPicker.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 ColumnLayout {
     id: _picker

src/qml/Component/FancyEffectsContainer.qml

@@ -62,7 +62,7 @@ Item {
         }
 
         ImageParticle {
-            source: "qrc:/imports/NeoChat/Component/confetti.png"
+            source: "qrc:/confetti.png"
             entryEffect: ImageParticle.Scale
             rotationVariation: 360
             rotationVelocity: 90
@@ -206,7 +206,7 @@ Item {
     ImageParticle {
         id: fireworksParticleA
         system: fireworksSystem
-        source: "qrc:/imports/NeoChat/Component/glowdot.png"
+        source: "qrc:/glowdot.png"
         alphaVariation: item.isThemeDark ? 0.1 : 0.1
         alpha: item.isThemeDark ? 0.5 : 1
         groups: ["a"]
@@ -217,7 +217,7 @@ Item {
 
     ImageParticle {
         system: fireworksSystem
-        source: "qrc:/imports/NeoChat/Component/glowdot.png"
+        source: "qrc:/glowdot.png"
         color: item.isThemeDark ? "white" : "gold"
         alphaVariation: item.isThemeDark ? 0.1 : 0.1
         alpha: item.isThemeDark ? 0.5 : 1
@@ -230,7 +230,7 @@ Item {
     ImageParticle {
         id: fireworksParticleB
         system: fireworksSystem
-        source: "qrc:/imports/NeoChat/Component/glowdot.png"
+        source: "qrc:/glowdot.png"
         alphaVariation: item.isThemeDark ? 0.1 : 0.1
         alpha: item.isThemeDark ? 0.5 : 1
         groups: ["b"]

src/qml/Component/Login/Loading.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.PlaceholderMessage {
     property var showContinueButton: false

src/qml/Component/Login/Login.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 LoginStep {
     id: login
@@ -53,11 +52,11 @@ LoginStep {
         text: LoginHelper.testing && matrixIdField.acceptableInput ? i18n("Loading…") : i18nc("@action:button", "Continue")
         onTriggered: {
             if (LoginHelper.supportsSso && LoginHelper.supportsPassword) {
-                processed("qrc:/imports/NeoChat/Component/Login/LoginMethod.qml");
+                processed("qrc:/LoginMethod.qml");
             } else if (LoginHelper.supportsPassword) {
-                processed("qrc:/imports/NeoChat/Component/Login/Password.qml");
+                processed("qrc:/Password.qml");
             } else {
-                processed("qrc:/imports/NeoChat/Component/Login/Sso.qml");
+                processed("qrc:/Sso.qml");
             }
         }
         enabled: LoginHelper.homeserverReachable

src/qml/Component/Login/LoginMethod.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component.Login 1.0
 
 LoginStep {
     id: loginMethod
@@ -20,13 +19,13 @@ LoginStep {
         Layout.alignment: Qt.AlignHCenter
         text: i18n("Login with password")
         Layout.preferredWidth: Kirigami.Units.gridUnit * 12
-        onClicked: processed("qrc:/imports/NeoChat/Component/Login/Password.qml")
+        onClicked: processed("qrc:/Password.qml")
     }
 
     Controls.Button {
         Layout.alignment: Qt.AlignHCenter
         text: i18n("Login with single sign-on")
         Layout.preferredWidth: Kirigami.Units.gridUnit * 12
-        onClicked: processed("qrc:/imports/NeoChat/Component/Login/Sso.qml")
+        onClicked: processed("qrc:/Sso.qml")
     }
 }

src/qml/Component/Login/LoginRegister.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component.Login 1.0
 
 LoginStep {
     id: loginRegister
@@ -19,13 +18,13 @@ LoginStep {
         Layout.alignment: Qt.AlignHCenter
         text: i18n("Login")
         Layout.preferredWidth: Kirigami.Units.gridUnit * 12
-        onClicked: processed("qrc:/imports/NeoChat/Component/Login/Login.qml")
+        onClicked: processed("qrc:/Login.qml")
     }
 
     Controls.Button {
         Layout.alignment: Qt.AlignHCenter
         text: i18n("Register")
         Layout.preferredWidth: Kirigami.Units.gridUnit * 12
-        onClicked: processed("qrc:/imports/NeoChat/Component/Login/Homeserver.qml")
+        onClicked: processed("qrc:/Homeserver.qml")
     }
 }

src/qml/Component/Login/Password.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 LoginStep {
     id: password
@@ -17,7 +16,7 @@ LoginStep {
     message: i18n("Enter your password")
     showContinueButton: true
     showBackButton: true
-    previousUrl: LoginHelper.isLoggingIn ? "" : LoginHelper.supportsSso ? "qrc:/imports/NeoChat/Component/Login/LoginMethod.qml" : "qrc:/imports/NeoChat/Component/Login/Login.qml"
+    previousUrl: LoginHelper.isLoggingIn ? "" : LoginHelper.supportsSso ? "qrc:/LoginMethod.qml" : "qrc:/Login.qml"
 
     action: Kirigami.Action {
         text: i18nc("@action:button", "Login")
@@ -30,7 +29,7 @@ LoginStep {
     Connections {
         target: LoginHelper
         function onConnected() {
-            processed("qrc:/imports/NeoChat/Component/Login/Loading.qml")
+            processed("qrc:/Loading.qml")
         }
     }
 

src/qml/Component/Login/Sso.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.12 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 LoginStep {
     id: root
@@ -23,7 +22,7 @@ LoginStep {
                 UrlHelper.openUrl(LoginHelper.ssoUrl)
             }
             function onConnected() {
-                processed("qrc:/imports/NeoChat/Component/Login/Loading.qml")
+                processed("qrc:/Loading.qml")
             }
         }
         RowLayout {
@@ -31,7 +30,7 @@ LoginStep {
                 text: i18nc("@action:button", "Back")
 
                 onClicked: {
-                    module.source = "qrc:/imports/NeoChat/Component/Login/Login.qml"
+                    module.source = "qrc:/Login.qml"
                 }
             }
             QQC2.Button {

src/qml/Component/Timeline/FileDelegate.qml

@@ -9,9 +9,6 @@ import Qt.labs.platform 1.1
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Menu.Timeline 1.0
 
 TimelineContainer {
     id: fileDelegate

src/qml/Component/Timeline/ImageDelegate.qml

@@ -9,10 +9,6 @@ import Qt.labs.platform 1.1
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Menu.Timeline 1.0
-
 
 TimelineContainer {
     id: imageDelegate

src/qml/Component/Timeline/ReplyComponent.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component.Timeline 1.0
 
 Item {
     id: replyComponent

src/qml/Component/Timeline/StateDelegate.qml

@@ -8,8 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
 
 Control {
     id: stateDelegate

src/qml/Component/Timeline/TimelineContainer.qml

@@ -8,8 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
 
 QQC2.ItemDelegate {
     id: timelineContainer

src/qml/Component/Timeline/VideoDelegate.qml

@@ -10,9 +10,6 @@ import Qt.labs.platform 1.1 as Platform
 import org.kde.kirigami 2.13 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Menu.Timeline 1.0
 
 TimelineContainer {
     id: videoDelegate

src/qml/Dialog/CreateRoomDialog.qml

@@ -7,7 +7,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.OverlaySheet {
     id: root

src/qml/Dialog/EmojiDialog.qml

@@ -7,7 +7,6 @@ import QtQuick.Controls 2.15 as QQC2
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component.Emoji 1.0
 
 QQC2.Popup {
     id: root

src/qml/Dialog/UserDetailDialog.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.OverlaySheet {
     id: root

src/qml/Menu/GlobalMenu.qml

@@ -10,10 +10,6 @@ import QtQuick.Layouts 1.10
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Page 1.0
-import NeoChat.Panel 1.0
 
 Labs.MenuBar {
     Labs.Menu {
@@ -28,7 +24,7 @@ Labs.MenuBar {
             text: i18nc("menu", "Configure NeoChat...")
 
             shortcut: StandardKey.Preferences
-            onTriggered: pageStack.pushDialogLayer("qrc:/imports/NeoChat/Settings/SettingsPage.qml", {}, {
+            onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, {
                 title: i18n("Configure")
             })
         }
@@ -45,7 +41,7 @@ Labs.MenuBar {
         Labs.MenuItem {
             text: i18nc("menu", "New Private Chat…")
             enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
-            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {connection: Controller.activeConnection})
+            onTriggered: pushReplaceLayer("qrc:/StartChatPage.qml", {connection: Controller.activeConnection})
         }
         Labs.MenuItem {
             text: i18nc("menu", "New Group…")
@@ -58,7 +54,7 @@ Labs.MenuBar {
         }
         Labs.MenuItem {
             text: i18nc("menu", "Browse Chats…")
-            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {connection: Controller.activeConnection})
+            onTriggered: pushReplaceLayer("qrc:/JoinRoomPage.qml", {connection: Controller.activeConnection})
         }
     }
     EditMenu {

src/qml/Menu/RoomListContextMenu.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.19 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Page 1.0
 
 /**
  * Context menu when clicking on a room in the room list
@@ -104,7 +103,7 @@ Loader {
 
             MenuItem {
                 text: i18n("Room Settings")
-                onTriggered: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room})
+                onTriggered: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room})
             }
 
             MenuSeparator {}
@@ -168,7 +167,7 @@ Loader {
 
                     ToolButton {
                         icon.name: 'settings-configure'
-                        onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room})
+                        onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room})
                     }
                 }
 

src/qml/Menu/ShareAction.qml

@@ -55,7 +55,7 @@ Purpose.PurposeAlternativesModel {
             icon.name: model.iconName
             onTriggered: {
                 doBeforeSharing();
-                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/ShareDialog.qml', {
+                applicationWindow().pageStack.pushDialogLayer('qrc:/ShareDialog.qml', {
                     title: shareAction.tooltip,
                     index: index,
                     model: shareAction._instantiator.model

src/qml/Menu/Timeline/FileDelegateContextMenu.qml

@@ -8,8 +8,6 @@ import Qt.labs.platform 1.1
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Menu 1.0
 
 MessageDelegateContextMenu {
     id: root
@@ -71,7 +69,7 @@ MessageDelegateContextMenu {
             text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")
             icon.name: "dialog-warning-symbolic"
             visible: author.id !== currentRoom.localUser.id
-            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/imports/NeoChat/Menu/Timeline/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
+            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
                 title: i18nc("@title", "Report Message"),
                 width: Kirigami.Units.gridUnit * 25
             })
@@ -80,7 +78,7 @@ MessageDelegateContextMenu {
             text: i18n("View Source")
             icon.name: "code-context"
             onTriggered: {
-                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', {
+                applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', {
                     sourceText: root.source
                 }, {
                     title: i18n("Message Source"),

src/qml/Menu/Timeline/MessageDelegateContextMenu.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Dialog 1.0
 
 Loader {
     id: loadRoot
@@ -58,7 +57,7 @@ Loader {
             text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")
             icon.name: "dialog-warning-symbolic"
             visible: author.id !== currentRoom.localUser.id
-            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/imports/NeoChat/Menu/Timeline/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
+            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
                 title: i18nc("@title", "Report Message"),
                 width: Kirigami.Units.gridUnit * 25
             })
@@ -67,7 +66,7 @@ Loader {
             text: i18n("View Source")
             icon.name: "code-context"
             onTriggered: {
-                applicationWindow().pageStack.pushDialogLayer('qrc:/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml', {
+                applicationWindow().pageStack.pushDialogLayer('qrc:/MessageSourceSheet.qml', {
                     sourceText: loadRoot.source
                 }, {
                     title: i18n("Message Source"),

src/qml/Page/JoinRoomPage.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.ScrollablePage {
     id: root

src/qml/Page/RoomListPage.qml

@@ -11,8 +11,6 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kitemmodels 1.0
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Menu 1.0
 
 Kirigami.ScrollablePage {
 
@@ -187,7 +185,7 @@ Kirigami.ScrollablePage {
             helpfulAction: Kirigami.Action {
                 icon.name: sortFilterRoomListModel.filterText.length > 0 ? "search" : "list-add"
                 text: sortFilterRoomListModel.filterText.length > 0 ? i18n("Search in room directory") : i18n("Explore rooms")
-                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {
+                onTriggered: pageStack.layers.push("qrc:/JoinRoomPage.qml", {
                     connection: Controller.activeConnection,
                     keyword: sortFilterRoomListModel.filterText
                 })

src/qml/Page/RoomPage.qml

@@ -12,11 +12,6 @@ import org.kde.kirigami 2.19 as Kirigami
 import org.kde.kitemmodels 1.0
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Component.ChatBox 1.0
-import NeoChat.Component.Timeline 1.0
-import NeoChat.Dialog 1.0
-import NeoChat.Menu.Timeline 1.0
 
 Kirigami.ScrollablePage {
     id: page

src/qml/Page/StartChatPage.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
 
 Kirigami.ScrollablePage {
     id: root

src/qml/Page/WelcomePage.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component.Login 1.0
 
 Kirigami.ScrollablePage {
     id: welcomePage
@@ -60,7 +59,7 @@ Kirigami.ScrollablePage {
         Loader {
             id: module
             Layout.alignment: Qt.AlignHCenter
-            source: "qrc:/imports/NeoChat/Component/Login/Login.qml"
+            source: "qrc:/Login.qml"
             onSourceChanged: {
                 headerMessage.visible = false
                 headerMessage.text = ""

src/qml/Panel/RoomDrawer.qml

@@ -10,9 +10,6 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kitemmodels 1.0
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
-
 
 Kirigami.OverlayDrawer {
     id: roomDrawer
@@ -105,7 +102,7 @@ Kirigami.OverlayDrawer {
                         display: AbstractButton.IconOnly
 
                         onClicked: {
-                            applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {room: room})
+                            applicationWindow().pageStack.layers.push("qrc:/InviteUserPage.qml", {room: room})
                             roomDrawer.close();
                         }
 
@@ -137,7 +134,7 @@ Kirigami.OverlayDrawer {
                         text: i18n("Room settings")
                         display: AbstractButton.IconOnly
 
-                        onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room})
+                        onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room})
 
                         ToolTip {
                             text: settingsButton.text

src/qml/RoomSettings/General.qml

@@ -8,8 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
 
 Kirigami.ScrollablePage {
     id: root

src/qml/RoomSettings/Security.qml

@@ -8,8 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Component 1.0
-import NeoChat.Dialog 1.0
 
 Kirigami.ScrollablePage {
     id: root

src/qml/Settings/AccountEditorPage.qml

@@ -10,7 +10,6 @@ import Qt.labs.platform 1.1
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Dialog 1.0
 
 Kirigami.ScrollablePage {
     id: root

src/qml/Settings/AccountsPage.qml

@@ -9,7 +9,6 @@ import Qt.labs.platform 1.1
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Dialog 1.0
 
 Kirigami.ScrollablePage {
     title: i18n("Accounts")
@@ -17,7 +16,7 @@ Kirigami.ScrollablePage {
     actions.main: Kirigami.Action {
         text: i18n("Add an account")
         icon.name: "list-add-user"
-        onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
+        onTriggered: pageStack.layers.push("qrc:/WelcomePage.qml")
         visible: !pageSettingStack.wideMode
     }
 
@@ -81,7 +80,7 @@ Kirigami.ScrollablePage {
             actions: Kirigami.Action {
                 text: i18n("Add an account")
                 icon.name: "list-add-user"
-                onTriggered: pageStack.layers.push("qrc:/imports/NeoChat/Page/WelcomePage.qml")
+                onTriggered: pageStack.layers.push("qrc:/WelcomePage.qml")
             }
         }
     }

src/qml/Settings/AppearanceSettingsPage.qml

@@ -9,7 +9,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Settings 1.0
 
 Kirigami.ScrollablePage {
     title: i18nc("@title:window", "Appearance")
@@ -207,7 +206,7 @@ Kirigami.ScrollablePage {
             Loader {
                 visible: item !== null
                 Kirigami.FormData.label: item ? i18n("Theme:") : ""
-                source: "qrc:/imports/NeoChat/Settings/ColorScheme.qml"
+                source: "qrc:/ColorScheme.qml"
             }
             QQC2.CheckBox {
                 visible: Controller.hasWindowSystem

src/qml/Settings/ColorScheme.qml

@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Settings 1.0
 
 QQC2.ComboBox {
     textRole: "display"

src/qml/Settings/Emoticons.qml

@@ -10,10 +10,6 @@ import Qt.labs.platform 1.1
 import org.kde.kirigami 2.15 as Kirigami
 
 import org.kde.neochat 1.0
-import NeoChat.Settings 1.0
-
-import NeoChat.Component 1.0 as Components
-import NeoChat.Dialog 1.0
 
 Kirigami.ScrollablePage {
     title: i18nc("@title:window", "Custom Emojis")
@@ -48,7 +44,7 @@ Kirigami.ScrollablePage {
                     anchors.fill: parent
                     visible: parent.status === Image.Loading
                     radius: height/2
-                    gradient: Components.ShimmerGradient { }
+                    gradient: ShimmerGradient { }
                 }
             }