diff --git a/containments/homescreens/folio/CMakeLists.txt b/containments/homescreens/folio/CMakeLists.txt
index 470c2562..73597a5b 100644
--- a/containments/homescreens/folio/CMakeLists.txt
+++ b/containments/homescreens/folio/CMakeLists.txt
@@ -3,42 +3,84 @@
 
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.mobile.homescreen.folio\")
 
-set(homescreen_SRCS
-    homescreen.cpp
-    applicationlistmodel.cpp
-    homescreenstate.cpp
-    windowlistener.cpp
-    favouritesmodel.cpp
-    folioapplication.cpp
-    folioapplicationfolder.cpp
-    foliodelegate.cpp
-    foliosettings.cpp
-    foliowidget.cpp
-    pagemodel.cpp
-    pagelistmodel.cpp
-    delegatetoucharea.cpp
-    dragstate.cpp
-    widgetcontainer.cpp
-    widgetsmanager.cpp
+plasma_add_applet(org.kde.plasma.mobile.homescreen.folio
+    QML_SOURCES
+        qml/AppDrawer.qml
+        qml/AppDrawerGrid.qml
+        qml/AppDrawerHeader.qml
+        qml/DelegateDragItem.qml
+        qml/FavouritesBar.qml
+        qml/FolderView.qml
+        qml/FolderViewTitle.qml
+        qml/FolioHomeScreen.qml
+        qml/HomeScreenPage.qml
+        qml/HomeScreenPages.qml
+        qml/main.qml
+        qml/PlaceholderDelegate.qml
+        qml/WidgetDragItem.qml
+    CPP_SOURCES
+        applicationlistmodel.cpp
+        delegatetoucharea.cpp
+        dragstate.cpp
+        favouritesmodel.cpp
+        folioapplication.cpp
+        folioapplicationfolder.cpp
+        foliodelegate.cpp
+        foliosettings.cpp
+        foliowidget.cpp
+        homescreen.cpp
+        homescreenstate.cpp
+        pagelistmodel.cpp
+        pagemodel.cpp
+        widgetcontainer.cpp
+        widgetsmanager.cpp
+        windowlistener.cpp
 )
 
-add_library(org.kde.plasma.mobile.homescreen.folio MODULE ${homescreen_SRCS})
-
-target_link_libraries(org.kde.plasma.mobile.homescreen.folio
-                      Qt::Gui
-                      Qt::Qml
-                      Qt::Quick
-                      Plasma::Plasma
-                      Plasma::PlasmaQuick
-                      KF6::I18n
-                      KF6::Service
-                      KF6::KIOGui
-                      KF6::Notifications
-                      Plasma::KWaylandClient
-                      KF6::WindowSystem
-                      KF6::JobWidgets
+ecm_target_qml_sources(org.kde.plasma.mobile.homescreen.folio SOURCES
+    qml/delegate/AbstractDelegate.qml
+    qml/delegate/AppDelegate.qml
+    qml/delegate/AppFolderDelegate.qml
+    qml/delegate/DelegateAppIcon.qml
+    qml/delegate/DelegateFolderIcon.qml
+    qml/delegate/DelegateIconLoader.qml
+    qml/delegate/DelegateLabel.qml
+    qml/delegate/DelegateShadow.qml
+    qml/delegate/KeyboardHighlight.qml
+    qml/delegate/WidgetDelegate.qml
+    qml/delegate/WidgetDelegateConfig.qml
+    PATH delegate
 )
 
-install(TARGETS org.kde.plasma.mobile.homescreen.folio DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/applets)
+ecm_target_qml_sources(org.kde.plasma.mobile.homescreen.folio SOURCES
+    qml/private/ConfirmDeleteFolderDialogLoader.qml
+    qml/private/ContextMenuLoader.qml
+    qml/private/DarkenEffect.qml
+    qml/private/Orientation.qml
+    qml/private/WidgetHandlePosition.qml
+    qml/private/WidgetResizeHandle.qml
+    qml/private/WidgetResizeHandleFrame.qml
+    PATH private
+)
 
-plasma_install_package(package org.kde.plasma.mobile.homescreen.folio)
+ecm_target_qml_sources(org.kde.plasma.mobile.homescreen.folio SOURCES
+    qml/settings/AppletListViewer.qml
+    qml/settings/SettingsComponent.qml
+    qml/settings/SettingsWindow.qml
+    PATH settings
+)
+
+target_link_libraries(org.kde.plasma.mobile.homescreen.folio PRIVATE
+    Qt::Gui
+    Qt::Qml
+    Qt::Quick
+    Plasma::Plasma
+    Plasma::PlasmaQuick
+    KF6::I18n
+    KF6::Service
+    KF6::KIOGui
+    KF6::Notifications
+    Plasma::KWaylandClient
+    KF6::WindowSystem
+    KF6::JobWidgets
+)
diff --git a/containments/homescreens/folio/applicationlistmodel.h b/containments/homescreens/folio/applicationlistmodel.h
index 849825f9..8f5d5384 100644
--- a/containments/homescreens/folio/applicationlistmodel.h
+++ b/containments/homescreens/folio/applicationlistmodel.h
@@ -24,6 +24,8 @@ class FolioDelegate;
 class ApplicationListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     enum Roles {
@@ -59,6 +61,8 @@ protected:
 class ApplicationListSearchModel : public QSortFilterProxyModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     ApplicationListSearchModel(HomeScreen *parent = nullptr, ApplicationListModel *model = nullptr);
diff --git a/containments/homescreens/folio/delegatetoucharea.h b/containments/homescreens/folio/delegatetoucharea.h
index a4456361..b87f84f7 100644
--- a/containments/homescreens/folio/delegatetoucharea.h
+++ b/containments/homescreens/folio/delegatetoucharea.h
@@ -16,6 +16,7 @@
 class DelegateTouchArea : public QQuickItem
 {
     Q_OBJECT
+    QML_ELEMENT
 
     Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged FINAL)
     Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged FINAL)
diff --git a/containments/homescreens/folio/dragstate.h b/containments/homescreens/folio/dragstate.h
index 32a0d82e..bbf23545 100644
--- a/containments/homescreens/folio/dragstate.h
+++ b/containments/homescreens/folio/dragstate.h
@@ -17,6 +17,9 @@ class HomeScreenState;
 class DelegateDragPosition : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(DelegateDragPosition::Location location READ location NOTIFY locationChanged)
     Q_PROPERTY(int page READ page NOTIFY pageChanged)
     Q_PROPERTY(int pageRow READ pageRow NOTIFY pageRowChanged)
diff --git a/containments/homescreens/folio/favouritesmodel.h b/containments/homescreens/folio/favouritesmodel.h
index 1f3025a3..d1dbeb56 100644
--- a/containments/homescreens/folio/favouritesmodel.h
+++ b/containments/homescreens/folio/favouritesmodel.h
@@ -27,6 +27,8 @@ struct FavouritesDelegate {
 class FavouritesModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     enum Roles {
diff --git a/containments/homescreens/folio/folioapplication.h b/containments/homescreens/folio/folioapplication.h
index b7e759b9..d34098f3 100644
--- a/containments/homescreens/folio/folioapplication.h
+++ b/containments/homescreens/folio/folioapplication.h
@@ -26,6 +26,9 @@ class HomeScreen;
 class FolioApplication : public QObject, public std::enable_shared_from_this<FolioApplication>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(bool running READ running NOTIFY windowChanged)
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
     Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
diff --git a/containments/homescreens/folio/folioapplicationfolder.h b/containments/homescreens/folio/folioapplicationfolder.h
index 47b9697e..d87bc84a 100644
--- a/containments/homescreens/folio/folioapplicationfolder.h
+++ b/containments/homescreens/folio/folioapplicationfolder.h
@@ -31,6 +31,9 @@ class FolioApplication;
 class FolioApplicationFolder : public QObject, public std::enable_shared_from_this<FolioApplicationFolder>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(QList<FolioApplication *> appPreviews READ appPreviews NOTIFY applicationsChanged)
     Q_PROPERTY(ApplicationFolderModel *applications READ applications NOTIFY applicationsReset)
diff --git a/containments/homescreens/folio/foliodelegate.h b/containments/homescreens/folio/foliodelegate.h
index ad9e42f5..90f13f2b 100644
--- a/containments/homescreens/folio/foliodelegate.h
+++ b/containments/homescreens/folio/foliodelegate.h
@@ -18,6 +18,9 @@ class FolioWidget;
 class FolioDelegate : public QObject, public std::enable_shared_from_this<FolioDelegate>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(FolioDelegate::Type type READ type CONSTANT)
     Q_PROPERTY(FolioApplication *application READ applicationRaw CONSTANT)
     Q_PROPERTY(FolioApplicationFolder *folder READ folderRaw CONSTANT)
@@ -64,9 +67,11 @@ protected:
 class FolioPageDelegate : public FolioDelegate
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int row READ row NOTIFY rowChanged)
     Q_PROPERTY(int column READ column NOTIFY columnChanged)
-    QML_UNCREATABLE("")
 
 public:
     typedef std::shared_ptr<FolioPageDelegate> Ptr;
diff --git a/containments/homescreens/folio/foliosettings.h b/containments/homescreens/folio/foliosettings.h
index 9e2772cd..bea2f9ab 100644
--- a/containments/homescreens/folio/foliosettings.h
+++ b/containments/homescreens/folio/foliosettings.h
@@ -14,6 +14,9 @@ class HomeScreen;
 class FolioSettings : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int homeScreenRows READ homeScreenRows WRITE setHomeScreenRows NOTIFY homeScreenRowsChanged)
     Q_PROPERTY(int homeScreenColumns READ homeScreenColumns WRITE setHomeScreenColumns NOTIFY homeScreenColumnsChanged)
     Q_PROPERTY(bool showPagesAppLabels READ showPagesAppLabels WRITE setShowPagesAppLabels NOTIFY showPagesAppLabelsChanged)
diff --git a/containments/homescreens/folio/foliowidget.h b/containments/homescreens/folio/foliowidget.h
index 757376a4..c67fe066 100644
--- a/containments/homescreens/folio/foliowidget.h
+++ b/containments/homescreens/folio/foliowidget.h
@@ -25,6 +25,9 @@ public:
 class FolioWidget : public QObject, public std::enable_shared_from_this<FolioWidget>
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int id READ id NOTIFY idChanged)
     Q_PROPERTY(int gridWidth READ gridWidth NOTIFY gridWidthChanged)
     Q_PROPERTY(int gridHeight READ gridHeight NOTIFY gridHeightChanged)
diff --git a/containments/homescreens/folio/homescreen.cpp b/containments/homescreens/folio/homescreen.cpp
index f076b25b..c7e42ff5 100644
--- a/containments/homescreens/folio/homescreen.cpp
+++ b/containments/homescreens/folio/homescreen.cpp
@@ -11,6 +11,8 @@
 #include <QQmlExtensionPlugin>
 #include <QQuickItem>
 
+K_PLUGIN_CLASS_WITH_JSON(HomeScreen, "metadata.json")
+
 HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
     : Plasma::Containment{parent, data, args}
     , m_folioSettings{new FolioSettings{this}}
@@ -24,24 +26,6 @@ HomeScreen::HomeScreen(QObject *parent, const KPluginMetaData &data, const QVari
     // HomeScreenState init() has dependencies on other objects
     m_homeScreenState->init();
 
-    const char *uri = "org.kde.private.mobile.homescreen.folio";
-    qmlRegisterUncreatableType<HomeScreen>(uri, 1, 0, "HomeScreen", "");
-    qmlRegisterUncreatableType<ApplicationListModel>(uri, 1, 0, "ApplicationListModel", "");
-    qmlRegisterUncreatableType<ApplicationListSearchModel>(uri, 1, 0, "ApplicationListSearchModel", "");
-    qmlRegisterUncreatableType<FavouritesModel>(uri, 1, 0, "FavouritesModel", "");
-    qmlRegisterUncreatableType<PageListModel>(uri, 1, 0, "PageListModel", "");
-    qmlRegisterUncreatableType<FolioSettings>(uri, 1, 0, "FolioSettings", "");
-    qmlRegisterUncreatableType<HomeScreenState>(uri, 1, 0, "HomeScreenState", "");
-    qmlRegisterUncreatableType<FolioApplication>(uri, 1, 0, "FolioApplication", "");
-    qmlRegisterUncreatableType<FolioApplicationFolder>(uri, 1, 0, "FolioApplicationFolder", "");
-    qmlRegisterUncreatableType<FolioWidget>(uri, 1, 0, "FolioWidget", "");
-    qmlRegisterUncreatableType<FolioDelegate>(uri, 1, 0, "FolioDelegate", "");
-    qmlRegisterUncreatableType<PageModel>(uri, 1, 0, "PageModel", "");
-    qmlRegisterUncreatableType<FolioPageDelegate>(uri, 1, 0, "FolioPageDelegate", "");
-    qmlRegisterType<DelegateTouchArea>(uri, 1, 0, "DelegateTouchArea");
-    qmlRegisterUncreatableType<DelegateDragPosition>(uri, 1, 0, "DelegateDragPosition", "");
-    qmlRegisterType<WidgetContainer>(uri, 1, 0, "WidgetContainer");
-
     setHasConfigurationInterface(true);
 
     connect(KWindowSystem::self(), &KWindowSystem::showingDesktopChanged, this, &HomeScreen::showingDesktopChanged);
@@ -103,6 +87,4 @@ PageListModel *HomeScreen::pageListModel()
     return m_pageListModel;
 }
 
-K_PLUGIN_CLASS(HomeScreen)
-
 #include "homescreen.moc"
diff --git a/containments/homescreens/folio/homescreen.h b/containments/homescreens/folio/homescreen.h
index 25265094..96ab7f24 100644
--- a/containments/homescreens/folio/homescreen.h
+++ b/containments/homescreens/folio/homescreen.h
@@ -32,6 +32,8 @@ class ApplicationListSearchModel;
 class HomeScreen : public Plasma::Containment
 {
     Q_OBJECT
+    QML_ELEMENT
+
     Q_PROPERTY(FolioSettings *FolioSettings READ folioSettings CONSTANT)
     Q_PROPERTY(HomeScreenState *HomeScreenState READ homeScreenState CONSTANT)
     Q_PROPERTY(WidgetsManager *WidgetsManager READ widgetsManager CONSTANT)
diff --git a/containments/homescreens/folio/homescreenstate.h b/containments/homescreens/folio/homescreenstate.h
index eacbd550..058d3e25 100644
--- a/containments/homescreens/folio/homescreenstate.h
+++ b/containments/homescreens/folio/homescreenstate.h
@@ -24,6 +24,9 @@ class HomeScreen;
 class HomeScreenState : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(HomeScreenState::SwipeState swipeState READ swipeState NOTIFY swipeStateChanged)
     Q_PROPERTY(HomeScreenState::ViewState viewState READ viewState NOTIFY viewStateChanged)
     Q_PROPERTY(DragState *dragState READ dragState CONSTANT)
diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/metadata.json
similarity index 98%
rename from containments/homescreens/folio/package/metadata.json
rename to containments/homescreens/folio/metadata.json
index ecb60152..704b488e 100644
--- a/containments/homescreens/folio/package/metadata.json
+++ b/containments/homescreens/folio/metadata.json
@@ -1,5 +1,4 @@
 {
-    "KPackageStructure": "Plasma/Applet",
     "KPlugin": {
         "Authors": [
             {
@@ -83,7 +82,6 @@
         "Description[x-test]": "xxMobile homescreen with a focus on customizability.xx",
         "Description[zh_CN]": "高可定制性的手机主屏幕方案。",
         "Description[zh_TW]": "注重可自訂性的手機主畫面。",
-        "Id": "org.kde.plasma.mobile.homescreen.folio",
         "License": "GPLv2+",
         "Name": "Folio",
         "Name[ar]": "مطوية",
diff --git a/containments/homescreens/folio/pagelistmodel.h b/containments/homescreens/folio/pagelistmodel.h
index 569629a2..271994f8 100644
--- a/containments/homescreens/folio/pagelistmodel.h
+++ b/containments/homescreens/folio/pagelistmodel.h
@@ -17,6 +17,9 @@ class PageModel;
 class PageListModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
+
     Q_PROPERTY(int length READ length NOTIFY lengthChanged)
 
 public:
diff --git a/containments/homescreens/folio/pagemodel.h b/containments/homescreens/folio/pagemodel.h
index 1b9ce6a6..83063781 100644
--- a/containments/homescreens/folio/pagemodel.h
+++ b/containments/homescreens/folio/pagemodel.h
@@ -20,6 +20,8 @@ class FolioPageDelegate;
 class PageModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_ELEMENT
+    QML_UNCREATABLE("")
 
 public:
     enum Roles {
diff --git a/containments/homescreens/folio/package/contents/ui/AppDrawer.qml b/containments/homescreens/folio/qml/AppDrawer.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/AppDrawer.qml
rename to containments/homescreens/folio/qml/AppDrawer.qml
index 0f016142..a389b205 100644
--- a/containments/homescreens/folio/package/contents/ui/AppDrawer.qml
+++ b/containments/homescreens/folio/qml/AppDrawer.qml
@@ -10,7 +10,7 @@ import org.kde.plasma.components 3.0 as PC3
 import org.kde.kirigami as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import 'private'
 
diff --git a/containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml b/containments/homescreens/folio/qml/AppDrawerGrid.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml
rename to containments/homescreens/folio/qml/AppDrawerGrid.qml
index 54632b5d..f9cc1677 100644
--- a/containments/homescreens/folio/package/contents/ui/AppDrawerGrid.qml
+++ b/containments/homescreens/folio/qml/AppDrawerGrid.qml
@@ -11,7 +11,7 @@ import org.kde.kirigami as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.plasma.private.mobileshell.state as MobileShellState
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import "./delegate"
 
diff --git a/containments/homescreens/folio/package/contents/ui/AppDrawerHeader.qml b/containments/homescreens/folio/qml/AppDrawerHeader.qml
similarity index 97%
rename from containments/homescreens/folio/package/contents/ui/AppDrawerHeader.qml
rename to containments/homescreens/folio/qml/AppDrawerHeader.qml
index 80921fd1..559653c2 100644
--- a/containments/homescreens/folio/package/contents/ui/AppDrawerHeader.qml
+++ b/containments/homescreens/folio/qml/AppDrawerHeader.qml
@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.kirigami as Kirigami
 
 import org.kde.plasma.components 3.0 as PlasmaComponents
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import './delegate'
 
 Item {
diff --git a/containments/homescreens/folio/package/contents/ui/DelegateDragItem.qml b/containments/homescreens/folio/qml/DelegateDragItem.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/DelegateDragItem.qml
rename to containments/homescreens/folio/qml/DelegateDragItem.qml
index 24d8cfb0..36efd881 100644
--- a/containments/homescreens/folio/package/contents/ui/DelegateDragItem.qml
+++ b/containments/homescreens/folio/qml/DelegateDragItem.qml
@@ -5,7 +5,7 @@ import QtQuick
 import QtQuick.Layouts
 
 import org.kde.kirigami 2.20 as Kirigami
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 
 import "./delegate"
diff --git a/containments/homescreens/folio/package/contents/ui/FavouritesBar.qml b/containments/homescreens/folio/qml/FavouritesBar.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/FavouritesBar.qml
rename to containments/homescreens/folio/qml/FavouritesBar.qml
index 0feb4e49..0ddaa237 100644
--- a/containments/homescreens/folio/package/contents/ui/FavouritesBar.qml
+++ b/containments/homescreens/folio/qml/FavouritesBar.qml
@@ -7,7 +7,7 @@ import QtQuick.Layouts 1.1
 
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell.state as MobileShellState
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.kirigami 2.10 as Kirigami
 
diff --git a/containments/homescreens/folio/package/contents/ui/FolderView.qml b/containments/homescreens/folio/qml/FolderView.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/FolderView.qml
rename to containments/homescreens/folio/qml/FolderView.qml
index 58b2012f..e8e03e43 100644
--- a/containments/homescreens/folio/package/contents/ui/FolderView.qml
+++ b/containments/homescreens/folio/qml/FolderView.qml
@@ -9,7 +9,7 @@ import QtQuick.Controls as QQC2
 import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import "./private"
 import "./delegate"
diff --git a/containments/homescreens/folio/package/contents/ui/FolderViewTitle.qml b/containments/homescreens/folio/qml/FolderViewTitle.qml
similarity index 97%
rename from containments/homescreens/folio/package/contents/ui/FolderViewTitle.qml
rename to containments/homescreens/folio/qml/FolderViewTitle.qml
index 117b263e..6bc8d645 100644
--- a/containments/homescreens/folio/package/contents/ui/FolderViewTitle.qml
+++ b/containments/homescreens/folio/qml/FolderViewTitle.qml
@@ -9,7 +9,7 @@ import QtQuick.Controls as QQC2
 import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 MobileShell.BaseItem {
     id: root
diff --git a/containments/homescreens/folio/package/contents/ui/HomeScreen.qml b/containments/homescreens/folio/qml/FolioHomeScreen.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/HomeScreen.qml
rename to containments/homescreens/folio/qml/FolioHomeScreen.qml
index 3bddeeef..28d80d65 100644
--- a/containments/homescreens/folio/package/contents/ui/HomeScreen.qml
+++ b/containments/homescreens/folio/qml/FolioHomeScreen.qml
@@ -12,7 +12,7 @@ import org.kde.kirigami 2.20 as Kirigami
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import "./delegate"
 import "./settings"
diff --git a/containments/homescreens/folio/package/contents/ui/HomeScreenPage.qml b/containments/homescreens/folio/qml/HomeScreenPage.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/HomeScreenPage.qml
rename to containments/homescreens/folio/qml/HomeScreenPage.qml
index e03df5fe..a61aad77 100644
--- a/containments/homescreens/folio/package/contents/ui/HomeScreenPage.qml
+++ b/containments/homescreens/folio/qml/HomeScreenPage.qml
@@ -9,7 +9,7 @@ import QtQuick.Effects
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell.state as MobileShellState
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigami as Kirigami
 
 import "./delegate"
diff --git a/containments/homescreens/folio/package/contents/ui/HomeScreenPages.qml b/containments/homescreens/folio/qml/HomeScreenPages.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/HomeScreenPages.qml
rename to containments/homescreens/folio/qml/HomeScreenPages.qml
index b0670ea9..e5973412 100644
--- a/containments/homescreens/folio/package/contents/ui/HomeScreenPages.qml
+++ b/containments/homescreens/folio/qml/HomeScreenPages.qml
@@ -8,7 +8,7 @@ import QtQuick.Layouts
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.kirigami 2.10 as Kirigami
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 MouseArea {
     id: root
diff --git a/containments/homescreens/folio/package/contents/ui/PlaceholderDelegate.qml b/containments/homescreens/folio/qml/PlaceholderDelegate.qml
similarity index 95%
rename from containments/homescreens/folio/package/contents/ui/PlaceholderDelegate.qml
rename to containments/homescreens/folio/qml/PlaceholderDelegate.qml
index 9b22ba10..12acbccf 100644
--- a/containments/homescreens/folio/package/contents/ui/PlaceholderDelegate.qml
+++ b/containments/homescreens/folio/qml/PlaceholderDelegate.qml
@@ -4,7 +4,7 @@
 import QtQuick
 import QtQuick.Layouts
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigami 2.10 as Kirigami
 
 import "./delegate"
diff --git a/containments/homescreens/folio/package/contents/ui/WidgetDragItem.qml b/containments/homescreens/folio/qml/WidgetDragItem.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/WidgetDragItem.qml
rename to containments/homescreens/folio/qml/WidgetDragItem.qml
index a6a2c64c..e278e07d 100644
--- a/containments/homescreens/folio/package/contents/ui/WidgetDragItem.qml
+++ b/containments/homescreens/folio/qml/WidgetDragItem.qml
@@ -11,7 +11,7 @@ import org.kde.plasma.core as PlasmaCore
 import org.kde.ksvg 1.0 as KSvg
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import './delegate'
 import './private'
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/AbstractDelegate.qml b/containments/homescreens/folio/qml/delegate/AbstractDelegate.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/delegate/AbstractDelegate.qml
rename to containments/homescreens/folio/qml/delegate/AbstractDelegate.qml
index 27fecab5..40ee986c 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/AbstractDelegate.qml
+++ b/containments/homescreens/folio/qml/delegate/AbstractDelegate.qml
@@ -11,7 +11,7 @@ import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.kquickcontrolsaddons 2.0
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
 import org.kde.plasma.private.mobileshell as MobileShell
 
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/AppDelegate.qml b/containments/homescreens/folio/qml/delegate/AppDelegate.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/delegate/AppDelegate.qml
rename to containments/homescreens/folio/qml/delegate/AppDelegate.qml
index 7c810597..08bb00da 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/AppDelegate.qml
+++ b/containments/homescreens/folio/qml/delegate/AppDelegate.qml
@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell.state as MobileShellState
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.plasma.plasmoid
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/AppFolderDelegate.qml b/containments/homescreens/folio/qml/delegate/AppFolderDelegate.qml
similarity index 88%
rename from containments/homescreens/folio/package/contents/ui/delegate/AppFolderDelegate.qml
rename to containments/homescreens/folio/qml/delegate/AppFolderDelegate.qml
index f34d187b..a1228c6b 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/AppFolderDelegate.qml
+++ b/containments/homescreens/folio/qml/delegate/AppFolderDelegate.qml
@@ -6,7 +6,7 @@ import QtQuick.Layouts
 import QtQuick.Controls as Controls
 import QtQuick.Effects
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 AbstractDelegate {
     id: root
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/DelegateAppIcon.qml b/containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml
similarity index 86%
rename from containments/homescreens/folio/package/contents/ui/delegate/DelegateAppIcon.qml
rename to containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml
index 7f917f70..bf162046 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/DelegateAppIcon.qml
+++ b/containments/homescreens/folio/qml/delegate/DelegateAppIcon.qml
@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 Kirigami.Icon {
     id: root
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/DelegateFolderIcon.qml b/containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml
similarity index 96%
rename from containments/homescreens/folio/package/contents/ui/delegate/DelegateFolderIcon.qml
rename to containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml
index f1ee13ae..80c7541a 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/DelegateFolderIcon.qml
+++ b/containments/homescreens/folio/qml/delegate/DelegateFolderIcon.qml
@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 
 Item {
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/DelegateIconLoader.qml b/containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml
similarity index 94%
rename from containments/homescreens/folio/package/contents/ui/delegate/DelegateIconLoader.qml
rename to containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml
index 9a7eaf3b..8ec41cd8 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/DelegateIconLoader.qml
+++ b/containments/homescreens/folio/qml/delegate/DelegateIconLoader.qml
@@ -8,7 +8,7 @@ import QtQuick.Effects
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.plasma.private.mobileshell as MobileShell
 
 Loader {
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/DelegateLabel.qml b/containments/homescreens/folio/qml/delegate/DelegateLabel.qml
similarity index 88%
rename from containments/homescreens/folio/package/contents/ui/delegate/DelegateLabel.qml
rename to containments/homescreens/folio/qml/delegate/DelegateLabel.qml
index ec0a7e3e..28ddef0d 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/DelegateLabel.qml
+++ b/containments/homescreens/folio/qml/delegate/DelegateLabel.qml
@@ -7,7 +7,7 @@ import QtQuick.Layouts
 import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 PC3.Label {
     id: label
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/DelegateShadow.qml b/containments/homescreens/folio/qml/delegate/DelegateShadow.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/delegate/DelegateShadow.qml
rename to containments/homescreens/folio/qml/delegate/DelegateShadow.qml
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/KeyboardHighlight.qml b/containments/homescreens/folio/qml/delegate/KeyboardHighlight.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/delegate/KeyboardHighlight.qml
rename to containments/homescreens/folio/qml/delegate/KeyboardHighlight.qml
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegate.qml b/containments/homescreens/folio/qml/delegate/WidgetDelegate.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegate.qml
rename to containments/homescreens/folio/qml/delegate/WidgetDelegate.qml
index ebb81ebc..6d83ee98 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegate.qml
+++ b/containments/homescreens/folio/qml/delegate/WidgetDelegate.qml
@@ -11,7 +11,7 @@ import org.kde.plasma.core as PlasmaCore
 import org.kde.ksvg 1.0 as KSvg
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../private'
 
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegateConfig.qml b/containments/homescreens/folio/qml/delegate/WidgetDelegateConfig.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegateConfig.qml
rename to containments/homescreens/folio/qml/delegate/WidgetDelegateConfig.qml
index 79b5b5a2..51d9ccda 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegateConfig.qml
+++ b/containments/homescreens/folio/qml/delegate/WidgetDelegateConfig.qml
@@ -11,7 +11,7 @@ import org.kde.plasma.core as PlasmaCore
 import org.kde.ksvg 1.0 as KSvg
 
 import org.kde.plasma.components 3.0 as PC3
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../private'
 
diff --git a/containments/homescreens/folio/package/contents/ui/main.qml b/containments/homescreens/folio/qml/main.qml
similarity index 98%
rename from containments/homescreens/folio/package/contents/ui/main.qml
rename to containments/homescreens/folio/qml/main.qml
index 9a24cdda..2ca836e1 100644
--- a/containments/homescreens/folio/package/contents/ui/main.qml
+++ b/containments/homescreens/folio/qml/main.qml
@@ -14,10 +14,11 @@ import org.kde.plasma.components 3.0 as PlasmaComponents
 
 import org.kde.plasma.private.mobileshell as MobileShell
 import org.kde.plasma.private.mobileshell.state as MobileShellState
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
 import org.kde.plasma.private.mobileshell.windowplugin as WindowPlugin
 import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings
 
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
+
 import "./private"
 
 ContainmentItem {
@@ -155,7 +156,7 @@ ContainmentItem {
         contentItem: Item {
 
             // homescreen component
-            HomeScreen {
+            FolioHomeScreen {
                 id: folioHomeScreen
                 folio: root.folio
                 maskManager: root.maskManager
diff --git a/containments/homescreens/folio/package/contents/ui/private/ConfirmDeleteFolderDialogLoader.qml b/containments/homescreens/folio/qml/private/ConfirmDeleteFolderDialogLoader.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/private/ConfirmDeleteFolderDialogLoader.qml
rename to containments/homescreens/folio/qml/private/ConfirmDeleteFolderDialogLoader.qml
diff --git a/containments/homescreens/folio/package/contents/ui/private/ContextMenuLoader.qml b/containments/homescreens/folio/qml/private/ContextMenuLoader.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/private/ContextMenuLoader.qml
rename to containments/homescreens/folio/qml/private/ContextMenuLoader.qml
diff --git a/containments/homescreens/folio/package/contents/ui/private/DarkenEffect.qml b/containments/homescreens/folio/qml/private/DarkenEffect.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/private/DarkenEffect.qml
rename to containments/homescreens/folio/qml/private/DarkenEffect.qml
diff --git a/containments/homescreens/folio/package/contents/ui/private/Orientation.qml b/containments/homescreens/folio/qml/private/Orientation.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/private/Orientation.qml
rename to containments/homescreens/folio/qml/private/Orientation.qml
diff --git a/containments/homescreens/folio/package/contents/ui/private/WidgetHandlePosition.qml b/containments/homescreens/folio/qml/private/WidgetHandlePosition.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/private/WidgetHandlePosition.qml
rename to containments/homescreens/folio/qml/private/WidgetHandlePosition.qml
diff --git a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandle.qml b/containments/homescreens/folio/qml/private/WidgetResizeHandle.qml
similarity index 100%
rename from containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandle.qml
rename to containments/homescreens/folio/qml/private/WidgetResizeHandle.qml
diff --git a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml b/containments/homescreens/folio/qml/private/WidgetResizeHandleFrame.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml
rename to containments/homescreens/folio/qml/private/WidgetResizeHandleFrame.qml
index c461d21e..f207e9b1 100644
--- a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml
+++ b/containments/homescreens/folio/qml/private/WidgetResizeHandleFrame.qml
@@ -7,7 +7,7 @@ import QtQuick.Controls as QQC2
 import Qt5Compat.GraphicalEffects
 
 import org.kde.kirigami as Kirigami
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../delegate'
 
diff --git a/containments/homescreens/folio/package/contents/ui/settings/AppletListViewer.qml b/containments/homescreens/folio/qml/settings/AppletListViewer.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/settings/AppletListViewer.qml
rename to containments/homescreens/folio/qml/settings/AppletListViewer.qml
index 069f354c..3cacdf6b 100644
--- a/containments/homescreens/folio/package/contents/ui/settings/AppletListViewer.qml
+++ b/containments/homescreens/folio/qml/settings/AppletListViewer.qml
@@ -11,7 +11,7 @@ import org.kde.kirigami as Kirigami
 import org.kde.plasma.plasmoid
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.plasma.private.shell 2.0
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell
@@ -40,7 +40,7 @@ MouseArea {
         color: Qt.rgba(0, 0, 0, 0.7)
     }
 
-    
+
     PlasmaExtras.ModelContextMenu {
         id: getWidgetsDialog
         visualParent: getWidgetsButton
diff --git a/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml b/containments/homescreens/folio/qml/settings/SettingsComponent.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
rename to containments/homescreens/folio/qml/settings/SettingsComponent.qml
index 89adb2a4..19005859 100644
--- a/containments/homescreens/folio/package/contents/ui/settings/SettingsComponent.qml
+++ b/containments/homescreens/folio/qml/settings/SettingsComponent.qml
@@ -10,7 +10,7 @@ import org.kde.kirigami 2.20 as Kirigami
 
 import org.kde.plasma.components 3.0 as PC3
 import org.kde.plasma.private.mobileshell as MobileShell
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 
 import '../delegate'
 
@@ -235,7 +235,7 @@ Item {
         Behavior on opacity {
             NumberAnimation { duration: Kirigami.Units.shortDuration }
         }
-        
+
         sourceComponent: AppletListViewer {
             id: appletListViewer
             folio: root.folio
diff --git a/containments/homescreens/folio/package/contents/ui/settings/SettingsWindow.qml b/containments/homescreens/folio/qml/settings/SettingsWindow.qml
similarity index 99%
rename from containments/homescreens/folio/package/contents/ui/settings/SettingsWindow.qml
rename to containments/homescreens/folio/qml/settings/SettingsWindow.qml
index 376a1b22..06dbfa00 100644
--- a/containments/homescreens/folio/package/contents/ui/settings/SettingsWindow.qml
+++ b/containments/homescreens/folio/qml/settings/SettingsWindow.qml
@@ -9,7 +9,7 @@ import QtQuick.Controls as QQC2
 
 import org.kde.kirigami 2.20 as Kirigami
 
-import org.kde.private.mobile.homescreen.folio 1.0 as Folio
+import plasma.applet.org.kde.plasma.mobile.homescreen.folio as Folio
 import org.kde.kirigamiaddons.formcard 1.0 as FormCard
 
 import '../delegate'
diff --git a/containments/homescreens/folio/widgetcontainer.h b/containments/homescreens/folio/widgetcontainer.h
index d7c74ff7..54f1c22d 100644
--- a/containments/homescreens/folio/widgetcontainer.h
+++ b/containments/homescreens/folio/widgetcontainer.h
@@ -10,9 +10,9 @@
 class WidgetContainer : public QQuickItem
 {
     Q_OBJECT
-    Q_PROPERTY(bool editMode READ editMode WRITE setEditMode NOTIFY editModeChanged)
+    QML_ELEMENT
 
-    QML_NAMED_ELEMENT(WidgetContainer)
+    Q_PROPERTY(bool editMode READ editMode WRITE setEditMode NOTIFY editModeChanged)
 
 public:
     WidgetContainer(QQuickItem *parent = nullptr);