diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
 include(ECMAddQch)
+include(ECMAddQmlModule)
 include(KDEPackageAppTemplates)
-include(ECMGenerateQmlTypes)
 include(ECMSetupQtPluginMacroNames)
 
 option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
diff --git a/src/declarativeimports/CMakeLists.txt b/src/declarativeimports/CMakeLists.txt
--- a/src/declarativeimports/CMakeLists.txt
+++ b/src/declarativeimports/CMakeLists.txt
@@ -5,7 +5,49 @@
 add_subdirectory(platformcomponents)
 add_subdirectory(calendar)
 
-install(DIRECTORY plasmastyle/ DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls/Styles/Plasma)
+
+ecm_add_qmlmodule(plasmastyle
+    IDENTIFIER QtQuick.Controls.Styles.Plasma
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    VERSION 2.0
+)
+
+ecm_qmlmodule_objecttypes(plasmastyle
+    INITIAL_VERSION 2.0
+    OBJECT_TYPES_BY_FILENAMES
+        plasmastyle/ApplicationWindowStyle.qml
+        plasmastyle/BusyIndicatorStyle.qml
+        plasmastyle/ButtonStyle.qml
+        plasmastyle/CalendarStyle.qml
+        plasmastyle/CheckBoxStyle.qml
+        plasmastyle/ComboBoxStyle.qml
+        plasmastyle/MenuBarStyle.qml
+        plasmastyle/MenuStyle.qml
+        plasmastyle/ProgressBarStyle.qml
+        plasmastyle/RadioButtonStyle.qml
+        plasmastyle/ScrollViewStyle.qml
+        plasmastyle/SliderStyle.qml
+        plasmastyle/SpinBoxStyle.qml
+        plasmastyle/StatusBarStyle.qml
+        plasmastyle/SwitchStyle.qml
+        plasmastyle/TabViewStyle.qml
+        plasmastyle/TableViewStyle.qml
+        plasmastyle/TextAreaStyle.qml
+        plasmastyle/TextFieldStyle.qml
+        plasmastyle/ToolBarStyle.qml
+        plasmastyle/ToolButtonStyle.qml
+        plasmastyle/GroupBoxStyle.qml
+        plasmastyle/FocusFrameStyle.qml
+)
+
+ecm_qmlmodule_privatefiles(plasmastyle
+    RELATIVE_PATH private
+    FILES
+        plasmastyle/private/ButtonShadow.qml
+        plasmastyle/private/RoundShadow.qml
+        plasmastyle/private/TextFieldFocus.qml
+        plasmastyle/private/Util.js
+)
 
 install(DIRECTORY kirigamiplasmastyle/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigami.2/styles/Plasma)
 
@@ -30,45 +72,127 @@
 ENDFOREACH(infileName)
 
 #install the components as a QQC2 Style, as style for applications (mainly for Plasma Mobile)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2/Plasma)
-
-#install some of the componets as a separate import, to be used in plasmoids (some of them like ApplicationWindow are of no use for plasmoids)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/BusyIndicator.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Button.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckBox.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckDelegate.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckIndicator.qml
-    #combobox is not in a new window, but maybe better already than the broken qqc1 combobox?
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ComboBox.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Container.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Control.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Dial.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Frame.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/GroupBox.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ItemDelegate.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Label.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ProgressBar.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioButton.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioDelegate.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioIndicator.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RangeSlider.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ScrollBar.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Slider.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SpinBox.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Switch.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SwitchDelegate.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SwitchIndicator.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabBar.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabButton.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextArea.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextField.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolBar.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolButton.qml
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/qmldir
-
-    DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3)
-
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/private DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/mobiletextselection DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components.3)
+ecm_add_qmlmodule(plasmacomponents3style
+    IDENTIFIER QtQuick.Controls.Plasma
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    PATH QtQuick/Controls.2/Plasma
+    VERSION 3.0
+)
+
+ecm_qmlmodule_objecttypes(plasmacomponents3style
+    INITIAL_VERSION 3.0
+    OBJECT_TYPES_BY_FILENAMES
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/BusyIndicator.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Button.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckDelegate.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ComboBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Container.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Control.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Dial.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Drawer.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Frame.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/GroupBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ItemDelegate.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Label.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/MenuItem.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Menu.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Popup.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ProgressBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioButton.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioDelegate.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RangeSlider.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ScrollBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Slider.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SpinBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SwitchDelegate.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Switch.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabButton.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextArea.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextField.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolButton.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolTip.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RoundButton.qml"
+)
+ecm_qmlmodule_privatefiles(plasmacomponents3style
+    RELATIVE_PATH private
+    FILES
+        plasmacomponents3/private/ButtonShadow.qml
+        plasmacomponents3/private/DefaultListItemBackground.qml
+        plasmacomponents3/private/RoundShadow.qml
+        plasmacomponents3/private/TextFieldFocus.qml
+)
+
+ecm_qmlmodule_privatefiles(plasmacomponents3style
+    RELATIVE_PATH mobiletextselection
+    FILES
+        plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml
+        plasmacomponents3/mobiletextselection/MobileCursor.qml
+)
+
+
+
+ecm_add_qmlmodule(plasmacomponents3
+    IDENTIFIER org.kde.plasma.components
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    VERSION_PATH_SUFFIX MAJOR
+    TYPEINFO plugins.qmltypes
+    VERSION 3.0
+)
+
+ecm_qmlmodule_objecttypes(plasmacomponents3
+    INITIAL_VERSION 3.0
+    OBJECT_TYPES_BY_FILENAMES
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/BusyIndicator.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Button.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/CheckDelegate.qml"
+        #combobox is not in a new window, but maybe better already than the broken qqc1 combobox?
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ComboBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Container.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Control.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Dial.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Drawer.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Frame.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/GroupBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ItemDelegate.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Label.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/MenuItem.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Menu.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Popup.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ProgressBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioButton.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RadioDelegate.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RangeSlider.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ScrollBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Slider.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SpinBox.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/SwitchDelegate.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/Switch.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TabButton.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextArea.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/TextField.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolBar.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolButton.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/ToolTip.qml"
+        "${CMAKE_CURRENT_BINARY_DIR}/plasmacomponents3/RoundButton.qml"
+)
 
+ecm_qmlmodule_privatefiles(plasmacomponents3
+    RELATIVE_PATH private
+    FILES
+        plasmacomponents3/private/ButtonShadow.qml
+        plasmacomponents3/private/DefaultListItemBackground.qml
+        plasmacomponents3/private/RoundShadow.qml
+        plasmacomponents3/private/TextFieldFocus.qml
+)
 
+ecm_qmlmodule_privatefiles(plasmacomponents3
+    RELATIVE_PATH mobiletextselection
+    FILES
+        plasmacomponents3/mobiletextselection/MobileTextActionsToolBar.qml
+        plasmacomponents3/mobiletextselection/MobileCursor.qml
+)
diff --git a/src/declarativeimports/calendar/CMakeLists.txt b/src/declarativeimports/calendar/CMakeLists.txt
--- a/src/declarativeimports/calendar/CMakeLists.txt
+++ b/src/declarativeimports/calendar/CMakeLists.txt
@@ -23,7 +23,24 @@
     KF5::CoreAddons
 )
 
-install(TARGETS calendarplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/calendar)
-install(DIRECTORY qml/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/calendar)
+ecm_add_qmlmodule(plasmacalendar
+    IDENTIFIER org.kde.plasma.calendar
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    PLUGIN calendarplugin
+    TYPEINFO plugins.qmltypes
+    VERSION 2.0
+)
+
+ecm_qmlmodule_objecttypes(plasmacalendar
+    INITIAL_VERSION 2.0
+    OBJECT_TYPES_BY_FILENAMES
+        qml/MonthView.qml
+        qml/MonthMenu.qml
+)
 
-ecm_generate_qmltypes(org.kde.plasma.calendar 2.0 DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/calendar)
+ecm_qmlmodule_internalobjecttypes(plasmacalendar
+    OBJECT_TYPES_BY_FILENAMES
+        qml/CalendarToolbar.qml
+        qml/DayDelegate.qml
+        qml/DaysCalendar.qml
+)
diff --git a/src/declarativeimports/calendar/qml/qmldir b/src/declarativeimports/calendar/qml/qmldir
deleted file mode 100644
--- a/src/declarativeimports/calendar/qml/qmldir
+++ /dev/null
@@ -1,8 +0,0 @@
-module org.kde.plasma.calendar
-plugin calendarplugin
-
-MonthView 2.0 MonthView.qml
-MonthMenu 2.0 MonthMenu.qml
-internal CalendarToolbar CalendarToolbar.qml
-internal DayDelegate DayDelegate.qml
-internal DaysCalendar DaysCalendar.qml
diff --git a/src/declarativeimports/core/CMakeLists.txt b/src/declarativeimports/core/CMakeLists.txt
--- a/src/declarativeimports/core/CMakeLists.txt
+++ b/src/declarativeimports/core/CMakeLists.txt
@@ -63,18 +63,25 @@
     target_link_libraries(corebindingsplugin Qt5::Gui_GLESv2)
 endif()
 
-install(TARGETS corebindingsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/core)
-install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/core)
-
-install(FILES private/DefaultToolTip.qml DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/core/private)
+ecm_add_qmlmodule(plasmacore
+    IDENTIFIER org.kde.plasma.core
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    PLUGIN corebindingsplugin
+    TYPEINFO plugins.qmltypes
+    VERSION 2.0
+)
 
-ecm_generate_qmltypes(org.kde.plasma.core 2.0 DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/core)
+ecm_qmlmodule_privatefiles(plasmacore
+    RELATIVE_PATH private
+    FILES
+        private/DefaultToolTip.qml
+)
 
 #also "install" to $BUILD_DIR/bin for unit tests
 add_custom_target(copy ALL DEPENDS corebindingsplugin)
 add_custom_command(TARGET copy POST_BUILD
                     COMMAND ${CMAKE_COMMAND} -E
-                        copy ${CMAKE_CURRENT_SOURCE_DIR}/qmldir ${CMAKE_BINARY_DIR}/bin/org/kde/plasma/core/qmldir)
+                        copy $<TARGET_PROPERTY:plasmacore,ECM_QMLDIR_FILE> ${CMAKE_BINARY_DIR}/bin/org/kde/plasma/core/qmldir)
 add_custom_command(TARGET copy POST_BUILD
                     COMMAND ${CMAKE_COMMAND} -E
                     copy $<TARGET_FILE:corebindingsplugin> ${CMAKE_BINARY_DIR}/bin/org/kde/plasma/core/)
diff --git a/src/declarativeimports/core/qmldir b/src/declarativeimports/core/qmldir
deleted file mode 100644
--- a/src/declarativeimports/core/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module org.kde.plasma.core
-plugin corebindingsplugin
diff --git a/src/declarativeimports/plasmacomponents/CMakeLists.txt b/src/declarativeimports/plasmacomponents/CMakeLists.txt
--- a/src/declarativeimports/plasmacomponents/CMakeLists.txt
+++ b/src/declarativeimports/plasmacomponents/CMakeLists.txt
@@ -23,9 +23,58 @@
         KF5::Service #for kplugininfo.h
 )
 
+ecm_add_qmlmodule(plasmacomponents
+    IDENTIFIER org.kde.plasma.components
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    PLUGIN plasmacomponentsplugin
+    TYPEINFO plugins.qmltypes
+    VERSION 2.0
+)
 
-install(TARGETS plasmacomponentsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components)
+ecm_qmlmodule_objecttypes(plasmacomponents
+    INITIAL_VERSION 2.0
+    OBJECT_TYPES_BY_FILENAMES
+        qml/BusyIndicator.qml
+        qml/Button.qml
+        qml/ButtonColumn.qml
+        qml/ButtonRow.qml
+        qml/CheckBox.qml
+        qml/ComboBox.qml
+        qml/CommonDialog.qml
+        qml/ContextMenu.qml
+        qml/Dialog.qml
+        qml/Highlight.qml
+        qml/Label.qml
+        qml/ListItem.qml
+        qml/ModelContextMenu.qml
+        qml/Page.qml
+        qml/PageStack.qml
+        qml/ProgressBar.qml
+        qml/QueryDialog.qml
+        qml/RadioButton.qml
+        qml/ScrollBar.qml
+        qml/SectionScroller.qml
+        qml/SelectionDialog.qml
+        qml/Slider.qml
+        qml/Sheet.qml
+        qml/Switch.qml
+        qml/TabBar.qml
+        qml/TabButton.qml
+        qml/TabGroup.qml
+        qml/TextArea.qml
+        qml/TextField.qml
+        qml/ToolBar.qml
+        qml/ToolBarLayout.qml
+        qml/ToolButton.qml
+)
 
-install(DIRECTORY qml/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components)
+ecm_qmlmodule_jsresources(plasmacomponents
+    INITIAL_VERSION 2.0
+    JS_RESOURCES_BY_FILENAMES
+        qml/ButtonGroup.js
+)
 
-ecm_generate_qmltypes(org.kde.plasma.components 2.0 DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/components)
+ecm_qmlmodule_privatefiles(plasmacomponents
+    DIRS
+        qml/private
+)
diff --git a/src/declarativeimports/plasmacomponents/qml/qmldir b/src/declarativeimports/plasmacomponents/qml/qmldir
deleted file mode 100644
--- a/src/declarativeimports/plasmacomponents/qml/qmldir
+++ /dev/null
@@ -1,36 +0,0 @@
-module org.kde.plasma.components
-plugin plasmacomponentsplugin
-
-BusyIndicator 2.0 BusyIndicator.qml
-Button 2.0 Button.qml
-ButtonColumn 2.0 ButtonColumn.qml
-ButtonGroup 2.0 ButtonGroup.js
-ButtonRow 2.0 ButtonRow.qml
-CheckBox 2.0 CheckBox.qml
-ComboBox 2.0 ComboBox.qml
-CommonDialog 2.0 CommonDialog.qml
-ContextMenu 2.0 ContextMenu.qml
-Dialog 2.0 Dialog.qml
-Highlight 2.0 Highlight.qml
-Label 2.0 Label.qml
-ListItem 2.0 ListItem.qml
-ModelContextMenu 2.0 ModelContextMenu.qml
-Page 2.0 Page.qml
-PageStack 2.0 PageStack.qml
-ProgressBar 2.0 ProgressBar.qml
-QueryDialog 2.0 QueryDialog.qml
-RadioButton 2.0 RadioButton.qml
-ScrollBar 2.0 ScrollBar.qml
-SectionScroller 2.0 SectionScroller.qml
-SelectionDialog 2.0 SelectionDialog.qml
-Slider 2.0 Slider.qml
-Sheet 2.0 Sheet.qml
-Switch 2.0 Switch.qml
-TabBar 2.0 TabBar.qml
-TabButton 2.0 TabButton.qml
-TabGroup 2.0 TabGroup.qml
-TextArea 2.0 TextArea.qml
-TextField 2.0 TextField.qml
-ToolBar 2.0 ToolBar.qml
-ToolBarLayout 2.0 ToolBarLayout.qml
-ToolButton 2.0 ToolButton.qml
diff --git a/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir b/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir
deleted file mode 100644
--- a/src/declarativeimports/plasmacomponents3/mobiletextselection/qmldir
+++ /dev/null
@@ -1,3 +0,0 @@
- 
-singleton MobileTextActionsToolBar 1.0 MobileTextActionsToolBar.qml
-MobileCursor 1.0 MobileCursor.qml
diff --git a/src/declarativeimports/plasmacomponents3/private/qmldir b/src/declarativeimports/plasmacomponents3/private/qmldir
deleted file mode 100644
--- a/src/declarativeimports/plasmacomponents3/private/qmldir
+++ /dev/null
@@ -1,5 +0,0 @@
- 
-ButtonShadow 1.0 ButtonShadow.qml
-DefaultListItemBackground 1.0 DefaultListItemBackground.qml
-RoundShadow 1.0 RoundShadow.qml
-TextFieldFocus 1.0 TextFieldFocus.qml
diff --git a/src/declarativeimports/plasmacomponents3/qmldir b/src/declarativeimports/plasmacomponents3/qmldir
deleted file mode 100644
--- a/src/declarativeimports/plasmacomponents3/qmldir
+++ /dev/null
@@ -1,35 +0,0 @@
-module org.kde.plasma.components
-
-BusyIndicator 3.0 BusyIndicator.qml
-Button 3.0 Button.qml
-CheckBox 3.0 CheckBox.qml
-CheckDelegate 3.0 CheckDelegate.qml
-ComboBox 3.0 ComboBox.qml
-Container 3.0 Container.qml
-Control 3.0 Control.qml
-Dial 3.0 Dial.qml
-Drawer 3.0 Drawer.qml
-Frame 3.0 Frame.qml
-GroupBox 3.0 GroupBox.qml
-ItemDelegate 3.0 ItemDelegate.qml
-Label 3.0 Label.qml
-MenuItem 3.0 MenuItem.qml
-Menu 3.0 Menu.qml
-Popup 3.0 Popup.qml
-ProgressBar 3.0 ProgressBar.qml
-RadioButton 3.0 RadioButton.qml
-RadioDelegate 3.0 RadioDelegate.qml
-RangeSlider 3.0 RangeSlider.qml
-ScrollBar 3.0 ScrollBar.qml
-Slider 3.0 Slider.qml
-SpinBox 3.0 SpinBox.qml
-SwitchDelegate 3.0 SwitchDelegate.qml
-Switch 3.0 Switch.qml
-TabBar 3.0 TabBar.qml
-TabButton 3.0 TabButton.qml
-TextArea 3.0 TextArea.qml
-TextField 3.0 TextField.qml
-ToolBar 3.0 ToolBar.qml
-ToolButton 3.0 ToolButton.qml
-ToolTip 3.0 ToolTip.qml
-RoundButton 3.0 RoundButton.qml
diff --git a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt
--- a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt
+++ b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt
@@ -20,12 +20,36 @@
         KF5::Service
         KF5::Plasma)
 
+ecm_add_qmlmodule(plasmaextracomponents
+    IDENTIFIER org.kde.plasma.extras
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    PLUGIN plasmaextracomponentsplugin
+    TYPEINFO plugins.qmltypes
+    VERSION 2.0
+)
 
-install(TARGETS plasmaextracomponentsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/extras)
-
-install(DIRECTORY qml/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/extras)
-
-ecm_generate_qmltypes(org.kde.plasma.extras 2.0 DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/extras)
+ecm_qmlmodule_objecttypes(plasmaextracomponents
+    INITIAL_VERSION 2.0
+    OBJECT_TYPES_BY_FILENAMES
+        qml/App.qml
+        qml/ConditionalLoader.qml
+        qml/Heading.qml
+        qml/Paragraph.qml
+        qml/PageRow.qml
+        qml/ScrollArea.qml
+        qml/Title.qml
+        qml/DescriptiveLabel.qml
+)
+ecm_qmlmodule_objecttypes(plasmaextracomponents
+    INITIAL_VERSION 2.0
+    RELATIVE_PATH animations
+    OBJECT_TYPES_BY_FILENAMES
+        qml/animations/ActivateAnimation.qml
+        qml/animations/AppearAnimation.qml
+        qml/animations/DisappearAnimation.qml
+        qml/animations/PressedAnimation.qml
+        qml/animations/ReleasedAnimation.qml
+)
 
 
 # The platform specific stuff, overwrites a copy of the desktop one
diff --git a/src/declarativeimports/plasmaextracomponents/qml/qmldir b/src/declarativeimports/plasmaextracomponents/qml/qmldir
deleted file mode 100644
--- a/src/declarativeimports/plasmaextracomponents/qml/qmldir
+++ /dev/null
@@ -1,17 +0,0 @@
-module org.kde.plasma.extras
-plugin plasmaextracomponentsplugin
-
-App 2.0 App.qml
-ConditionalLoader 2.0 ConditionalLoader.qml
-Heading 2.0 Heading.qml
-Paragraph 2.0 Paragraph.qml
-PageRow 2.0 PageRow.qml
-ScrollArea 2.0 ScrollArea.qml
-Title 2.0 Title.qml
-DescriptiveLabel 2.0 DescriptiveLabel.qml
-
-ActivateAnimation 2.0 animations/ActivateAnimation.qml
-AppearAnimation 2.0 animations/AppearAnimation.qml
-DisappearAnimation 2.0 animations/DisappearAnimation.qml
-PressedAnimation 2.0 animations/PressedAnimation.qml
-ReleasedAnimation 2.0 animations/ReleasedAnimation.qml
diff --git a/src/declarativeimports/plasmastyle/qmldir b/src/declarativeimports/plasmastyle/qmldir
deleted file mode 100644
--- a/src/declarativeimports/plasmastyle/qmldir
+++ /dev/null
@@ -1,25 +0,0 @@
-module QtQuick.Controls.Styles.Plasma
-ApplicationWindowStyle 1.3 ApplicationWindowStyle.qml
-BusyIndicatorStyle 2.0 BusyIndicatorStyle.qml
-ButtonStyle 2.0 ButtonStyle.qml
-CalendarStyle 2.0 CalendarStyle.qml
-CheckBoxStyle 2.0 CheckBoxStyle.qml
-ComboBoxStyle 2.0 ComboBoxStyle.qml
-MenuBarStyle 2.0 MenuBarStyle.qml
-MenuStyle 2.0 MenuStyle.qml
-ProgressBarStyle 2.0 ProgressBarStyle.qml
-RadioButtonStyle 2.0 RadioButtonStyle.qml
-ScrollViewStyle 2.0 ScrollViewStyle.qml
-SliderStyle 2.0 SliderStyle.qml
-SpinBoxStyle 2.0 SpinBoxStyle.qml
-StatusBarStyle 2.0 StatusBarStyle.qml
-SwitchStyle 2.0 SwitchStyle.qml
-TabViewStyle 2.0 TabViewStyle.qml
-TableViewStyle 2.0 TableViewStyle.qml
-TextAreaStyle 2.0 TextAreaStyle.qml
-TextFieldStyle 2.0 TextFieldStyle.qml
-ToolBarStyle 2.0 ToolBarStyle.qml
-ToolButtonStyle 2.0 ToolButtonStyle.qml
-GroupBoxStyle 2.0 GroupBoxStyle.qml
-FocusFrameStyle 2.0 FocusFrameStyle.qml
-
diff --git a/src/declarativeimports/platformcomponents/CMakeLists.txt b/src/declarativeimports/platformcomponents/CMakeLists.txt
--- a/src/declarativeimports/platformcomponents/CMakeLists.txt
+++ b/src/declarativeimports/platformcomponents/CMakeLists.txt
@@ -18,7 +18,10 @@
     KF5::IconThemes
 )
 
-install(TARGETS platformcomponentsplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/platformcomponents)
-install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/platformcomponents)
-
-ecm_generate_qmltypes(org.kde.plasma.platformcomponents 2.0 DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/platformcomponents)
+ecm_add_qmlmodule(platformcomponents
+    IDENTIFIER org.kde.plasma.platformcomponents
+    DESTINATION ${KDE_INSTALL_QMLDIR}
+    PLUGIN platformcomponentsplugin
+    TYPEINFO plugins.qmltypes
+    VERSION 2.0
+)
diff --git a/src/declarativeimports/platformcomponents/qmldir b/src/declarativeimports/platformcomponents/qmldir
deleted file mode 100644
--- a/src/declarativeimports/platformcomponents/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module org.kde.plasma.platformcomponents
-plugin platformcomponentsplugin