diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index b36a39c6..19368ad8 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -9,7 +9,17 @@ MACRO(installPackage dir component) install(FILES ${dir}/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-${component}.desktop) ENDMACRO(installPackage) -add_subdirectory(desktop) -add_subdirectory(screensaver) -add_subdirectory(generic) +add_subdirectory(applets) +add_subdirectory(containmentactions) +add_subdirectory(containments) +add_subdirectory(dataengines) +add_subdirectory(declarativeimports) +add_subdirectory(desktoptheme) +add_subdirectory(runners) +add_subdirectory(scriptengines) +add_subdirectory(shells) +add_subdirectory(wallpapers) +add_subdirectory(kpart) +add_subdirectory(tools) +add_subdirectory(toolboxes) diff --git a/plasma/generic/applets/CMakeLists.txt b/plasma/applets/CMakeLists.txt similarity index 66% rename from plasma/generic/applets/CMakeLists.txt rename to plasma/applets/CMakeLists.txt index 8b717120..c2ed4b5c 100644 --- a/plasma/generic/applets/CMakeLists.txt +++ b/plasma/applets/CMakeLists.txt @@ -18,3 +18,15 @@ add_subdirectory(system-monitor) #should compile also on windows? (even if doesn't really make sense) add_subdirectory(notifications) add_subdirectory(systemtray) + +add_subdirectory(kickoff) +add_subdirectory(trash) +if(LIBKONQ_FOUND) + add_subdirectory(homerun) + add_subdirectory(folderview) +endif() + +#task and windowlist depend on libs/taskmanager +add_subdirectory(tasks) +add_subdirectory(windowlist) +add_subdirectory(pager) diff --git a/plasma/generic/applets/analog-clock/CMakeLists.txt b/plasma/applets/analog-clock/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/analog-clock/CMakeLists.txt rename to plasma/applets/analog-clock/CMakeLists.txt diff --git a/plasma/generic/applets/analog-clock/Messages.sh b/plasma/applets/analog-clock/Messages.sh similarity index 100% rename from plasma/generic/applets/analog-clock/Messages.sh rename to plasma/applets/analog-clock/Messages.sh diff --git a/plasma/generic/applets/analog-clock/clock.cpp b/plasma/applets/analog-clock/clock.cpp similarity index 100% rename from plasma/generic/applets/analog-clock/clock.cpp rename to plasma/applets/analog-clock/clock.cpp diff --git a/plasma/generic/applets/analog-clock/clock.h b/plasma/applets/analog-clock/clock.h similarity index 100% rename from plasma/generic/applets/analog-clock/clock.h rename to plasma/applets/analog-clock/clock.h diff --git a/plasma/generic/applets/analog-clock/clockConfig.ui b/plasma/applets/analog-clock/clockConfig.ui similarity index 100% rename from plasma/generic/applets/analog-clock/clockConfig.ui rename to plasma/applets/analog-clock/clockConfig.ui diff --git a/plasma/generic/applets/analog-clock/plasma-applet-analogclock.desktop b/plasma/applets/analog-clock/plasma-applet-analogclock.desktop similarity index 100% rename from plasma/generic/applets/analog-clock/plasma-applet-analogclock.desktop rename to plasma/applets/analog-clock/plasma-applet-analogclock.desktop diff --git a/plasma/generic/applets/batterymonitor/CMakeLists.txt b/plasma/applets/batterymonitor/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/batterymonitor/CMakeLists.txt rename to plasma/applets/batterymonitor/CMakeLists.txt diff --git a/plasma/generic/applets/batterymonitor/Messages.sh b/plasma/applets/batterymonitor/Messages.sh similarity index 100% rename from plasma/generic/applets/batterymonitor/Messages.sh rename to plasma/applets/batterymonitor/Messages.sh diff --git a/plasma/generic/applets/batterymonitor/README.txt b/plasma/applets/batterymonitor/README.txt similarity index 100% rename from plasma/generic/applets/batterymonitor/README.txt rename to plasma/applets/batterymonitor/README.txt diff --git a/plasma/generic/applets/batterymonitor/battery-oxygen-inkscape.svgz b/plasma/applets/batterymonitor/battery-oxygen-inkscape.svgz similarity index 100% rename from plasma/generic/applets/batterymonitor/battery-oxygen-inkscape.svgz rename to plasma/applets/batterymonitor/battery-oxygen-inkscape.svgz diff --git a/plasma/generic/applets/batterymonitor/battery-oxygen.svgz b/plasma/applets/batterymonitor/battery-oxygen.svgz similarity index 100% rename from plasma/generic/applets/batterymonitor/battery-oxygen.svgz rename to plasma/applets/batterymonitor/battery-oxygen.svgz diff --git a/plasma/generic/applets/batterymonitor/contents/code/logic.js b/plasma/applets/batterymonitor/contents/code/logic.js similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/code/logic.js rename to plasma/applets/batterymonitor/contents/code/logic.js diff --git a/plasma/generic/applets/batterymonitor/contents/config/main.xml b/plasma/applets/batterymonitor/contents/config/main.xml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/config/main.xml rename to plasma/applets/batterymonitor/contents/config/main.xml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/BatteryIcon.qml b/plasma/applets/batterymonitor/contents/ui/BatteryIcon.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/BatteryIcon.qml rename to plasma/applets/batterymonitor/contents/ui/BatteryIcon.qml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/BatteryItem.qml b/plasma/applets/batterymonitor/contents/ui/BatteryItem.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/BatteryItem.qml rename to plasma/applets/batterymonitor/contents/ui/BatteryItem.qml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/BrightnessItem.qml b/plasma/applets/batterymonitor/contents/ui/BrightnessItem.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/BrightnessItem.qml rename to plasma/applets/batterymonitor/contents/ui/BrightnessItem.qml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/CompactRepresentation.qml b/plasma/applets/batterymonitor/contents/ui/CompactRepresentation.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/CompactRepresentation.qml rename to plasma/applets/batterymonitor/contents/ui/CompactRepresentation.qml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml b/plasma/applets/batterymonitor/contents/ui/PopupDialog.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/PopupDialog.qml rename to plasma/applets/batterymonitor/contents/ui/PopupDialog.qml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/PowerManagementItem.qml b/plasma/applets/batterymonitor/contents/ui/PowerManagementItem.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/PowerManagementItem.qml rename to plasma/applets/batterymonitor/contents/ui/PowerManagementItem.qml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/ScrollableListView.qml b/plasma/applets/batterymonitor/contents/ui/ScrollableListView.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/ScrollableListView.qml rename to plasma/applets/batterymonitor/contents/ui/ScrollableListView.qml diff --git a/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml b/plasma/applets/batterymonitor/contents/ui/batterymonitor.qml similarity index 100% rename from plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml rename to plasma/applets/batterymonitor/contents/ui/batterymonitor.qml diff --git a/plasma/generic/applets/batterymonitor/metadata.desktop b/plasma/applets/batterymonitor/metadata.desktop similarity index 100% rename from plasma/generic/applets/batterymonitor/metadata.desktop rename to plasma/applets/batterymonitor/metadata.desktop diff --git a/plasma/generic/applets/calendar/CMakeLists.txt b/plasma/applets/calendar/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/calendar/CMakeLists.txt rename to plasma/applets/calendar/CMakeLists.txt diff --git a/plasma/generic/applets/calendar/calendar.cpp b/plasma/applets/calendar/calendar.cpp similarity index 100% rename from plasma/generic/applets/calendar/calendar.cpp rename to plasma/applets/calendar/calendar.cpp diff --git a/plasma/generic/applets/calendar/calendar.h b/plasma/applets/calendar/calendar.h similarity index 100% rename from plasma/generic/applets/calendar/calendar.h rename to plasma/applets/calendar/calendar.h diff --git a/plasma/generic/applets/calendar/mini-calendar.svgz b/plasma/applets/calendar/mini-calendar.svgz similarity index 100% rename from plasma/generic/applets/calendar/mini-calendar.svgz rename to plasma/applets/calendar/mini-calendar.svgz diff --git a/plasma/generic/applets/calendar/plasma-applet-calendar.desktop b/plasma/applets/calendar/plasma-applet-calendar.desktop similarity index 100% rename from plasma/generic/applets/calendar/plasma-applet-calendar.desktop rename to plasma/applets/calendar/plasma-applet-calendar.desktop diff --git a/plasma/generic/applets/devicenotifier/CMakeLists.txt b/plasma/applets/devicenotifier/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/devicenotifier/CMakeLists.txt rename to plasma/applets/devicenotifier/CMakeLists.txt diff --git a/plasma/generic/applets/devicenotifier/Messages.sh b/plasma/applets/devicenotifier/Messages.sh similarity index 100% rename from plasma/generic/applets/devicenotifier/Messages.sh rename to plasma/applets/devicenotifier/Messages.sh diff --git a/plasma/generic/applets/devicenotifier/package/contents/config/main.xml b/plasma/applets/devicenotifier/package/contents/config/main.xml similarity index 100% rename from plasma/generic/applets/devicenotifier/package/contents/config/main.xml rename to plasma/applets/devicenotifier/package/contents/config/main.xml diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/ActionItem.qml b/plasma/applets/devicenotifier/package/contents/ui/ActionItem.qml similarity index 100% rename from plasma/generic/applets/devicenotifier/package/contents/ui/ActionItem.qml rename to plasma/applets/devicenotifier/package/contents/ui/ActionItem.qml diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml b/plasma/applets/devicenotifier/package/contents/ui/DeviceItem.qml similarity index 100% rename from plasma/generic/applets/devicenotifier/package/contents/ui/DeviceItem.qml rename to plasma/applets/devicenotifier/package/contents/ui/DeviceItem.qml diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/StatusBar.qml b/plasma/applets/devicenotifier/package/contents/ui/StatusBar.qml similarity index 100% rename from plasma/generic/applets/devicenotifier/package/contents/ui/StatusBar.qml rename to plasma/applets/devicenotifier/package/contents/ui/StatusBar.qml diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/config.ui b/plasma/applets/devicenotifier/package/contents/ui/config.ui similarity index 100% rename from plasma/generic/applets/devicenotifier/package/contents/ui/config.ui rename to plasma/applets/devicenotifier/package/contents/ui/config.ui diff --git a/plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml b/plasma/applets/devicenotifier/package/contents/ui/devicenotifier.qml similarity index 100% rename from plasma/generic/applets/devicenotifier/package/contents/ui/devicenotifier.qml rename to plasma/applets/devicenotifier/package/contents/ui/devicenotifier.qml diff --git a/plasma/generic/applets/devicenotifier/package/metadata.desktop b/plasma/applets/devicenotifier/package/metadata.desktop similarity index 100% rename from plasma/generic/applets/devicenotifier/package/metadata.desktop rename to plasma/applets/devicenotifier/package/metadata.desktop diff --git a/plasma/generic/applets/devicenotifier/test-predicate-openinwindow.desktop b/plasma/applets/devicenotifier/test-predicate-openinwindow.desktop similarity index 100% rename from plasma/generic/applets/devicenotifier/test-predicate-openinwindow.desktop rename to plasma/applets/devicenotifier/test-predicate-openinwindow.desktop diff --git a/plasma/generic/applets/digital-clock/CMakeLists.txt b/plasma/applets/digital-clock/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/digital-clock/CMakeLists.txt rename to plasma/applets/digital-clock/CMakeLists.txt diff --git a/plasma/generic/applets/digital-clock/Messages.sh b/plasma/applets/digital-clock/Messages.sh similarity index 100% rename from plasma/generic/applets/digital-clock/Messages.sh rename to plasma/applets/digital-clock/Messages.sh diff --git a/plasma/generic/applets/digital-clock/clock.cpp b/plasma/applets/digital-clock/clock.cpp similarity index 100% rename from plasma/generic/applets/digital-clock/clock.cpp rename to plasma/applets/digital-clock/clock.cpp diff --git a/plasma/generic/applets/digital-clock/clock.h b/plasma/applets/digital-clock/clock.h similarity index 100% rename from plasma/generic/applets/digital-clock/clock.h rename to plasma/applets/digital-clock/clock.h diff --git a/plasma/generic/applets/digital-clock/clockConfig.ui b/plasma/applets/digital-clock/clockConfig.ui similarity index 100% rename from plasma/generic/applets/digital-clock/clockConfig.ui rename to plasma/applets/digital-clock/clockConfig.ui diff --git a/plasma/generic/applets/digital-clock/plasma-applet-digitalclock.desktop b/plasma/applets/digital-clock/plasma-applet-digitalclock.desktop similarity index 100% rename from plasma/generic/applets/digital-clock/plasma-applet-digitalclock.desktop rename to plasma/applets/digital-clock/plasma-applet-digitalclock.desktop diff --git a/plasma/desktop/applets/folderview/CMakeLists.txt b/plasma/applets/folderview/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/folderview/CMakeLists.txt rename to plasma/applets/folderview/CMakeLists.txt diff --git a/plasma/desktop/applets/folderview/ConfigureChecks.cmake b/plasma/applets/folderview/ConfigureChecks.cmake similarity index 100% rename from plasma/desktop/applets/folderview/ConfigureChecks.cmake rename to plasma/applets/folderview/ConfigureChecks.cmake diff --git a/plasma/desktop/applets/folderview/Messages.sh b/plasma/applets/folderview/Messages.sh similarity index 100% rename from plasma/desktop/applets/folderview/Messages.sh rename to plasma/applets/folderview/Messages.sh diff --git a/plasma/desktop/applets/folderview/abstractitemview.cpp b/plasma/applets/folderview/abstractitemview.cpp similarity index 100% rename from plasma/desktop/applets/folderview/abstractitemview.cpp rename to plasma/applets/folderview/abstractitemview.cpp diff --git a/plasma/desktop/applets/folderview/abstractitemview.h b/plasma/applets/folderview/abstractitemview.h similarity index 100% rename from plasma/desktop/applets/folderview/abstractitemview.h rename to plasma/applets/folderview/abstractitemview.h diff --git a/plasma/desktop/applets/folderview/actionoverlay.cpp b/plasma/applets/folderview/actionoverlay.cpp similarity index 100% rename from plasma/desktop/applets/folderview/actionoverlay.cpp rename to plasma/applets/folderview/actionoverlay.cpp diff --git a/plasma/desktop/applets/folderview/actionoverlay.h b/plasma/applets/folderview/actionoverlay.h similarity index 100% rename from plasma/desktop/applets/folderview/actionoverlay.h rename to plasma/applets/folderview/actionoverlay.h diff --git a/plasma/desktop/applets/folderview/animator.cpp b/plasma/applets/folderview/animator.cpp similarity index 100% rename from plasma/desktop/applets/folderview/animator.cpp rename to plasma/applets/folderview/animator.cpp diff --git a/plasma/desktop/applets/folderview/animator.h b/plasma/applets/folderview/animator.h similarity index 100% rename from plasma/desktop/applets/folderview/animator.h rename to plasma/applets/folderview/animator.h diff --git a/plasma/desktop/applets/folderview/asyncfiletester.cpp b/plasma/applets/folderview/asyncfiletester.cpp similarity index 100% rename from plasma/desktop/applets/folderview/asyncfiletester.cpp rename to plasma/applets/folderview/asyncfiletester.cpp diff --git a/plasma/desktop/applets/folderview/asyncfiletester.h b/plasma/applets/folderview/asyncfiletester.h similarity index 100% rename from plasma/desktop/applets/folderview/asyncfiletester.h rename to plasma/applets/folderview/asyncfiletester.h diff --git a/plasma/desktop/applets/folderview/dialog.cpp b/plasma/applets/folderview/dialog.cpp similarity index 100% rename from plasma/desktop/applets/folderview/dialog.cpp rename to plasma/applets/folderview/dialog.cpp diff --git a/plasma/desktop/applets/folderview/dialog.h b/plasma/applets/folderview/dialog.h similarity index 100% rename from plasma/desktop/applets/folderview/dialog.h rename to plasma/applets/folderview/dialog.h diff --git a/plasma/desktop/applets/folderview/dialogshadows.cpp b/plasma/applets/folderview/dialogshadows.cpp similarity index 100% rename from plasma/desktop/applets/folderview/dialogshadows.cpp rename to plasma/applets/folderview/dialogshadows.cpp diff --git a/plasma/desktop/applets/folderview/dialogshadows_p.h b/plasma/applets/folderview/dialogshadows_p.h similarity index 100% rename from plasma/desktop/applets/folderview/dialogshadows_p.h rename to plasma/applets/folderview/dialogshadows_p.h diff --git a/plasma/desktop/applets/folderview/dirlister.cpp b/plasma/applets/folderview/dirlister.cpp similarity index 100% rename from plasma/desktop/applets/folderview/dirlister.cpp rename to plasma/applets/folderview/dirlister.cpp diff --git a/plasma/desktop/applets/folderview/dirlister.h b/plasma/applets/folderview/dirlister.h similarity index 100% rename from plasma/desktop/applets/folderview/dirlister.h rename to plasma/applets/folderview/dirlister.h diff --git a/plasma/desktop/applets/folderview/folderview.cpp b/plasma/applets/folderview/folderview.cpp similarity index 100% rename from plasma/desktop/applets/folderview/folderview.cpp rename to plasma/applets/folderview/folderview.cpp diff --git a/plasma/desktop/applets/folderview/folderview.h b/plasma/applets/folderview/folderview.h similarity index 100% rename from plasma/desktop/applets/folderview/folderview.h rename to plasma/applets/folderview/folderview.h diff --git a/plasma/desktop/applets/folderview/folderviewDisplayConfig.ui b/plasma/applets/folderview/folderviewDisplayConfig.ui similarity index 100% rename from plasma/desktop/applets/folderview/folderviewDisplayConfig.ui rename to plasma/applets/folderview/folderviewDisplayConfig.ui diff --git a/plasma/desktop/applets/folderview/folderviewFilterConfig.ui b/plasma/applets/folderview/folderviewFilterConfig.ui similarity index 100% rename from plasma/desktop/applets/folderview/folderviewFilterConfig.ui rename to plasma/applets/folderview/folderviewFilterConfig.ui diff --git a/plasma/desktop/applets/folderview/folderviewLocationConfig.ui b/plasma/applets/folderview/folderviewLocationConfig.ui similarity index 100% rename from plasma/desktop/applets/folderview/folderviewLocationConfig.ui rename to plasma/applets/folderview/folderviewLocationConfig.ui diff --git a/plasma/desktop/applets/folderview/folderviewPreviewConfig.ui b/plasma/applets/folderview/folderviewPreviewConfig.ui similarity index 100% rename from plasma/desktop/applets/folderview/folderviewPreviewConfig.ui rename to plasma/applets/folderview/folderviewPreviewConfig.ui diff --git a/plasma/desktop/applets/folderview/folderviewadapter.cpp b/plasma/applets/folderview/folderviewadapter.cpp similarity index 100% rename from plasma/desktop/applets/folderview/folderviewadapter.cpp rename to plasma/applets/folderview/folderviewadapter.cpp diff --git a/plasma/desktop/applets/folderview/folderviewadapter.h b/plasma/applets/folderview/folderviewadapter.h similarity index 100% rename from plasma/desktop/applets/folderview/folderviewadapter.h rename to plasma/applets/folderview/folderviewadapter.h diff --git a/plasma/desktop/applets/folderview/iconview.cpp b/plasma/applets/folderview/iconview.cpp similarity index 100% rename from plasma/desktop/applets/folderview/iconview.cpp rename to plasma/applets/folderview/iconview.cpp diff --git a/plasma/desktop/applets/folderview/iconview.h b/plasma/applets/folderview/iconview.h similarity index 100% rename from plasma/desktop/applets/folderview/iconview.h rename to plasma/applets/folderview/iconview.h diff --git a/plasma/desktop/applets/folderview/iconwidget.cpp b/plasma/applets/folderview/iconwidget.cpp similarity index 100% rename from plasma/desktop/applets/folderview/iconwidget.cpp rename to plasma/applets/folderview/iconwidget.cpp diff --git a/plasma/desktop/applets/folderview/iconwidget.h b/plasma/applets/folderview/iconwidget.h similarity index 100% rename from plasma/desktop/applets/folderview/iconwidget.h rename to plasma/applets/folderview/iconwidget.h diff --git a/plasma/desktop/applets/folderview/itemeditor.cpp b/plasma/applets/folderview/itemeditor.cpp similarity index 100% rename from plasma/desktop/applets/folderview/itemeditor.cpp rename to plasma/applets/folderview/itemeditor.cpp diff --git a/plasma/desktop/applets/folderview/itemeditor.h b/plasma/applets/folderview/itemeditor.h similarity index 100% rename from plasma/desktop/applets/folderview/itemeditor.h rename to plasma/applets/folderview/itemeditor.h diff --git a/plasma/desktop/applets/folderview/kabstractviewadapter_p.h b/plasma/applets/folderview/kabstractviewadapter_p.h similarity index 100% rename from plasma/desktop/applets/folderview/kabstractviewadapter_p.h rename to plasma/applets/folderview/kabstractviewadapter_p.h diff --git a/plasma/desktop/applets/folderview/label.cpp b/plasma/applets/folderview/label.cpp similarity index 100% rename from plasma/desktop/applets/folderview/label.cpp rename to plasma/applets/folderview/label.cpp diff --git a/plasma/desktop/applets/folderview/label.h b/plasma/applets/folderview/label.h similarity index 100% rename from plasma/desktop/applets/folderview/label.h rename to plasma/applets/folderview/label.h diff --git a/plasma/desktop/applets/folderview/listview.cpp b/plasma/applets/folderview/listview.cpp similarity index 100% rename from plasma/desktop/applets/folderview/listview.cpp rename to plasma/applets/folderview/listview.cpp diff --git a/plasma/desktop/applets/folderview/listview.h b/plasma/applets/folderview/listview.h similarity index 100% rename from plasma/desktop/applets/folderview/listview.h rename to plasma/applets/folderview/listview.h diff --git a/plasma/desktop/applets/folderview/plasma-applet-folderview.desktop b/plasma/applets/folderview/plasma-applet-folderview.desktop similarity index 100% rename from plasma/desktop/applets/folderview/plasma-applet-folderview.desktop rename to plasma/applets/folderview/plasma-applet-folderview.desktop diff --git a/plasma/desktop/applets/folderview/popupview.cpp b/plasma/applets/folderview/popupview.cpp similarity index 100% rename from plasma/desktop/applets/folderview/popupview.cpp rename to plasma/applets/folderview/popupview.cpp diff --git a/plasma/desktop/applets/folderview/popupview.h b/plasma/applets/folderview/popupview.h similarity index 100% rename from plasma/desktop/applets/folderview/popupview.h rename to plasma/applets/folderview/popupview.h diff --git a/plasma/desktop/applets/folderview/previewpluginsmodel.cpp b/plasma/applets/folderview/previewpluginsmodel.cpp similarity index 100% rename from plasma/desktop/applets/folderview/previewpluginsmodel.cpp rename to plasma/applets/folderview/previewpluginsmodel.cpp diff --git a/plasma/desktop/applets/folderview/previewpluginsmodel.h b/plasma/applets/folderview/previewpluginsmodel.h similarity index 100% rename from plasma/desktop/applets/folderview/previewpluginsmodel.h rename to plasma/applets/folderview/previewpluginsmodel.h diff --git a/plasma/desktop/applets/folderview/proxymodel.cpp b/plasma/applets/folderview/proxymodel.cpp similarity index 100% rename from plasma/desktop/applets/folderview/proxymodel.cpp rename to plasma/applets/folderview/proxymodel.cpp diff --git a/plasma/desktop/applets/folderview/proxymodel.h b/plasma/applets/folderview/proxymodel.h similarity index 100% rename from plasma/desktop/applets/folderview/proxymodel.h rename to plasma/applets/folderview/proxymodel.h diff --git a/plasma/desktop/applets/folderview/style.cpp b/plasma/applets/folderview/style.cpp similarity index 100% rename from plasma/desktop/applets/folderview/style.cpp rename to plasma/applets/folderview/style.cpp diff --git a/plasma/desktop/applets/folderview/style.h b/plasma/applets/folderview/style.h similarity index 100% rename from plasma/desktop/applets/folderview/style.h rename to plasma/applets/folderview/style.h diff --git a/plasma/desktop/applets/folderview/tooltipwidget.cpp b/plasma/applets/folderview/tooltipwidget.cpp similarity index 100% rename from plasma/desktop/applets/folderview/tooltipwidget.cpp rename to plasma/applets/folderview/tooltipwidget.cpp diff --git a/plasma/desktop/applets/folderview/tooltipwidget.h b/plasma/applets/folderview/tooltipwidget.h similarity index 100% rename from plasma/desktop/applets/folderview/tooltipwidget.h rename to plasma/applets/folderview/tooltipwidget.h diff --git a/plasma/desktop/applets/homerun/CMakeLists.txt b/plasma/applets/homerun/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/CMakeLists.txt rename to plasma/applets/homerun/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/COPYING b/plasma/applets/homerun/COPYING similarity index 100% rename from plasma/desktop/applets/homerun/COPYING rename to plasma/applets/homerun/COPYING diff --git a/plasma/desktop/applets/homerun/LICENSE.BSD b/plasma/applets/homerun/LICENSE.BSD similarity index 100% rename from plasma/desktop/applets/homerun/LICENSE.BSD rename to plasma/applets/homerun/LICENSE.BSD diff --git a/plasma/desktop/applets/homerun/LICENSE.GPL-2 b/plasma/applets/homerun/LICENSE.GPL-2 similarity index 100% rename from plasma/desktop/applets/homerun/LICENSE.GPL-2 rename to plasma/applets/homerun/LICENSE.GPL-2 diff --git a/plasma/desktop/applets/homerun/LICENSE.LGPL-2.1 b/plasma/applets/homerun/LICENSE.LGPL-2.1 similarity index 100% rename from plasma/desktop/applets/homerun/LICENSE.LGPL-2.1 rename to plasma/applets/homerun/LICENSE.LGPL-2.1 diff --git a/plasma/desktop/applets/homerun/Messages.sh b/plasma/applets/homerun/Messages.sh similarity index 100% rename from plasma/desktop/applets/homerun/Messages.sh rename to plasma/applets/homerun/Messages.sh diff --git a/plasma/desktop/applets/homerun/README.md b/plasma/applets/homerun/README.md similarity index 100% rename from plasma/desktop/applets/homerun/README.md rename to plasma/applets/homerun/README.md diff --git a/plasma/desktop/applets/homerun/components/CMakeLists.txt b/plasma/applets/homerun/components/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/components/CMakeLists.txt rename to plasma/applets/homerun/components/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/components/abstractsourceregistry.cpp b/plasma/applets/homerun/components/abstractsourceregistry.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/abstractsourceregistry.cpp rename to plasma/applets/homerun/components/abstractsourceregistry.cpp diff --git a/plasma/desktop/applets/homerun/components/abstractsourceregistry.h b/plasma/applets/homerun/components/abstractsourceregistry.h similarity index 100% rename from plasma/desktop/applets/homerun/components/abstractsourceregistry.h rename to plasma/applets/homerun/components/abstractsourceregistry.h diff --git a/plasma/desktop/applets/homerun/components/action.cpp b/plasma/applets/homerun/components/action.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/action.cpp rename to plasma/applets/homerun/components/action.cpp diff --git a/plasma/desktop/applets/homerun/components/action.h b/plasma/applets/homerun/components/action.h similarity index 100% rename from plasma/desktop/applets/homerun/components/action.h rename to plasma/applets/homerun/components/action.h diff --git a/plasma/desktop/applets/homerun/components/actionmanager.cpp b/plasma/applets/homerun/components/actionmanager.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/actionmanager.cpp rename to plasma/applets/homerun/components/actionmanager.cpp diff --git a/plasma/desktop/applets/homerun/components/actionmanager.h b/plasma/applets/homerun/components/actionmanager.h similarity index 100% rename from plasma/desktop/applets/homerun/components/actionmanager.h rename to plasma/applets/homerun/components/actionmanager.h diff --git a/plasma/desktop/applets/homerun/components/componentsplugin.cpp b/plasma/applets/homerun/components/componentsplugin.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/componentsplugin.cpp rename to plasma/applets/homerun/components/componentsplugin.cpp diff --git a/plasma/desktop/applets/homerun/components/componentsplugin.h b/plasma/applets/homerun/components/componentsplugin.h similarity index 100% rename from plasma/desktop/applets/homerun/components/componentsplugin.h rename to plasma/applets/homerun/components/componentsplugin.h diff --git a/plasma/desktop/applets/homerun/components/customtypes.h b/plasma/applets/homerun/components/customtypes.h similarity index 100% rename from plasma/desktop/applets/homerun/components/customtypes.h rename to plasma/applets/homerun/components/customtypes.h diff --git a/plasma/desktop/applets/homerun/components/globalsettings.cpp b/plasma/applets/homerun/components/globalsettings.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/globalsettings.cpp rename to plasma/applets/homerun/components/globalsettings.cpp diff --git a/plasma/desktop/applets/homerun/components/globalsettings.h b/plasma/applets/homerun/components/globalsettings.h similarity index 100% rename from plasma/desktop/applets/homerun/components/globalsettings.h rename to plasma/applets/homerun/components/globalsettings.h diff --git a/plasma/desktop/applets/homerun/components/helpmenuactions.cpp b/plasma/applets/homerun/components/helpmenuactions.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/helpmenuactions.cpp rename to plasma/applets/homerun/components/helpmenuactions.cpp diff --git a/plasma/desktop/applets/homerun/components/helpmenuactions.h b/plasma/applets/homerun/components/helpmenuactions.h similarity index 100% rename from plasma/desktop/applets/homerun/components/helpmenuactions.h rename to plasma/applets/homerun/components/helpmenuactions.h diff --git a/plasma/desktop/applets/homerun/components/icondialog.cpp b/plasma/applets/homerun/components/icondialog.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/icondialog.cpp rename to plasma/applets/homerun/components/icondialog.cpp diff --git a/plasma/desktop/applets/homerun/components/icondialog.h b/plasma/applets/homerun/components/icondialog.h similarity index 100% rename from plasma/desktop/applets/homerun/components/icondialog.h rename to plasma/applets/homerun/components/icondialog.h diff --git a/plasma/desktop/applets/homerun/components/image.cpp b/plasma/applets/homerun/components/image.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/image.cpp rename to plasma/applets/homerun/components/image.cpp diff --git a/plasma/desktop/applets/homerun/components/image.h b/plasma/applets/homerun/components/image.h similarity index 100% rename from plasma/desktop/applets/homerun/components/image.h rename to plasma/applets/homerun/components/image.h diff --git a/plasma/desktop/applets/homerun/components/messagebox.cpp b/plasma/applets/homerun/components/messagebox.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/messagebox.cpp rename to plasma/applets/homerun/components/messagebox.cpp diff --git a/plasma/desktop/applets/homerun/components/messagebox.h b/plasma/applets/homerun/components/messagebox.h similarity index 100% rename from plasma/desktop/applets/homerun/components/messagebox.h rename to plasma/applets/homerun/components/messagebox.h diff --git a/plasma/desktop/applets/homerun/components/qml/ActionMenu.qml b/plasma/applets/homerun/components/qml/ActionMenu.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/ActionMenu.qml rename to plasma/applets/homerun/components/qml/ActionMenu.qml diff --git a/plasma/desktop/applets/homerun/components/qml/DragArea.qml b/plasma/applets/homerun/components/qml/DragArea.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/DragArea.qml rename to plasma/applets/homerun/components/qml/DragArea.qml diff --git a/plasma/desktop/applets/homerun/components/qml/DragContainer.qml b/plasma/applets/homerun/components/qml/DragContainer.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/DragContainer.qml rename to plasma/applets/homerun/components/qml/DragContainer.qml diff --git a/plasma/desktop/applets/homerun/components/qml/Label.qml b/plasma/applets/homerun/components/qml/Label.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/Label.qml rename to plasma/applets/homerun/components/qml/Label.qml diff --git a/plasma/desktop/applets/homerun/components/qml/TabBar.qml b/plasma/applets/homerun/components/qml/TabBar.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/TabBar.qml rename to plasma/applets/homerun/components/qml/TabBar.qml diff --git a/plasma/desktop/applets/homerun/components/qml/TabButton.qml b/plasma/applets/homerun/components/qml/TabButton.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/TabButton.qml rename to plasma/applets/homerun/components/qml/TabButton.qml diff --git a/plasma/desktop/applets/homerun/components/qml/TabGroup.qml b/plasma/applets/homerun/components/qml/TabGroup.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/TabGroup.qml rename to plasma/applets/homerun/components/qml/TabGroup.qml diff --git a/plasma/desktop/applets/homerun/components/qml/private/IconLoader.qml b/plasma/applets/homerun/components/qml/private/IconLoader.qml similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/private/IconLoader.qml rename to plasma/applets/homerun/components/qml/private/IconLoader.qml diff --git a/plasma/desktop/applets/homerun/components/qml/private/TabGroup.js b/plasma/applets/homerun/components/qml/private/TabGroup.js similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/private/TabGroup.js rename to plasma/applets/homerun/components/qml/private/TabGroup.js diff --git a/plasma/desktop/applets/homerun/components/qml/qmldir b/plasma/applets/homerun/components/qml/qmldir similarity index 100% rename from plasma/desktop/applets/homerun/components/qml/qmldir rename to plasma/applets/homerun/components/qml/qmldir diff --git a/plasma/desktop/applets/homerun/components/shadoweffect.cpp b/plasma/applets/homerun/components/shadoweffect.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/shadoweffect.cpp rename to plasma/applets/homerun/components/shadoweffect.cpp diff --git a/plasma/desktop/applets/homerun/components/shadoweffect.h b/plasma/applets/homerun/components/shadoweffect.h similarity index 100% rename from plasma/desktop/applets/homerun/components/shadoweffect.h rename to plasma/applets/homerun/components/shadoweffect.h diff --git a/plasma/desktop/applets/homerun/components/sourceconfigurationdialog.cpp b/plasma/applets/homerun/components/sourceconfigurationdialog.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sourceconfigurationdialog.cpp rename to plasma/applets/homerun/components/sourceconfigurationdialog.cpp diff --git a/plasma/desktop/applets/homerun/components/sourceconfigurationdialog.h b/plasma/applets/homerun/components/sourceconfigurationdialog.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sourceconfigurationdialog.h rename to plasma/applets/homerun/components/sourceconfigurationdialog.h diff --git a/plasma/desktop/applets/homerun/components/sourcemodel.cpp b/plasma/applets/homerun/components/sourcemodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sourcemodel.cpp rename to plasma/applets/homerun/components/sourcemodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sourcemodel.h b/plasma/applets/homerun/components/sourcemodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sourcemodel.h rename to plasma/applets/homerun/components/sourcemodel.h diff --git a/plasma/desktop/applets/homerun/components/sourceregistry.cpp b/plasma/applets/homerun/components/sourceregistry.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sourceregistry.cpp rename to plasma/applets/homerun/components/sourceregistry.cpp diff --git a/plasma/desktop/applets/homerun/components/sourceregistry.h b/plasma/applets/homerun/components/sourceregistry.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sourceregistry.h rename to plasma/applets/homerun/components/sourceregistry.h diff --git a/plasma/desktop/applets/homerun/components/sources/dir/dirconfigurationwidget.cpp b/plasma/applets/homerun/components/sources/dir/dirconfigurationwidget.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/dir/dirconfigurationwidget.cpp rename to plasma/applets/homerun/components/sources/dir/dirconfigurationwidget.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/dir/dirconfigurationwidget.h b/plasma/applets/homerun/components/sources/dir/dirconfigurationwidget.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/dir/dirconfigurationwidget.h rename to plasma/applets/homerun/components/sources/dir/dirconfigurationwidget.h diff --git a/plasma/desktop/applets/homerun/components/sources/dir/dirconfigurationwidget.ui b/plasma/applets/homerun/components/sources/dir/dirconfigurationwidget.ui similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/dir/dirconfigurationwidget.ui rename to plasma/applets/homerun/components/sources/dir/dirconfigurationwidget.ui diff --git a/plasma/desktop/applets/homerun/components/sources/dir/dirmodel.cpp b/plasma/applets/homerun/components/sources/dir/dirmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/dir/dirmodel.cpp rename to plasma/applets/homerun/components/sources/dir/dirmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/dir/dirmodel.h b/plasma/applets/homerun/components/sources/dir/dirmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/dir/dirmodel.h rename to plasma/applets/homerun/components/sources/dir/dirmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp b/plasma/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp rename to plasma/applets/homerun/components/sources/favorites/favoriteappsmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.h b/plasma/applets/homerun/components/sources/favorites/favoriteappsmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/favoriteappsmodel.h rename to plasma/applets/homerun/components/sources/favorites/favoriteappsmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteplacesmodel.cpp b/plasma/applets/homerun/components/sources/favorites/favoriteplacesmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/favoriteplacesmodel.cpp rename to plasma/applets/homerun/components/sources/favorites/favoriteplacesmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteplacesmodel.h b/plasma/applets/homerun/components/sources/favorites/favoriteplacesmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/favoriteplacesmodel.h rename to plasma/applets/homerun/components/sources/favorites/favoriteplacesmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteutils.cpp b/plasma/applets/homerun/components/sources/favorites/favoriteutils.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/favoriteutils.cpp rename to plasma/applets/homerun/components/sources/favorites/favoriteutils.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/favoriteutils.h b/plasma/applets/homerun/components/sources/favorites/favoriteutils.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/favoriteutils.h rename to plasma/applets/homerun/components/sources/favorites/favoriteutils.h diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/fileplacesmodel.cpp b/plasma/applets/homerun/components/sources/favorites/fileplacesmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/fileplacesmodel.cpp rename to plasma/applets/homerun/components/sources/favorites/fileplacesmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/fileplacesmodel.h b/plasma/applets/homerun/components/sources/favorites/fileplacesmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/fileplacesmodel.h rename to plasma/applets/homerun/components/sources/favorites/fileplacesmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem.cpp b/plasma/applets/homerun/components/sources/favorites/kfileplacesitem.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem.cpp rename to plasma/applets/homerun/components/sources/favorites/kfileplacesitem.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem_p.h b/plasma/applets/homerun/components/sources/favorites/kfileplacesitem_p.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/kfileplacesitem_p.h rename to plasma/applets/homerun/components/sources/favorites/kfileplacesitem_p.h diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks.cpp b/plasma/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks.cpp rename to plasma/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks_p.h b/plasma/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks_p.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks_p.h rename to plasma/applets/homerun/components/sources/favorites/kfileplacessharedbookmarks_p.h diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.cpp b/plasma/applets/homerun/components/sources/installedapps/changenotifier.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.cpp rename to plasma/applets/homerun/components/sources/installedapps/changenotifier.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.h b/plasma/applets/homerun/components/sources/installedapps/changenotifier.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/changenotifier.h rename to plasma/applets/homerun/components/sources/installedapps/changenotifier.h diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.cpp b/plasma/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.cpp rename to plasma/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.h b/plasma/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.h rename to plasma/applets/homerun/components/sources/installedapps/filterableinstalledappsmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.cpp b/plasma/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.cpp rename to plasma/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h b/plasma/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h rename to plasma/applets/homerun/components/sources/installedapps/groupedinstalledappsmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp b/plasma/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp rename to plasma/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.h b/plasma/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.h rename to plasma/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.h diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.ui b/plasma/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.ui similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.ui rename to plasma/applets/homerun/components/sources/installedapps/installedappsconfigurationwidget.ui diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.cpp b/plasma/applets/homerun/components/sources/installedapps/installedappsmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.cpp rename to plasma/applets/homerun/components/sources/installedapps/installedappsmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.h b/plasma/applets/homerun/components/sources/installedapps/installedappsmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/installedapps/installedappsmodel.h rename to plasma/applets/homerun/components/sources/installedapps/installedappsmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.cpp b/plasma/applets/homerun/components/sources/power/combinedpowersessionmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.cpp rename to plasma/applets/homerun/components/sources/power/combinedpowersessionmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.h b/plasma/applets/homerun/components/sources/power/combinedpowersessionmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/power/combinedpowersessionmodel.h rename to plasma/applets/homerun/components/sources/power/combinedpowersessionmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/power/powermodel.cpp b/plasma/applets/homerun/components/sources/power/powermodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/power/powermodel.cpp rename to plasma/applets/homerun/components/sources/power/powermodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/power/powermodel.h b/plasma/applets/homerun/components/sources/power/powermodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/power/powermodel.h rename to plasma/applets/homerun/components/sources/power/powermodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.cpp b/plasma/applets/homerun/components/sources/recentapps/recentappsmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.cpp rename to plasma/applets/homerun/components/sources/recentapps/recentappsmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.h b/plasma/applets/homerun/components/sources/recentapps/recentappsmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/recentapps/recentappsmodel.h rename to plasma/applets/homerun/components/sources/recentapps/recentappsmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.cpp b/plasma/applets/homerun/components/sources/runners/querymatchmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.cpp rename to plasma/applets/homerun/components/sources/runners/querymatchmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.h b/plasma/applets/homerun/components/sources/runners/querymatchmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/querymatchmodel.h rename to plasma/applets/homerun/components/sources/runners/querymatchmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp b/plasma/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp rename to plasma/applets/homerun/components/sources/runners/runnerconfigurationwidget.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.h b/plasma/applets/homerun/components/sources/runners/runnerconfigurationwidget.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.h rename to plasma/applets/homerun/components/sources/runners/runnerconfigurationwidget.h diff --git a/plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.ui b/plasma/applets/homerun/components/sources/runners/runnerconfigurationwidget.ui similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/runnerconfigurationwidget.ui rename to plasma/applets/homerun/components/sources/runners/runnerconfigurationwidget.ui diff --git a/plasma/desktop/applets/homerun/components/sources/runners/runnermodel.cpp b/plasma/applets/homerun/components/sources/runners/runnermodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/runnermodel.cpp rename to plasma/applets/homerun/components/sources/runners/runnermodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/runners/runnermodel.h b/plasma/applets/homerun/components/sources/runners/runnermodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/runnermodel.h rename to plasma/applets/homerun/components/sources/runners/runnermodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/runners/singlerunnermodel.cpp b/plasma/applets/homerun/components/sources/runners/singlerunnermodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/singlerunnermodel.cpp rename to plasma/applets/homerun/components/sources/runners/singlerunnermodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/runners/singlerunnermodel.h b/plasma/applets/homerun/components/sources/runners/singlerunnermodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/runners/singlerunnermodel.h rename to plasma/applets/homerun/components/sources/runners/singlerunnermodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/session/openedsessionsmodel.cpp b/plasma/applets/homerun/components/sources/session/openedsessionsmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/session/openedsessionsmodel.cpp rename to plasma/applets/homerun/components/sources/session/openedsessionsmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/session/openedsessionsmodel.h b/plasma/applets/homerun/components/sources/session/openedsessionsmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/session/openedsessionsmodel.h rename to plasma/applets/homerun/components/sources/session/openedsessionsmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/session/sessionmodel.cpp b/plasma/applets/homerun/components/sources/session/sessionmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/session/sessionmodel.cpp rename to plasma/applets/homerun/components/sources/session/sessionmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/session/sessionmodel.h b/plasma/applets/homerun/components/sources/session/sessionmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/session/sessionmodel.h rename to plasma/applets/homerun/components/sources/session/sessionmodel.h diff --git a/plasma/desktop/applets/homerun/components/sources/session/sessionswatcher.cpp b/plasma/applets/homerun/components/sources/session/sessionswatcher.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/session/sessionswatcher.cpp rename to plasma/applets/homerun/components/sources/session/sessionswatcher.cpp diff --git a/plasma/desktop/applets/homerun/components/sources/session/sessionswatcher.h b/plasma/applets/homerun/components/sources/session/sessionswatcher.h similarity index 100% rename from plasma/desktop/applets/homerun/components/sources/session/sessionswatcher.h rename to plasma/applets/homerun/components/sources/session/sessionswatcher.h diff --git a/plasma/desktop/applets/homerun/components/standarditemmodel.cpp b/plasma/applets/homerun/components/standarditemmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/standarditemmodel.cpp rename to plasma/applets/homerun/components/standarditemmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/standarditemmodel.h b/plasma/applets/homerun/components/standarditemmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/standarditemmodel.h rename to plasma/applets/homerun/components/standarditemmodel.h diff --git a/plasma/desktop/applets/homerun/components/tabmodel.cpp b/plasma/applets/homerun/components/tabmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/components/tabmodel.cpp rename to plasma/applets/homerun/components/tabmodel.cpp diff --git a/plasma/desktop/applets/homerun/components/tabmodel.h b/plasma/applets/homerun/components/tabmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/components/tabmodel.h rename to plasma/applets/homerun/components/tabmodel.h diff --git a/plasma/desktop/applets/homerun/config/homerunkickerrc b/plasma/applets/homerun/config/homerunkickerrc similarity index 100% rename from plasma/desktop/applets/homerun/config/homerunkickerrc rename to plasma/applets/homerun/config/homerunkickerrc diff --git a/plasma/desktop/applets/homerun/config/homerunrc b/plasma/applets/homerun/config/homerunrc similarity index 100% rename from plasma/desktop/applets/homerun/config/homerunrc rename to plasma/applets/homerun/config/homerunrc diff --git a/plasma/desktop/applets/homerun/data/favoriteapps.xml b/plasma/applets/homerun/data/favoriteapps.xml similarity index 100% rename from plasma/desktop/applets/homerun/data/favoriteapps.xml rename to plasma/applets/homerun/data/favoriteapps.xml diff --git a/plasma/desktop/applets/homerun/devdoc/helloworld/CMakeLists.txt b/plasma/applets/homerun/devdoc/helloworld/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/devdoc/helloworld/CMakeLists.txt rename to plasma/applets/homerun/devdoc/helloworld/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/devdoc/helloworld/helloworld.cpp b/plasma/applets/homerun/devdoc/helloworld/helloworld.cpp similarity index 100% rename from plasma/desktop/applets/homerun/devdoc/helloworld/helloworld.cpp rename to plasma/applets/homerun/devdoc/helloworld/helloworld.cpp diff --git a/plasma/desktop/applets/homerun/devdoc/helloworld/helloworld.h b/plasma/applets/homerun/devdoc/helloworld/helloworld.h similarity index 100% rename from plasma/desktop/applets/homerun/devdoc/helloworld/helloworld.h rename to plasma/applets/homerun/devdoc/helloworld/helloworld.h diff --git a/plasma/desktop/applets/homerun/devdoc/helloworld/homerun-source-helloworld.desktop b/plasma/applets/homerun/devdoc/helloworld/homerun-source-helloworld.desktop similarity index 100% rename from plasma/desktop/applets/homerun/devdoc/helloworld/homerun-source-helloworld.desktop rename to plasma/applets/homerun/devdoc/helloworld/homerun-source-helloworld.desktop diff --git a/plasma/desktop/applets/homerun/devdoc/overview.md b/plasma/applets/homerun/devdoc/overview.md similarity index 100% rename from plasma/desktop/applets/homerun/devdoc/overview.md rename to plasma/applets/homerun/devdoc/overview.md diff --git a/plasma/desktop/applets/homerun/devdoc/release_howto.md b/plasma/applets/homerun/devdoc/release_howto.md similarity index 100% rename from plasma/desktop/applets/homerun/devdoc/release_howto.md rename to plasma/applets/homerun/devdoc/release_howto.md diff --git a/plasma/desktop/applets/homerun/fixes/CMakeLists.txt b/plasma/applets/homerun/fixes/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/fixes/CMakeLists.txt rename to plasma/applets/homerun/fixes/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/fixes/README.md b/plasma/applets/homerun/fixes/README.md similarity index 100% rename from plasma/desktop/applets/homerun/fixes/README.md rename to plasma/applets/homerun/fixes/README.md diff --git a/plasma/desktop/applets/homerun/fixes/declarativeitemcontainer.cpp b/plasma/applets/homerun/fixes/declarativeitemcontainer.cpp similarity index 100% rename from plasma/desktop/applets/homerun/fixes/declarativeitemcontainer.cpp rename to plasma/applets/homerun/fixes/declarativeitemcontainer.cpp diff --git a/plasma/desktop/applets/homerun/fixes/declarativeitemcontainer_p.h b/plasma/applets/homerun/fixes/declarativeitemcontainer_p.h similarity index 100% rename from plasma/desktop/applets/homerun/fixes/declarativeitemcontainer_p.h rename to plasma/applets/homerun/fixes/declarativeitemcontainer_p.h diff --git a/plasma/desktop/applets/homerun/fixes/dialog.cpp b/plasma/applets/homerun/fixes/dialog.cpp similarity index 100% rename from plasma/desktop/applets/homerun/fixes/dialog.cpp rename to plasma/applets/homerun/fixes/dialog.cpp diff --git a/plasma/desktop/applets/homerun/fixes/dialog.h b/plasma/applets/homerun/fixes/dialog.h similarity index 100% rename from plasma/desktop/applets/homerun/fixes/dialog.h rename to plasma/applets/homerun/fixes/dialog.h diff --git a/plasma/desktop/applets/homerun/fixes/fixesplugin.cpp b/plasma/applets/homerun/fixes/fixesplugin.cpp similarity index 100% rename from plasma/desktop/applets/homerun/fixes/fixesplugin.cpp rename to plasma/applets/homerun/fixes/fixesplugin.cpp diff --git a/plasma/desktop/applets/homerun/fixes/fixesplugin.h b/plasma/applets/homerun/fixes/fixesplugin.h similarity index 100% rename from plasma/desktop/applets/homerun/fixes/fixesplugin.h rename to plasma/applets/homerun/fixes/fixesplugin.h diff --git a/plasma/desktop/applets/homerun/fixes/qml/TextField.qml b/plasma/applets/homerun/fixes/qml/TextField.qml similarity index 100% rename from plasma/desktop/applets/homerun/fixes/qml/TextField.qml rename to plasma/applets/homerun/fixes/qml/TextField.qml diff --git a/plasma/desktop/applets/homerun/fixes/qml/private/TextFieldFocus.qml b/plasma/applets/homerun/fixes/qml/private/TextFieldFocus.qml similarity index 100% rename from plasma/desktop/applets/homerun/fixes/qml/private/TextFieldFocus.qml rename to plasma/applets/homerun/fixes/qml/private/TextFieldFocus.qml diff --git a/plasma/desktop/applets/homerun/fixes/qml/qmldir b/plasma/applets/homerun/fixes/qml/qmldir similarity index 100% rename from plasma/desktop/applets/homerun/fixes/qml/qmldir rename to plasma/applets/homerun/fixes/qml/qmldir diff --git a/plasma/desktop/applets/homerun/fixes/toolboxtoggle.cpp b/plasma/applets/homerun/fixes/toolboxtoggle.cpp similarity index 100% rename from plasma/desktop/applets/homerun/fixes/toolboxtoggle.cpp rename to plasma/applets/homerun/fixes/toolboxtoggle.cpp diff --git a/plasma/desktop/applets/homerun/fixes/toolboxtoggle.h b/plasma/applets/homerun/fixes/toolboxtoggle.h similarity index 100% rename from plasma/desktop/applets/homerun/fixes/toolboxtoggle.h rename to plasma/applets/homerun/fixes/toolboxtoggle.h diff --git a/plasma/desktop/applets/homerun/fullscreen/CMakeLists.txt b/plasma/applets/homerun/fullscreen/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/CMakeLists.txt rename to plasma/applets/homerun/fullscreen/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/fullscreen/applet/CMakeLists.txt b/plasma/applets/homerun/fullscreen/applet/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/applet/CMakeLists.txt rename to plasma/applets/homerun/fullscreen/applet/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/fullscreen/applet/configkeys.h b/plasma/applets/homerun/fullscreen/applet/configkeys.h similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/applet/configkeys.h rename to plasma/applets/homerun/fullscreen/applet/configkeys.h diff --git a/plasma/desktop/applets/homerun/fullscreen/applet/generalconfigpage.ui b/plasma/applets/homerun/fullscreen/applet/generalconfigpage.ui similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/applet/generalconfigpage.ui rename to plasma/applets/homerun/fullscreen/applet/generalconfigpage.ui diff --git a/plasma/desktop/applets/homerun/fullscreen/applet/homerunlauncher.cpp b/plasma/applets/homerun/fullscreen/applet/homerunlauncher.cpp similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/applet/homerunlauncher.cpp rename to plasma/applets/homerun/fullscreen/applet/homerunlauncher.cpp diff --git a/plasma/desktop/applets/homerun/fullscreen/applet/homerunlauncher.h b/plasma/applets/homerun/fullscreen/applet/homerunlauncher.h similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/applet/homerunlauncher.h rename to plasma/applets/homerun/fullscreen/applet/homerunlauncher.h diff --git a/plasma/desktop/applets/homerun/fullscreen/applet/plasma-applet-homerunlauncher.desktop.cmake b/plasma/applets/homerun/fullscreen/applet/plasma-applet-homerunlauncher.desktop.cmake similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/applet/plasma-applet-homerunlauncher.desktop.cmake rename to plasma/applets/homerun/fullscreen/applet/plasma-applet-homerunlauncher.desktop.cmake diff --git a/plasma/desktop/applets/homerun/fullscreen/package/CMakeLists.txt b/plasma/applets/homerun/fullscreen/package/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/CMakeLists.txt rename to plasma/applets/homerun/fullscreen/package/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/config/main.xml b/plasma/applets/homerun/fullscreen/package/contents/config/main.xml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/config/main.xml rename to plasma/applets/homerun/fullscreen/package/contents/config/main.xml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/AvailableSourceItem.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/AvailableSourceItem.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/AvailableSourceItem.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/AvailableSourceItem.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/DebugRectangle.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/DebugRectangle.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/DebugRectangle.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/DebugRectangle.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/LogText.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/LogText.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/LogText.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/LogText.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/MessageItem.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/MessageItem.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/MessageItem.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/MessageItem.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/Page.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/Page.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/Page.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/Page.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/Result.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/Result.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/Result.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/Result.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/ResultsView.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/ResultsView.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/ResultsView.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/ResultsView.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/SlidingContainer.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/SlidingContainer.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/SlidingContainer.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/SlidingContainer.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/SourceItem.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/SourceItem.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/SourceItem.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/SourceItem.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/TabContent.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/TabContent.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/TabContent.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/TabContent.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/TabContentInternal.js b/plasma/applets/homerun/fullscreen/package/contents/ui/TabContentInternal.js similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/TabContentInternal.js rename to plasma/applets/homerun/fullscreen/package/contents/ui/TabContentInternal.js diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/TabSideButton.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/TabSideButton.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/TabSideButton.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/TabSideButton.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/config.ui b/plasma/applets/homerun/fullscreen/package/contents/ui/config.ui similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/config.ui rename to plasma/applets/homerun/fullscreen/package/contents/ui/config.ui diff --git a/plasma/desktop/applets/homerun/fullscreen/package/contents/ui/main.qml b/plasma/applets/homerun/fullscreen/package/contents/ui/main.qml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/contents/ui/main.qml rename to plasma/applets/homerun/fullscreen/package/contents/ui/main.qml diff --git a/plasma/desktop/applets/homerun/fullscreen/package/metadata.desktop.cmake b/plasma/applets/homerun/fullscreen/package/metadata.desktop.cmake similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/package/metadata.desktop.cmake rename to plasma/applets/homerun/fullscreen/package/metadata.desktop.cmake diff --git a/plasma/desktop/applets/homerun/fullscreen/viewer/CMakeLists.txt b/plasma/applets/homerun/fullscreen/viewer/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/viewer/CMakeLists.txt rename to plasma/applets/homerun/fullscreen/viewer/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/fullscreen/viewer/fullview.cpp b/plasma/applets/homerun/fullscreen/viewer/fullview.cpp similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/viewer/fullview.cpp rename to plasma/applets/homerun/fullscreen/viewer/fullview.cpp diff --git a/plasma/desktop/applets/homerun/fullscreen/viewer/fullview.h b/plasma/applets/homerun/fullscreen/viewer/fullview.h similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/viewer/fullview.h rename to plasma/applets/homerun/fullscreen/viewer/fullview.h diff --git a/plasma/desktop/applets/homerun/fullscreen/viewer/homerunviewer.desktop b/plasma/applets/homerun/fullscreen/viewer/homerunviewer.desktop similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/viewer/homerunviewer.desktop rename to plasma/applets/homerun/fullscreen/viewer/homerunviewer.desktop diff --git a/plasma/desktop/applets/homerun/fullscreen/viewer/main.cpp b/plasma/applets/homerun/fullscreen/viewer/main.cpp similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/viewer/main.cpp rename to plasma/applets/homerun/fullscreen/viewer/main.cpp diff --git a/plasma/desktop/applets/homerun/fullscreen/viewer/org.kde.homerunviewer.xml b/plasma/applets/homerun/fullscreen/viewer/org.kde.homerunviewer.xml similarity index 100% rename from plasma/desktop/applets/homerun/fullscreen/viewer/org.kde.homerunviewer.xml rename to plasma/applets/homerun/fullscreen/viewer/org.kde.homerunviewer.xml diff --git a/plasma/desktop/applets/homerun/homerun_config.h.in b/plasma/applets/homerun/homerun_config.h.in similarity index 100% rename from plasma/desktop/applets/homerun/homerun_config.h.in rename to plasma/applets/homerun/homerun_config.h.in diff --git a/plasma/desktop/applets/homerun/icons/CMakeLists.txt b/plasma/applets/homerun/icons/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/icons/CMakeLists.txt rename to plasma/applets/homerun/icons/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/icons/hi128-apps-homerun.png b/plasma/applets/homerun/icons/hi128-apps-homerun.png similarity index 100% rename from plasma/desktop/applets/homerun/icons/hi128-apps-homerun.png rename to plasma/applets/homerun/icons/hi128-apps-homerun.png diff --git a/plasma/desktop/applets/homerun/icons/hi16-apps-homerun.png b/plasma/applets/homerun/icons/hi16-apps-homerun.png similarity index 100% rename from plasma/desktop/applets/homerun/icons/hi16-apps-homerun.png rename to plasma/applets/homerun/icons/hi16-apps-homerun.png diff --git a/plasma/desktop/applets/homerun/icons/hi22-apps-homerun.png b/plasma/applets/homerun/icons/hi22-apps-homerun.png similarity index 100% rename from plasma/desktop/applets/homerun/icons/hi22-apps-homerun.png rename to plasma/applets/homerun/icons/hi22-apps-homerun.png diff --git a/plasma/desktop/applets/homerun/icons/hi32-apps-homerun.png b/plasma/applets/homerun/icons/hi32-apps-homerun.png similarity index 100% rename from plasma/desktop/applets/homerun/icons/hi32-apps-homerun.png rename to plasma/applets/homerun/icons/hi32-apps-homerun.png diff --git a/plasma/desktop/applets/homerun/icons/hi48-apps-homerun.png b/plasma/applets/homerun/icons/hi48-apps-homerun.png similarity index 100% rename from plasma/desktop/applets/homerun/icons/hi48-apps-homerun.png rename to plasma/applets/homerun/icons/hi48-apps-homerun.png diff --git a/plasma/desktop/applets/homerun/icons/hi64-apps-homerun.png b/plasma/applets/homerun/icons/hi64-apps-homerun.png similarity index 100% rename from plasma/desktop/applets/homerun/icons/hi64-apps-homerun.png rename to plasma/applets/homerun/icons/hi64-apps-homerun.png diff --git a/plasma/desktop/applets/homerun/icons/hisc-apps-homerun.svgz b/plasma/applets/homerun/icons/hisc-apps-homerun.svgz similarity index 100% rename from plasma/desktop/applets/homerun/icons/hisc-apps-homerun.svgz rename to plasma/applets/homerun/icons/hisc-apps-homerun.svgz diff --git a/plasma/desktop/applets/homerun/icons/lighter-logo.svg b/plasma/applets/homerun/icons/lighter-logo.svg similarity index 100% rename from plasma/desktop/applets/homerun/icons/lighter-logo.svg rename to plasma/applets/homerun/icons/lighter-logo.svg diff --git a/plasma/desktop/applets/homerun/internal/aboutdata.cpp b/plasma/applets/homerun/internal/aboutdata.cpp similarity index 100% rename from plasma/desktop/applets/homerun/internal/aboutdata.cpp rename to plasma/applets/homerun/internal/aboutdata.cpp diff --git a/plasma/desktop/applets/homerun/internal/aboutdata.h b/plasma/applets/homerun/internal/aboutdata.h similarity index 100% rename from plasma/desktop/applets/homerun/internal/aboutdata.h rename to plasma/applets/homerun/internal/aboutdata.h diff --git a/plasma/desktop/applets/homerun/internal/i18nconfig.cpp b/plasma/applets/homerun/internal/i18nconfig.cpp similarity index 100% rename from plasma/desktop/applets/homerun/internal/i18nconfig.cpp rename to plasma/applets/homerun/internal/i18nconfig.cpp diff --git a/plasma/desktop/applets/homerun/kicker/CMakeLists.txt b/plasma/applets/homerun/kicker/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/kicker/CMakeLists.txt rename to plasma/applets/homerun/kicker/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/kicker/components/CMakeLists.txt b/plasma/applets/homerun/kicker/components/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/CMakeLists.txt rename to plasma/applets/homerun/kicker/components/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/kicker/components/appletproxy.cpp b/plasma/applets/homerun/kicker/components/appletproxy.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/appletproxy.cpp rename to plasma/applets/homerun/kicker/components/appletproxy.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/appletproxy.h b/plasma/applets/homerun/kicker/components/appletproxy.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/appletproxy.h rename to plasma/applets/homerun/kicker/components/appletproxy.h diff --git a/plasma/desktop/applets/homerun/kicker/components/fadeouteffect.cpp b/plasma/applets/homerun/kicker/components/fadeouteffect.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/fadeouteffect.cpp rename to plasma/applets/homerun/kicker/components/fadeouteffect.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/fadeouteffect.h b/plasma/applets/homerun/kicker/components/fadeouteffect.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/fadeouteffect.h rename to plasma/applets/homerun/kicker/components/fadeouteffect.h diff --git a/plasma/desktop/applets/homerun/kicker/components/fadeoutitem.cpp b/plasma/applets/homerun/kicker/components/fadeoutitem.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/fadeoutitem.cpp rename to plasma/applets/homerun/kicker/components/fadeoutitem.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/fadeoutitem.h b/plasma/applets/homerun/kicker/components/fadeoutitem.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/fadeoutitem.h rename to plasma/applets/homerun/kicker/components/fadeoutitem.h diff --git a/plasma/desktop/applets/homerun/kicker/components/kickerplugin.cpp b/plasma/applets/homerun/kicker/components/kickerplugin.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/kickerplugin.cpp rename to plasma/applets/homerun/kicker/components/kickerplugin.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/kickerplugin.h b/plasma/applets/homerun/kicker/components/kickerplugin.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/kickerplugin.h rename to plasma/applets/homerun/kicker/components/kickerplugin.h diff --git a/plasma/desktop/applets/homerun/kicker/components/processrunner.cpp b/plasma/applets/homerun/kicker/components/processrunner.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/processrunner.cpp rename to plasma/applets/homerun/kicker/components/processrunner.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/processrunner.h b/plasma/applets/homerun/kicker/components/processrunner.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/processrunner.h rename to plasma/applets/homerun/kicker/components/processrunner.h diff --git a/plasma/desktop/applets/homerun/kicker/components/qmldir b/plasma/applets/homerun/kicker/components/qmldir similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/qmldir rename to plasma/applets/homerun/kicker/components/qmldir diff --git a/plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.cpp b/plasma/applets/homerun/kicker/components/sourcelistmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.cpp rename to plasma/applets/homerun/kicker/components/sourcelistmodel.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.h b/plasma/applets/homerun/kicker/components/sourcelistmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/sourcelistmodel.h rename to plasma/applets/homerun/kicker/components/sourcelistmodel.h diff --git a/plasma/desktop/applets/homerun/kicker/components/urlconverter.cpp b/plasma/applets/homerun/kicker/components/urlconverter.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/urlconverter.cpp rename to plasma/applets/homerun/kicker/components/urlconverter.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/urlconverter.h b/plasma/applets/homerun/kicker/components/urlconverter.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/urlconverter.h rename to plasma/applets/homerun/kicker/components/urlconverter.h diff --git a/plasma/desktop/applets/homerun/kicker/components/windowsystem.cpp b/plasma/applets/homerun/kicker/components/windowsystem.cpp similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/windowsystem.cpp rename to plasma/applets/homerun/kicker/components/windowsystem.cpp diff --git a/plasma/desktop/applets/homerun/kicker/components/windowsystem.h b/plasma/applets/homerun/kicker/components/windowsystem.h similarity index 100% rename from plasma/desktop/applets/homerun/kicker/components/windowsystem.h rename to plasma/applets/homerun/kicker/components/windowsystem.h diff --git a/plasma/desktop/applets/homerun/kicker/package/CMakeLists.txt b/plasma/applets/homerun/kicker/package/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/CMakeLists.txt rename to plasma/applets/homerun/kicker/package/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/config/main.xml b/plasma/applets/homerun/kicker/package/contents/config/main.xml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/config/main.xml rename to plasma/applets/homerun/kicker/package/contents/config/main.xml diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/ItemListDelegate.qml b/plasma/applets/homerun/kicker/package/contents/ui/ItemListDelegate.qml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/ItemListDelegate.qml rename to plasma/applets/homerun/kicker/package/contents/ui/ItemListDelegate.qml diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/ItemListDialog.qml b/plasma/applets/homerun/kicker/package/contents/ui/ItemListDialog.qml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/ItemListDialog.qml rename to plasma/applets/homerun/kicker/package/contents/ui/ItemListDialog.qml diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/ItemListView.qml b/plasma/applets/homerun/kicker/package/contents/ui/ItemListView.qml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/ItemListView.qml rename to plasma/applets/homerun/kicker/package/contents/ui/ItemListView.qml diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/PopupButton.qml b/plasma/applets/homerun/kicker/package/contents/ui/PopupButton.qml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/PopupButton.qml rename to plasma/applets/homerun/kicker/package/contents/ui/PopupButton.qml diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/SidebarItem.qml b/plasma/applets/homerun/kicker/package/contents/ui/SidebarItem.qml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/SidebarItem.qml rename to plasma/applets/homerun/kicker/package/contents/ui/SidebarItem.qml diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/SidebarSection.qml b/plasma/applets/homerun/kicker/package/contents/ui/SidebarSection.qml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/SidebarSection.qml rename to plasma/applets/homerun/kicker/package/contents/ui/SidebarSection.qml diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/config.ui b/plasma/applets/homerun/kicker/package/contents/ui/config.ui similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/config.ui rename to plasma/applets/homerun/kicker/package/contents/ui/config.ui diff --git a/plasma/desktop/applets/homerun/kicker/package/contents/ui/main.qml b/plasma/applets/homerun/kicker/package/contents/ui/main.qml similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/contents/ui/main.qml rename to plasma/applets/homerun/kicker/package/contents/ui/main.qml diff --git a/plasma/desktop/applets/homerun/kicker/package/metadata.desktop.cmake b/plasma/applets/homerun/kicker/package/metadata.desktop.cmake similarity index 100% rename from plasma/desktop/applets/homerun/kicker/package/metadata.desktop.cmake rename to plasma/applets/homerun/kicker/package/metadata.desktop.cmake diff --git a/plasma/desktop/applets/homerun/lib/CMakeLists.txt b/plasma/applets/homerun/lib/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/lib/CMakeLists.txt rename to plasma/applets/homerun/lib/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/lib/Doxyfile.in b/plasma/applets/homerun/lib/Doxyfile.in similarity index 100% rename from plasma/desktop/applets/homerun/lib/Doxyfile.in rename to plasma/applets/homerun/lib/Doxyfile.in diff --git a/plasma/desktop/applets/homerun/lib/HomerunConfig.cmake.in b/plasma/applets/homerun/lib/HomerunConfig.cmake.in similarity index 100% rename from plasma/desktop/applets/homerun/lib/HomerunConfig.cmake.in rename to plasma/applets/homerun/lib/HomerunConfig.cmake.in diff --git a/plasma/desktop/applets/homerun/lib/abstractsource.cpp b/plasma/applets/homerun/lib/abstractsource.cpp similarity index 100% rename from plasma/desktop/applets/homerun/lib/abstractsource.cpp rename to plasma/applets/homerun/lib/abstractsource.cpp diff --git a/plasma/desktop/applets/homerun/lib/abstractsource.h b/plasma/applets/homerun/lib/abstractsource.h similarity index 100% rename from plasma/desktop/applets/homerun/lib/abstractsource.h rename to plasma/applets/homerun/lib/abstractsource.h diff --git a/plasma/desktop/applets/homerun/lib/actionlist.cpp b/plasma/applets/homerun/lib/actionlist.cpp similarity index 100% rename from plasma/desktop/applets/homerun/lib/actionlist.cpp rename to plasma/applets/homerun/lib/actionlist.cpp diff --git a/plasma/desktop/applets/homerun/lib/actionlist.h b/plasma/applets/homerun/lib/actionlist.h similarity index 100% rename from plasma/desktop/applets/homerun/lib/actionlist.h rename to plasma/applets/homerun/lib/actionlist.h diff --git a/plasma/desktop/applets/homerun/lib/homerun-source.desktop b/plasma/applets/homerun/lib/homerun-source.desktop similarity index 100% rename from plasma/desktop/applets/homerun/lib/homerun-source.desktop rename to plasma/applets/homerun/lib/homerun-source.desktop diff --git a/plasma/desktop/applets/homerun/lib/homerun_export.h b/plasma/applets/homerun/lib/homerun_export.h similarity index 100% rename from plasma/desktop/applets/homerun/lib/homerun_export.h rename to plasma/applets/homerun/lib/homerun_export.h diff --git a/plasma/desktop/applets/homerun/lib/homerunmodel.md b/plasma/applets/homerun/lib/homerunmodel.md similarity index 100% rename from plasma/desktop/applets/homerun/lib/homerunmodel.md rename to plasma/applets/homerun/lib/homerunmodel.md diff --git a/plasma/desktop/applets/homerun/lib/libhomerun_config.h.in b/plasma/applets/homerun/lib/libhomerun_config.h.in similarity index 100% rename from plasma/desktop/applets/homerun/lib/libhomerun_config.h.in rename to plasma/applets/homerun/lib/libhomerun_config.h.in diff --git a/plasma/desktop/applets/homerun/lib/mainpage.md b/plasma/applets/homerun/lib/mainpage.md similarity index 100% rename from plasma/desktop/applets/homerun/lib/mainpage.md rename to plasma/applets/homerun/lib/mainpage.md diff --git a/plasma/desktop/applets/homerun/lib/pathmodel.cpp b/plasma/applets/homerun/lib/pathmodel.cpp similarity index 100% rename from plasma/desktop/applets/homerun/lib/pathmodel.cpp rename to plasma/applets/homerun/lib/pathmodel.cpp diff --git a/plasma/desktop/applets/homerun/lib/pathmodel.h b/plasma/applets/homerun/lib/pathmodel.h similarity index 100% rename from plasma/desktop/applets/homerun/lib/pathmodel.h rename to plasma/applets/homerun/lib/pathmodel.h diff --git a/plasma/desktop/applets/homerun/lib/sourceconfigurationwidget.cpp b/plasma/applets/homerun/lib/sourceconfigurationwidget.cpp similarity index 100% rename from plasma/desktop/applets/homerun/lib/sourceconfigurationwidget.cpp rename to plasma/applets/homerun/lib/sourceconfigurationwidget.cpp diff --git a/plasma/desktop/applets/homerun/lib/sourceconfigurationwidget.h b/plasma/applets/homerun/lib/sourceconfigurationwidget.h similarity index 100% rename from plasma/desktop/applets/homerun/lib/sourceconfigurationwidget.h rename to plasma/applets/homerun/lib/sourceconfigurationwidget.h diff --git a/plasma/desktop/applets/homerun/plugins/CMakeLists.txt b/plasma/applets/homerun/plugins/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/plugins/CMakeLists.txt rename to plasma/applets/homerun/plugins/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/plugins/recentdocuments/CMakeLists.txt b/plasma/applets/homerun/plugins/recentdocuments/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/plugins/recentdocuments/CMakeLists.txt rename to plasma/applets/homerun/plugins/recentdocuments/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/plugins/recentdocuments/homerun-source-recentdocuments.desktop b/plasma/applets/homerun/plugins/recentdocuments/homerun-source-recentdocuments.desktop similarity index 100% rename from plasma/desktop/applets/homerun/plugins/recentdocuments/homerun-source-recentdocuments.desktop rename to plasma/applets/homerun/plugins/recentdocuments/homerun-source-recentdocuments.desktop diff --git a/plasma/desktop/applets/homerun/plugins/recentdocuments/recentdocuments.cpp b/plasma/applets/homerun/plugins/recentdocuments/recentdocuments.cpp similarity index 100% rename from plasma/desktop/applets/homerun/plugins/recentdocuments/recentdocuments.cpp rename to plasma/applets/homerun/plugins/recentdocuments/recentdocuments.cpp diff --git a/plasma/desktop/applets/homerun/plugins/recentdocuments/recentdocuments.h b/plasma/applets/homerun/plugins/recentdocuments/recentdocuments.h similarity index 100% rename from plasma/desktop/applets/homerun/plugins/recentdocuments/recentdocuments.h rename to plasma/applets/homerun/plugins/recentdocuments/recentdocuments.h diff --git a/plasma/desktop/applets/homerun/tests/CMakeLists.txt b/plasma/applets/homerun/tests/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/tests/CMakeLists.txt rename to plasma/applets/homerun/tests/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/tests/auto/CMakeLists.txt b/plasma/applets/homerun/tests/auto/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/CMakeLists.txt rename to plasma/applets/homerun/tests/auto/CMakeLists.txt diff --git a/plasma/desktop/applets/homerun/tests/auto/dirmodeltest.cpp b/plasma/applets/homerun/tests/auto/dirmodeltest.cpp similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/dirmodeltest.cpp rename to plasma/applets/homerun/tests/auto/dirmodeltest.cpp diff --git a/plasma/desktop/applets/homerun/tests/auto/dirmodeltest.h b/plasma/applets/homerun/tests/auto/dirmodeltest.h similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/dirmodeltest.h rename to plasma/applets/homerun/tests/auto/dirmodeltest.h diff --git a/plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.cpp b/plasma/applets/homerun/tests/auto/favoriteappsmodeltest.cpp similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.cpp rename to plasma/applets/homerun/tests/auto/favoriteappsmodeltest.cpp diff --git a/plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.h b/plasma/applets/homerun/tests/auto/favoriteappsmodeltest.h similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/favoriteappsmodeltest.h rename to plasma/applets/homerun/tests/auto/favoriteappsmodeltest.h diff --git a/plasma/desktop/applets/homerun/tests/auto/favoriteplacesmodeltest.cpp b/plasma/applets/homerun/tests/auto/favoriteplacesmodeltest.cpp similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/favoriteplacesmodeltest.cpp rename to plasma/applets/homerun/tests/auto/favoriteplacesmodeltest.cpp diff --git a/plasma/desktop/applets/homerun/tests/auto/favoriteplacesmodeltest.h b/plasma/applets/homerun/tests/auto/favoriteplacesmodeltest.h similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/favoriteplacesmodeltest.h rename to plasma/applets/homerun/tests/auto/favoriteplacesmodeltest.h diff --git a/plasma/desktop/applets/homerun/tests/auto/i18nconfigtest.cpp b/plasma/applets/homerun/tests/auto/i18nconfigtest.cpp similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/i18nconfigtest.cpp rename to plasma/applets/homerun/tests/auto/i18nconfigtest.cpp diff --git a/plasma/desktop/applets/homerun/tests/auto/i18nconfigtest.h b/plasma/applets/homerun/tests/auto/i18nconfigtest.h similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/i18nconfigtest.h rename to plasma/applets/homerun/tests/auto/i18nconfigtest.h diff --git a/plasma/desktop/applets/homerun/tests/auto/sourcemodeltest.cpp b/plasma/applets/homerun/tests/auto/sourcemodeltest.cpp similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/sourcemodeltest.cpp rename to plasma/applets/homerun/tests/auto/sourcemodeltest.cpp diff --git a/plasma/desktop/applets/homerun/tests/auto/sourcemodeltest.h b/plasma/applets/homerun/tests/auto/sourcemodeltest.h similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/sourcemodeltest.h rename to plasma/applets/homerun/tests/auto/sourcemodeltest.h diff --git a/plasma/desktop/applets/homerun/tests/auto/tabmodeltest.cpp b/plasma/applets/homerun/tests/auto/tabmodeltest.cpp similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/tabmodeltest.cpp rename to plasma/applets/homerun/tests/auto/tabmodeltest.cpp diff --git a/plasma/desktop/applets/homerun/tests/auto/tabmodeltest.h b/plasma/applets/homerun/tests/auto/tabmodeltest.h similarity index 100% rename from plasma/desktop/applets/homerun/tests/auto/tabmodeltest.h rename to plasma/applets/homerun/tests/auto/tabmodeltest.h diff --git a/plasma/desktop/applets/homerun/tests/manual/keyboard-navigation.md b/plasma/applets/homerun/tests/manual/keyboard-navigation.md similarity index 100% rename from plasma/desktop/applets/homerun/tests/manual/keyboard-navigation.md rename to plasma/applets/homerun/tests/manual/keyboard-navigation.md diff --git a/plasma/generic/applets/icon/CMakeLists.txt b/plasma/applets/icon/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/icon/CMakeLists.txt rename to plasma/applets/icon/CMakeLists.txt diff --git a/plasma/generic/applets/icon/Messages.sh b/plasma/applets/icon/Messages.sh similarity index 100% rename from plasma/generic/applets/icon/Messages.sh rename to plasma/applets/icon/Messages.sh diff --git a/plasma/generic/applets/icon/icon.cpp b/plasma/applets/icon/icon.cpp similarity index 100% rename from plasma/generic/applets/icon/icon.cpp rename to plasma/applets/icon/icon.cpp diff --git a/plasma/generic/applets/icon/icon.h b/plasma/applets/icon/icon.h similarity index 100% rename from plasma/generic/applets/icon/icon.h rename to plasma/applets/icon/icon.h diff --git a/plasma/generic/applets/icon/plasma-applet-icon.desktop b/plasma/applets/icon/plasma-applet-icon.desktop similarity index 100% rename from plasma/generic/applets/icon/plasma-applet-icon.desktop rename to plasma/applets/icon/plasma-applet-icon.desktop diff --git a/plasma/desktop/applets/kickoff/CMakeLists.txt b/plasma/applets/kickoff/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/kickoff/CMakeLists.txt rename to plasma/applets/kickoff/CMakeLists.txt diff --git a/plasma/desktop/applets/kickoff/DESIGN-GOALS b/plasma/applets/kickoff/DESIGN-GOALS similarity index 100% rename from plasma/desktop/applets/kickoff/DESIGN-GOALS rename to plasma/applets/kickoff/DESIGN-GOALS diff --git a/plasma/desktop/applets/kickoff/Messages.sh b/plasma/applets/kickoff/Messages.sh similarity index 100% rename from plasma/desktop/applets/kickoff/Messages.sh rename to plasma/applets/kickoff/Messages.sh diff --git a/plasma/desktop/applets/kickoff/STATUS-TODO b/plasma/applets/kickoff/STATUS-TODO similarity index 100% rename from plasma/desktop/applets/kickoff/STATUS-TODO rename to plasma/applets/kickoff/STATUS-TODO diff --git a/plasma/desktop/applets/kickoff/applet/applet.cpp b/plasma/applets/kickoff/applet/applet.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/applet/applet.cpp rename to plasma/applets/kickoff/applet/applet.cpp diff --git a/plasma/desktop/applets/kickoff/applet/applet.h b/plasma/applets/kickoff/applet/applet.h similarity index 100% rename from plasma/desktop/applets/kickoff/applet/applet.h rename to plasma/applets/kickoff/applet/applet.h diff --git a/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui b/plasma/applets/kickoff/applet/kickoffConfig.ui similarity index 100% rename from plasma/desktop/applets/kickoff/applet/kickoffConfig.ui rename to plasma/applets/kickoff/applet/kickoffConfig.ui diff --git a/plasma/desktop/applets/kickoff/applet/plasma-applet-launcher.desktop b/plasma/applets/kickoff/applet/plasma-applet-launcher.desktop similarity index 100% rename from plasma/desktop/applets/kickoff/applet/plasma-applet-launcher.desktop rename to plasma/applets/kickoff/applet/plasma-applet-launcher.desktop diff --git a/plasma/desktop/applets/kickoff/core/applicationmodel.cpp b/plasma/applets/kickoff/core/applicationmodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/applicationmodel.cpp rename to plasma/applets/kickoff/core/applicationmodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/applicationmodel.h b/plasma/applets/kickoff/core/applicationmodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/applicationmodel.h rename to plasma/applets/kickoff/core/applicationmodel.h diff --git a/plasma/desktop/applets/kickoff/core/favoritesmodel.cpp b/plasma/applets/kickoff/core/favoritesmodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/favoritesmodel.cpp rename to plasma/applets/kickoff/core/favoritesmodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/favoritesmodel.h b/plasma/applets/kickoff/core/favoritesmodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/favoritesmodel.h rename to plasma/applets/kickoff/core/favoritesmodel.h diff --git a/plasma/desktop/applets/kickoff/core/itemhandlers.cpp b/plasma/applets/kickoff/core/itemhandlers.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/itemhandlers.cpp rename to plasma/applets/kickoff/core/itemhandlers.cpp diff --git a/plasma/desktop/applets/kickoff/core/itemhandlers.h b/plasma/applets/kickoff/core/itemhandlers.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/itemhandlers.h rename to plasma/applets/kickoff/core/itemhandlers.h diff --git a/plasma/desktop/applets/kickoff/core/kickoff_export.h b/plasma/applets/kickoff/core/kickoff_export.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/kickoff_export.h rename to plasma/applets/kickoff/core/kickoff_export.h diff --git a/plasma/desktop/applets/kickoff/core/kickoffabstractmodel.cpp b/plasma/applets/kickoff/core/kickoffabstractmodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/kickoffabstractmodel.cpp rename to plasma/applets/kickoff/core/kickoffabstractmodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/kickoffabstractmodel.h b/plasma/applets/kickoff/core/kickoffabstractmodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/kickoffabstractmodel.h rename to plasma/applets/kickoff/core/kickoffabstractmodel.h diff --git a/plasma/desktop/applets/kickoff/core/kickoffmodel.cpp b/plasma/applets/kickoff/core/kickoffmodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/kickoffmodel.cpp rename to plasma/applets/kickoff/core/kickoffmodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/kickoffmodel.h b/plasma/applets/kickoff/core/kickoffmodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/kickoffmodel.h rename to plasma/applets/kickoff/core/kickoffmodel.h diff --git a/plasma/desktop/applets/kickoff/core/kickoffproxymodel.cpp b/plasma/applets/kickoff/core/kickoffproxymodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/kickoffproxymodel.cpp rename to plasma/applets/kickoff/core/kickoffproxymodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/kickoffproxymodel.h b/plasma/applets/kickoff/core/kickoffproxymodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/kickoffproxymodel.h rename to plasma/applets/kickoff/core/kickoffproxymodel.h diff --git a/plasma/desktop/applets/kickoff/core/krunnermodel.cpp b/plasma/applets/kickoff/core/krunnermodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/krunnermodel.cpp rename to plasma/applets/kickoff/core/krunnermodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/krunnermodel.h b/plasma/applets/kickoff/core/krunnermodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/krunnermodel.h rename to plasma/applets/kickoff/core/krunnermodel.h diff --git a/plasma/desktop/applets/kickoff/core/leavemodel.cpp b/plasma/applets/kickoff/core/leavemodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/leavemodel.cpp rename to plasma/applets/kickoff/core/leavemodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/leavemodel.h b/plasma/applets/kickoff/core/leavemodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/leavemodel.h rename to plasma/applets/kickoff/core/leavemodel.h diff --git a/plasma/desktop/applets/kickoff/core/models.cpp b/plasma/applets/kickoff/core/models.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/models.cpp rename to plasma/applets/kickoff/core/models.cpp diff --git a/plasma/desktop/applets/kickoff/core/models.h b/plasma/applets/kickoff/core/models.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/models.h rename to plasma/applets/kickoff/core/models.h diff --git a/plasma/desktop/applets/kickoff/core/org.kde.kickoff.recent.xml b/plasma/applets/kickoff/core/org.kde.kickoff.recent.xml similarity index 100% rename from plasma/desktop/applets/kickoff/core/org.kde.kickoff.recent.xml rename to plasma/applets/kickoff/core/org.kde.kickoff.recent.xml diff --git a/plasma/desktop/applets/kickoff/core/org.kde.kickoff.xml b/plasma/applets/kickoff/core/org.kde.kickoff.xml similarity index 100% rename from plasma/desktop/applets/kickoff/core/org.kde.kickoff.xml rename to plasma/applets/kickoff/core/org.kde.kickoff.xml diff --git a/plasma/desktop/applets/kickoff/core/recentapplications.cpp b/plasma/applets/kickoff/core/recentapplications.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/recentapplications.cpp rename to plasma/applets/kickoff/core/recentapplications.cpp diff --git a/plasma/desktop/applets/kickoff/core/recentapplications.h b/plasma/applets/kickoff/core/recentapplications.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/recentapplications.h rename to plasma/applets/kickoff/core/recentapplications.h diff --git a/plasma/desktop/applets/kickoff/core/recentlyusedmodel.cpp b/plasma/applets/kickoff/core/recentlyusedmodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/recentlyusedmodel.cpp rename to plasma/applets/kickoff/core/recentlyusedmodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/recentlyusedmodel.h b/plasma/applets/kickoff/core/recentlyusedmodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/recentlyusedmodel.h rename to plasma/applets/kickoff/core/recentlyusedmodel.h diff --git a/plasma/desktop/applets/kickoff/core/systemmodel.cpp b/plasma/applets/kickoff/core/systemmodel.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/systemmodel.cpp rename to plasma/applets/kickoff/core/systemmodel.cpp diff --git a/plasma/desktop/applets/kickoff/core/systemmodel.h b/plasma/applets/kickoff/core/systemmodel.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/systemmodel.h rename to plasma/applets/kickoff/core/systemmodel.h diff --git a/plasma/desktop/applets/kickoff/core/urlitemlauncher.cpp b/plasma/applets/kickoff/core/urlitemlauncher.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/core/urlitemlauncher.cpp rename to plasma/applets/kickoff/core/urlitemlauncher.cpp diff --git a/plasma/desktop/applets/kickoff/core/urlitemlauncher.h b/plasma/applets/kickoff/core/urlitemlauncher.h similarity index 100% rename from plasma/desktop/applets/kickoff/core/urlitemlauncher.h rename to plasma/applets/kickoff/core/urlitemlauncher.h diff --git a/plasma/desktop/applets/kickoff/main.cpp b/plasma/applets/kickoff/main.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/main.cpp rename to plasma/applets/kickoff/main.cpp diff --git a/plasma/desktop/applets/kickoff/simpleapplet/menuview.cpp b/plasma/applets/kickoff/simpleapplet/menuview.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/simpleapplet/menuview.cpp rename to plasma/applets/kickoff/simpleapplet/menuview.cpp diff --git a/plasma/desktop/applets/kickoff/simpleapplet/menuview.h b/plasma/applets/kickoff/simpleapplet/menuview.h similarity index 100% rename from plasma/desktop/applets/kickoff/simpleapplet/menuview.h rename to plasma/applets/kickoff/simpleapplet/menuview.h diff --git a/plasma/desktop/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop b/plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop similarity index 100% rename from plasma/desktop/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop rename to plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop diff --git a/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp b/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp rename to plasma/applets/kickoff/simpleapplet/simpleapplet.cpp diff --git a/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h b/plasma/applets/kickoff/simpleapplet/simpleapplet.h similarity index 100% rename from plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h rename to plasma/applets/kickoff/simpleapplet/simpleapplet.h diff --git a/plasma/desktop/applets/kickoff/ui/contentareacap.cpp b/plasma/applets/kickoff/ui/contentareacap.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/contentareacap.cpp rename to plasma/applets/kickoff/ui/contentareacap.cpp diff --git a/plasma/desktop/applets/kickoff/ui/contentareacap.h b/plasma/applets/kickoff/ui/contentareacap.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/contentareacap.h rename to plasma/applets/kickoff/ui/contentareacap.h diff --git a/plasma/desktop/applets/kickoff/ui/contextmenufactory.cpp b/plasma/applets/kickoff/ui/contextmenufactory.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/contextmenufactory.cpp rename to plasma/applets/kickoff/ui/contextmenufactory.cpp diff --git a/plasma/desktop/applets/kickoff/ui/contextmenufactory.h b/plasma/applets/kickoff/ui/contextmenufactory.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/contextmenufactory.h rename to plasma/applets/kickoff/ui/contextmenufactory.h diff --git a/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp b/plasma/applets/kickoff/ui/flipscrollview.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/flipscrollview.cpp rename to plasma/applets/kickoff/ui/flipscrollview.cpp diff --git a/plasma/desktop/applets/kickoff/ui/flipscrollview.h b/plasma/applets/kickoff/ui/flipscrollview.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/flipscrollview.h rename to plasma/applets/kickoff/ui/flipscrollview.h diff --git a/plasma/desktop/applets/kickoff/ui/itemdelegate.cpp b/plasma/applets/kickoff/ui/itemdelegate.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/itemdelegate.cpp rename to plasma/applets/kickoff/ui/itemdelegate.cpp diff --git a/plasma/desktop/applets/kickoff/ui/itemdelegate.h b/plasma/applets/kickoff/ui/itemdelegate.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/itemdelegate.h rename to plasma/applets/kickoff/ui/itemdelegate.h diff --git a/plasma/desktop/applets/kickoff/ui/launcher.cpp b/plasma/applets/kickoff/ui/launcher.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/launcher.cpp rename to plasma/applets/kickoff/ui/launcher.cpp diff --git a/plasma/desktop/applets/kickoff/ui/launcher.h b/plasma/applets/kickoff/ui/launcher.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/launcher.h rename to plasma/applets/kickoff/ui/launcher.h diff --git a/plasma/desktop/applets/kickoff/ui/searchbar.cpp b/plasma/applets/kickoff/ui/searchbar.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/searchbar.cpp rename to plasma/applets/kickoff/ui/searchbar.cpp diff --git a/plasma/desktop/applets/kickoff/ui/searchbar.h b/plasma/applets/kickoff/ui/searchbar.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/searchbar.h rename to plasma/applets/kickoff/ui/searchbar.h diff --git a/plasma/desktop/applets/kickoff/ui/tabbar.cpp b/plasma/applets/kickoff/ui/tabbar.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/tabbar.cpp rename to plasma/applets/kickoff/ui/tabbar.cpp diff --git a/plasma/desktop/applets/kickoff/ui/tabbar.h b/plasma/applets/kickoff/ui/tabbar.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/tabbar.h rename to plasma/applets/kickoff/ui/tabbar.h diff --git a/plasma/desktop/applets/kickoff/ui/urlitemview.cpp b/plasma/applets/kickoff/ui/urlitemview.cpp similarity index 100% rename from plasma/desktop/applets/kickoff/ui/urlitemview.cpp rename to plasma/applets/kickoff/ui/urlitemview.cpp diff --git a/plasma/desktop/applets/kickoff/ui/urlitemview.h b/plasma/applets/kickoff/ui/urlitemview.h similarity index 100% rename from plasma/desktop/applets/kickoff/ui/urlitemview.h rename to plasma/applets/kickoff/ui/urlitemview.h diff --git a/plasma/generic/applets/lock_logout/CMakeLists.txt b/plasma/applets/lock_logout/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/lock_logout/CMakeLists.txt rename to plasma/applets/lock_logout/CMakeLists.txt diff --git a/plasma/generic/applets/lock_logout/Messages.sh b/plasma/applets/lock_logout/Messages.sh similarity index 100% rename from plasma/generic/applets/lock_logout/Messages.sh rename to plasma/applets/lock_logout/Messages.sh diff --git a/plasma/generic/applets/lock_logout/contents/config/main.xml b/plasma/applets/lock_logout/contents/config/main.xml similarity index 100% rename from plasma/generic/applets/lock_logout/contents/config/main.xml rename to plasma/applets/lock_logout/contents/config/main.xml diff --git a/plasma/generic/applets/lock_logout/contents/ui/config.ui b/plasma/applets/lock_logout/contents/ui/config.ui similarity index 100% rename from plasma/generic/applets/lock_logout/contents/ui/config.ui rename to plasma/applets/lock_logout/contents/ui/config.ui diff --git a/plasma/generic/applets/lock_logout/contents/ui/data.js b/plasma/applets/lock_logout/contents/ui/data.js similarity index 100% rename from plasma/generic/applets/lock_logout/contents/ui/data.js rename to plasma/applets/lock_logout/contents/ui/data.js diff --git a/plasma/generic/applets/lock_logout/contents/ui/lockout.qml b/plasma/applets/lock_logout/contents/ui/lockout.qml similarity index 100% rename from plasma/generic/applets/lock_logout/contents/ui/lockout.qml rename to plasma/applets/lock_logout/contents/ui/lockout.qml diff --git a/plasma/generic/applets/lock_logout/metadata.desktop b/plasma/applets/lock_logout/metadata.desktop similarity index 100% rename from plasma/generic/applets/lock_logout/metadata.desktop rename to plasma/applets/lock_logout/metadata.desktop diff --git a/plasma/generic/applets/notifications/CMakeLists.txt b/plasma/applets/notifications/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/notifications/CMakeLists.txt rename to plasma/applets/notifications/CMakeLists.txt diff --git a/plasma/generic/applets/notifications/Messages.sh b/plasma/applets/notifications/Messages.sh similarity index 100% rename from plasma/generic/applets/notifications/Messages.sh rename to plasma/applets/notifications/Messages.sh diff --git a/plasma/generic/applets/notifications/contents/config/main.xml b/plasma/applets/notifications/contents/config/main.xml similarity index 100% rename from plasma/generic/applets/notifications/contents/config/main.xml rename to plasma/applets/notifications/contents/config/main.xml diff --git a/plasma/generic/applets/notifications/contents/ui/JobDelegate.qml b/plasma/applets/notifications/contents/ui/JobDelegate.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/JobDelegate.qml rename to plasma/applets/notifications/contents/ui/JobDelegate.qml diff --git a/plasma/generic/applets/notifications/contents/ui/Jobs.qml b/plasma/applets/notifications/contents/ui/Jobs.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/Jobs.qml rename to plasma/applets/notifications/contents/ui/Jobs.qml diff --git a/plasma/generic/applets/notifications/contents/ui/LastNotificationPopup.qml b/plasma/applets/notifications/contents/ui/LastNotificationPopup.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/LastNotificationPopup.qml rename to plasma/applets/notifications/contents/ui/LastNotificationPopup.qml diff --git a/plasma/generic/applets/notifications/contents/ui/NotificationDelegate/NotificationDelegate.qml b/plasma/applets/notifications/contents/ui/NotificationDelegate/NotificationDelegate.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/NotificationDelegate/NotificationDelegate.qml rename to plasma/applets/notifications/contents/ui/NotificationDelegate/NotificationDelegate.qml diff --git a/plasma/generic/applets/notifications/contents/ui/NotificationDelegate/qmldir b/plasma/applets/notifications/contents/ui/NotificationDelegate/qmldir similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/NotificationDelegate/qmldir rename to plasma/applets/notifications/contents/ui/NotificationDelegate/qmldir diff --git a/plasma/generic/applets/notifications/contents/ui/NotificationIcon.qml b/plasma/applets/notifications/contents/ui/NotificationIcon.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/NotificationIcon.qml rename to plasma/applets/notifications/contents/ui/NotificationIcon.qml diff --git a/plasma/generic/applets/notifications/contents/ui/Notifications.qml b/plasma/applets/notifications/contents/ui/Notifications.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/Notifications.qml rename to plasma/applets/notifications/contents/ui/Notifications.qml diff --git a/plasma/generic/applets/notifications/contents/ui/Title.qml b/plasma/applets/notifications/contents/ui/Title.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/Title.qml rename to plasma/applets/notifications/contents/ui/Title.qml diff --git a/plasma/generic/applets/notifications/contents/ui/config.ui b/plasma/applets/notifications/contents/ui/config.ui similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/config.ui rename to plasma/applets/notifications/contents/ui/config.ui diff --git a/plasma/generic/applets/notifications/contents/ui/main.qml b/plasma/applets/notifications/contents/ui/main.qml similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/main.qml rename to plasma/applets/notifications/contents/ui/main.qml diff --git a/plasma/generic/applets/notifications/contents/ui/uiproperties.js b/plasma/applets/notifications/contents/ui/uiproperties.js similarity index 100% rename from plasma/generic/applets/notifications/contents/ui/uiproperties.js rename to plasma/applets/notifications/contents/ui/uiproperties.js diff --git a/plasma/generic/applets/notifications/metadata.desktop b/plasma/applets/notifications/metadata.desktop similarity index 100% rename from plasma/generic/applets/notifications/metadata.desktop rename to plasma/applets/notifications/metadata.desktop diff --git a/plasma/desktop/applets/pager/CMakeLists.txt b/plasma/applets/pager/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/pager/CMakeLists.txt rename to plasma/applets/pager/CMakeLists.txt diff --git a/plasma/desktop/applets/pager/Messages.sh b/plasma/applets/pager/Messages.sh similarity index 100% rename from plasma/desktop/applets/pager/Messages.sh rename to plasma/applets/pager/Messages.sh diff --git a/plasma/desktop/applets/pager/model.cpp b/plasma/applets/pager/model.cpp similarity index 100% rename from plasma/desktop/applets/pager/model.cpp rename to plasma/applets/pager/model.cpp diff --git a/plasma/desktop/applets/pager/model.h b/plasma/applets/pager/model.h similarity index 100% rename from plasma/desktop/applets/pager/model.h rename to plasma/applets/pager/model.h diff --git a/plasma/desktop/applets/pager/package/contents/ui/main.qml b/plasma/applets/pager/package/contents/ui/main.qml similarity index 100% rename from plasma/desktop/applets/pager/package/contents/ui/main.qml rename to plasma/applets/pager/package/contents/ui/main.qml diff --git a/plasma/desktop/applets/pager/package/contents/ui/utils.js b/plasma/applets/pager/package/contents/ui/utils.js similarity index 100% rename from plasma/desktop/applets/pager/package/contents/ui/utils.js rename to plasma/applets/pager/package/contents/ui/utils.js diff --git a/plasma/desktop/applets/pager/package/metadata.desktop b/plasma/applets/pager/package/metadata.desktop similarity index 100% rename from plasma/desktop/applets/pager/package/metadata.desktop rename to plasma/applets/pager/package/metadata.desktop diff --git a/plasma/desktop/applets/pager/pager.cpp b/plasma/applets/pager/pager.cpp similarity index 100% rename from plasma/desktop/applets/pager/pager.cpp rename to plasma/applets/pager/pager.cpp diff --git a/plasma/desktop/applets/pager/pager.h b/plasma/applets/pager/pager.h similarity index 100% rename from plasma/desktop/applets/pager/pager.h rename to plasma/applets/pager/pager.h diff --git a/plasma/desktop/applets/pager/pagerConfig.ui b/plasma/applets/pager/pagerConfig.ui similarity index 100% rename from plasma/desktop/applets/pager/pagerConfig.ui rename to plasma/applets/pager/pagerConfig.ui diff --git a/plasma/desktop/applets/pager/plasma-pager-default.desktop b/plasma/applets/pager/plasma-pager-default.desktop similarity index 100% rename from plasma/desktop/applets/pager/plasma-pager-default.desktop rename to plasma/applets/pager/plasma-pager-default.desktop diff --git a/plasma/generic/applets/panelspacer/CMakeLists.txt b/plasma/applets/panelspacer/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/panelspacer/CMakeLists.txt rename to plasma/applets/panelspacer/CMakeLists.txt diff --git a/plasma/generic/applets/panelspacer/Messages.sh b/plasma/applets/panelspacer/Messages.sh similarity index 100% rename from plasma/generic/applets/panelspacer/Messages.sh rename to plasma/applets/panelspacer/Messages.sh diff --git a/plasma/generic/applets/panelspacer/panelspacer.cpp b/plasma/applets/panelspacer/panelspacer.cpp similarity index 100% rename from plasma/generic/applets/panelspacer/panelspacer.cpp rename to plasma/applets/panelspacer/panelspacer.cpp diff --git a/plasma/generic/applets/panelspacer/panelspacer.h b/plasma/applets/panelspacer/panelspacer.h similarity index 100% rename from plasma/generic/applets/panelspacer/panelspacer.h rename to plasma/applets/panelspacer/panelspacer.h diff --git a/plasma/generic/applets/panelspacer/plasma-applet-panelspacer-internal.desktop b/plasma/applets/panelspacer/plasma-applet-panelspacer-internal.desktop similarity index 100% rename from plasma/generic/applets/panelspacer/plasma-applet-panelspacer-internal.desktop rename to plasma/applets/panelspacer/plasma-applet-panelspacer-internal.desktop diff --git a/plasma/generic/applets/quicklaunch/CMakeLists.txt b/plasma/applets/quicklaunch/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/quicklaunch/CMakeLists.txt rename to plasma/applets/quicklaunch/CMakeLists.txt diff --git a/plasma/generic/applets/quicklaunch/Messages.sh b/plasma/applets/quicklaunch/Messages.sh similarity index 100% rename from plasma/generic/applets/quicklaunch/Messages.sh rename to plasma/applets/quicklaunch/Messages.sh diff --git a/plasma/generic/applets/quicklaunch/icongridlayout.cpp b/plasma/applets/quicklaunch/icongridlayout.cpp similarity index 100% rename from plasma/generic/applets/quicklaunch/icongridlayout.cpp rename to plasma/applets/quicklaunch/icongridlayout.cpp diff --git a/plasma/generic/applets/quicklaunch/icongridlayout.h b/plasma/applets/quicklaunch/icongridlayout.h similarity index 100% rename from plasma/generic/applets/quicklaunch/icongridlayout.h rename to plasma/applets/quicklaunch/icongridlayout.h diff --git a/plasma/generic/applets/quicklaunch/launcher.cpp b/plasma/applets/quicklaunch/launcher.cpp similarity index 100% rename from plasma/generic/applets/quicklaunch/launcher.cpp rename to plasma/applets/quicklaunch/launcher.cpp diff --git a/plasma/generic/applets/quicklaunch/launcher.h b/plasma/applets/quicklaunch/launcher.h similarity index 100% rename from plasma/generic/applets/quicklaunch/launcher.h rename to plasma/applets/quicklaunch/launcher.h diff --git a/plasma/generic/applets/quicklaunch/launcherdata.cpp b/plasma/applets/quicklaunch/launcherdata.cpp similarity index 100% rename from plasma/generic/applets/quicklaunch/launcherdata.cpp rename to plasma/applets/quicklaunch/launcherdata.cpp diff --git a/plasma/generic/applets/quicklaunch/launcherdata.h b/plasma/applets/quicklaunch/launcherdata.h similarity index 100% rename from plasma/generic/applets/quicklaunch/launcherdata.h rename to plasma/applets/quicklaunch/launcherdata.h diff --git a/plasma/generic/applets/quicklaunch/launchergrid.cpp b/plasma/applets/quicklaunch/launchergrid.cpp similarity index 100% rename from plasma/generic/applets/quicklaunch/launchergrid.cpp rename to plasma/applets/quicklaunch/launchergrid.cpp diff --git a/plasma/generic/applets/quicklaunch/launchergrid.h b/plasma/applets/quicklaunch/launchergrid.h similarity index 100% rename from plasma/generic/applets/quicklaunch/launchergrid.h rename to plasma/applets/quicklaunch/launchergrid.h diff --git a/plasma/generic/applets/quicklaunch/plasma-applet-quicklaunch.desktop b/plasma/applets/quicklaunch/plasma-applet-quicklaunch.desktop similarity index 100% rename from plasma/generic/applets/quicklaunch/plasma-applet-quicklaunch.desktop rename to plasma/applets/quicklaunch/plasma-applet-quicklaunch.desktop diff --git a/plasma/generic/applets/quicklaunch/popup.cpp b/plasma/applets/quicklaunch/popup.cpp similarity index 100% rename from plasma/generic/applets/quicklaunch/popup.cpp rename to plasma/applets/quicklaunch/popup.cpp diff --git a/plasma/generic/applets/quicklaunch/popup.h b/plasma/applets/quicklaunch/popup.h similarity index 100% rename from plasma/generic/applets/quicklaunch/popup.h rename to plasma/applets/quicklaunch/popup.h diff --git a/plasma/generic/applets/quicklaunch/popuplauncherlist.cpp b/plasma/applets/quicklaunch/popuplauncherlist.cpp similarity index 100% rename from plasma/generic/applets/quicklaunch/popuplauncherlist.cpp rename to plasma/applets/quicklaunch/popuplauncherlist.cpp diff --git a/plasma/generic/applets/quicklaunch/popuplauncherlist.h b/plasma/applets/quicklaunch/popuplauncherlist.h similarity index 100% rename from plasma/generic/applets/quicklaunch/popuplauncherlist.h rename to plasma/applets/quicklaunch/popuplauncherlist.h diff --git a/plasma/generic/applets/quicklaunch/quicklaunch.cpp b/plasma/applets/quicklaunch/quicklaunch.cpp similarity index 100% rename from plasma/generic/applets/quicklaunch/quicklaunch.cpp rename to plasma/applets/quicklaunch/quicklaunch.cpp diff --git a/plasma/generic/applets/quicklaunch/quicklaunch.h b/plasma/applets/quicklaunch/quicklaunch.h similarity index 100% rename from plasma/generic/applets/quicklaunch/quicklaunch.h rename to plasma/applets/quicklaunch/quicklaunch.h diff --git a/plasma/generic/applets/quicklaunch/quicklaunchConfig.ui b/plasma/applets/quicklaunch/quicklaunchConfig.ui similarity index 100% rename from plasma/generic/applets/quicklaunch/quicklaunchConfig.ui rename to plasma/applets/quicklaunch/quicklaunchConfig.ui diff --git a/plasma/generic/applets/system-monitor/CMakeLists.txt b/plasma/applets/system-monitor/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/system-monitor/CMakeLists.txt rename to plasma/applets/system-monitor/CMakeLists.txt diff --git a/plasma/generic/applets/system-monitor/Messages.sh b/plasma/applets/system-monitor/Messages.sh similarity index 100% rename from plasma/generic/applets/system-monitor/Messages.sh rename to plasma/applets/system-monitor/Messages.sh diff --git a/plasma/generic/applets/system-monitor/applet.cpp b/plasma/applets/system-monitor/applet.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/applet.cpp rename to plasma/applets/system-monitor/applet.cpp diff --git a/plasma/generic/applets/system-monitor/applet.h b/plasma/applets/system-monitor/applet.h similarity index 100% rename from plasma/generic/applets/system-monitor/applet.h rename to plasma/applets/system-monitor/applet.h diff --git a/plasma/generic/applets/system-monitor/cpu-config.ui b/plasma/applets/system-monitor/cpu-config.ui similarity index 100% rename from plasma/generic/applets/system-monitor/cpu-config.ui rename to plasma/applets/system-monitor/cpu-config.ui diff --git a/plasma/generic/applets/system-monitor/cpu.cpp b/plasma/applets/system-monitor/cpu.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/cpu.cpp rename to plasma/applets/system-monitor/cpu.cpp diff --git a/plasma/generic/applets/system-monitor/cpu.h b/plasma/applets/system-monitor/cpu.h similarity index 100% rename from plasma/generic/applets/system-monitor/cpu.h rename to plasma/applets/system-monitor/cpu.h diff --git a/plasma/generic/applets/system-monitor/hdd-config.ui b/plasma/applets/system-monitor/hdd-config.ui similarity index 100% rename from plasma/generic/applets/system-monitor/hdd-config.ui rename to plasma/applets/system-monitor/hdd-config.ui diff --git a/plasma/generic/applets/system-monitor/hdd.cpp b/plasma/applets/system-monitor/hdd.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/hdd.cpp rename to plasma/applets/system-monitor/hdd.cpp diff --git a/plasma/generic/applets/system-monitor/hdd.h b/plasma/applets/system-monitor/hdd.h similarity index 100% rename from plasma/generic/applets/system-monitor/hdd.h rename to plasma/applets/system-monitor/hdd.h diff --git a/plasma/generic/applets/system-monitor/hdd_activity-config.ui b/plasma/applets/system-monitor/hdd_activity-config.ui similarity index 100% rename from plasma/generic/applets/system-monitor/hdd_activity-config.ui rename to plasma/applets/system-monitor/hdd_activity-config.ui diff --git a/plasma/generic/applets/system-monitor/hdd_activity.cpp b/plasma/applets/system-monitor/hdd_activity.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/hdd_activity.cpp rename to plasma/applets/system-monitor/hdd_activity.cpp diff --git a/plasma/generic/applets/system-monitor/hdd_activity.h b/plasma/applets/system-monitor/hdd_activity.h similarity index 100% rename from plasma/generic/applets/system-monitor/hdd_activity.h rename to plasma/applets/system-monitor/hdd_activity.h diff --git a/plasma/generic/applets/system-monitor/hdd_panel.svgz b/plasma/applets/system-monitor/hdd_panel.svgz similarity index 100% rename from plasma/generic/applets/system-monitor/hdd_panel.svgz rename to plasma/applets/system-monitor/hdd_panel.svgz diff --git a/plasma/generic/applets/system-monitor/hwinfo.cpp b/plasma/applets/system-monitor/hwinfo.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/hwinfo.cpp rename to plasma/applets/system-monitor/hwinfo.cpp diff --git a/plasma/generic/applets/system-monitor/hwinfo.h b/plasma/applets/system-monitor/hwinfo.h similarity index 100% rename from plasma/generic/applets/system-monitor/hwinfo.h rename to plasma/applets/system-monitor/hwinfo.h diff --git a/plasma/generic/applets/system-monitor/monitorbutton.cpp b/plasma/applets/system-monitor/monitorbutton.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/monitorbutton.cpp rename to plasma/applets/system-monitor/monitorbutton.cpp diff --git a/plasma/generic/applets/system-monitor/monitorbutton.h b/plasma/applets/system-monitor/monitorbutton.h similarity index 100% rename from plasma/generic/applets/system-monitor/monitorbutton.h rename to plasma/applets/system-monitor/monitorbutton.h diff --git a/plasma/generic/applets/system-monitor/monitoricon.cpp b/plasma/applets/system-monitor/monitoricon.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/monitoricon.cpp rename to plasma/applets/system-monitor/monitoricon.cpp diff --git a/plasma/generic/applets/system-monitor/monitoricon.h b/plasma/applets/system-monitor/monitoricon.h similarity index 100% rename from plasma/generic/applets/system-monitor/monitoricon.h rename to plasma/applets/system-monitor/monitoricon.h diff --git a/plasma/generic/applets/system-monitor/net-config.ui b/plasma/applets/system-monitor/net-config.ui similarity index 100% rename from plasma/generic/applets/system-monitor/net-config.ui rename to plasma/applets/system-monitor/net-config.ui diff --git a/plasma/generic/applets/system-monitor/net.cpp b/plasma/applets/system-monitor/net.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/net.cpp rename to plasma/applets/system-monitor/net.cpp diff --git a/plasma/generic/applets/system-monitor/net.h b/plasma/applets/system-monitor/net.h similarity index 100% rename from plasma/generic/applets/system-monitor/net.h rename to plasma/applets/system-monitor/net.h diff --git a/plasma/generic/applets/system-monitor/plasma-applet-sm_cpu.desktop b/plasma/applets/system-monitor/plasma-applet-sm_cpu.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-sm_cpu.desktop rename to plasma/applets/system-monitor/plasma-applet-sm_cpu.desktop diff --git a/plasma/generic/applets/system-monitor/plasma-applet-sm_hdd.desktop b/plasma/applets/system-monitor/plasma-applet-sm_hdd.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-sm_hdd.desktop rename to plasma/applets/system-monitor/plasma-applet-sm_hdd.desktop diff --git a/plasma/generic/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop b/plasma/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop rename to plasma/applets/system-monitor/plasma-applet-sm_hdd_activity.desktop diff --git a/plasma/generic/applets/system-monitor/plasma-applet-sm_hwinfo.desktop b/plasma/applets/system-monitor/plasma-applet-sm_hwinfo.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-sm_hwinfo.desktop rename to plasma/applets/system-monitor/plasma-applet-sm_hwinfo.desktop diff --git a/plasma/generic/applets/system-monitor/plasma-applet-sm_net.desktop b/plasma/applets/system-monitor/plasma-applet-sm_net.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-sm_net.desktop rename to plasma/applets/system-monitor/plasma-applet-sm_net.desktop diff --git a/plasma/generic/applets/system-monitor/plasma-applet-sm_ram.desktop b/plasma/applets/system-monitor/plasma-applet-sm_ram.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-sm_ram.desktop rename to plasma/applets/system-monitor/plasma-applet-sm_ram.desktop diff --git a/plasma/generic/applets/system-monitor/plasma-applet-sm_temperature.desktop b/plasma/applets/system-monitor/plasma-applet-sm_temperature.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-sm_temperature.desktop rename to plasma/applets/system-monitor/plasma-applet-sm_temperature.desktop diff --git a/plasma/generic/applets/system-monitor/plasma-applet-system-monitor.desktop b/plasma/applets/system-monitor/plasma-applet-system-monitor.desktop similarity index 100% rename from plasma/generic/applets/system-monitor/plasma-applet-system-monitor.desktop rename to plasma/applets/system-monitor/plasma-applet-system-monitor.desktop diff --git a/plasma/generic/applets/system-monitor/plotter.cpp b/plasma/applets/system-monitor/plotter.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/plotter.cpp rename to plasma/applets/system-monitor/plotter.cpp diff --git a/plasma/generic/applets/system-monitor/plotter.h b/plasma/applets/system-monitor/plotter.h similarity index 100% rename from plasma/generic/applets/system-monitor/plotter.h rename to plasma/applets/system-monitor/plotter.h diff --git a/plasma/generic/applets/system-monitor/ram-config.ui b/plasma/applets/system-monitor/ram-config.ui similarity index 100% rename from plasma/generic/applets/system-monitor/ram-config.ui rename to plasma/applets/system-monitor/ram-config.ui diff --git a/plasma/generic/applets/system-monitor/ram.cpp b/plasma/applets/system-monitor/ram.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/ram.cpp rename to plasma/applets/system-monitor/ram.cpp diff --git a/plasma/generic/applets/system-monitor/ram.h b/plasma/applets/system-monitor/ram.h similarity index 100% rename from plasma/generic/applets/system-monitor/ram.h rename to plasma/applets/system-monitor/ram.h diff --git a/plasma/generic/applets/system-monitor/sm_export.h b/plasma/applets/system-monitor/sm_export.h similarity index 100% rename from plasma/generic/applets/system-monitor/sm_export.h rename to plasma/applets/system-monitor/sm_export.h diff --git a/plasma/generic/applets/system-monitor/system-monitor.cpp b/plasma/applets/system-monitor/system-monitor.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/system-monitor.cpp rename to plasma/applets/system-monitor/system-monitor.cpp diff --git a/plasma/generic/applets/system-monitor/system-monitor.h b/plasma/applets/system-monitor/system-monitor.h similarity index 100% rename from plasma/generic/applets/system-monitor/system-monitor.h rename to plasma/applets/system-monitor/system-monitor.h diff --git a/plasma/generic/applets/system-monitor/temperature-config.ui b/plasma/applets/system-monitor/temperature-config.ui similarity index 100% rename from plasma/generic/applets/system-monitor/temperature-config.ui rename to plasma/applets/system-monitor/temperature-config.ui diff --git a/plasma/generic/applets/system-monitor/temperature-offset-delegate.cpp b/plasma/applets/system-monitor/temperature-offset-delegate.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/temperature-offset-delegate.cpp rename to plasma/applets/system-monitor/temperature-offset-delegate.cpp diff --git a/plasma/generic/applets/system-monitor/temperature-offset-delegate.h b/plasma/applets/system-monitor/temperature-offset-delegate.h similarity index 100% rename from plasma/generic/applets/system-monitor/temperature-offset-delegate.h rename to plasma/applets/system-monitor/temperature-offset-delegate.h diff --git a/plasma/generic/applets/system-monitor/temperature.cpp b/plasma/applets/system-monitor/temperature.cpp similarity index 100% rename from plasma/generic/applets/system-monitor/temperature.cpp rename to plasma/applets/system-monitor/temperature.cpp diff --git a/plasma/generic/applets/system-monitor/temperature.h b/plasma/applets/system-monitor/temperature.h similarity index 100% rename from plasma/generic/applets/system-monitor/temperature.h rename to plasma/applets/system-monitor/temperature.h diff --git a/plasma/generic/applets/systemtray/CMakeLists.txt b/plasma/applets/systemtray/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/systemtray/CMakeLists.txt rename to plasma/applets/systemtray/CMakeLists.txt diff --git a/plasma/generic/applets/systemtray/Messages.sh b/plasma/applets/systemtray/Messages.sh similarity index 100% rename from plasma/generic/applets/systemtray/Messages.sh rename to plasma/applets/systemtray/Messages.sh diff --git a/plasma/generic/applets/systemtray/TODO b/plasma/applets/systemtray/TODO similarity index 100% rename from plasma/generic/applets/systemtray/TODO rename to plasma/applets/systemtray/TODO diff --git a/plasma/generic/applets/systemtray/config.h.in b/plasma/applets/systemtray/config.h.in similarity index 100% rename from plasma/generic/applets/systemtray/config.h.in rename to plasma/applets/systemtray/config.h.in diff --git a/plasma/generic/applets/systemtray/core/manager.cpp b/plasma/applets/systemtray/core/manager.cpp similarity index 100% rename from plasma/generic/applets/systemtray/core/manager.cpp rename to plasma/applets/systemtray/core/manager.cpp diff --git a/plasma/generic/applets/systemtray/core/manager.h b/plasma/applets/systemtray/core/manager.h similarity index 100% rename from plasma/generic/applets/systemtray/core/manager.h rename to plasma/applets/systemtray/core/manager.h diff --git a/plasma/generic/applets/systemtray/core/protocol.cpp b/plasma/applets/systemtray/core/protocol.cpp similarity index 100% rename from plasma/generic/applets/systemtray/core/protocol.cpp rename to plasma/applets/systemtray/core/protocol.cpp diff --git a/plasma/generic/applets/systemtray/core/protocol.h b/plasma/applets/systemtray/core/protocol.h similarity index 100% rename from plasma/generic/applets/systemtray/core/protocol.h rename to plasma/applets/systemtray/core/protocol.h diff --git a/plasma/generic/applets/systemtray/core/task.cpp b/plasma/applets/systemtray/core/task.cpp similarity index 100% rename from plasma/generic/applets/systemtray/core/task.cpp rename to plasma/applets/systemtray/core/task.cpp diff --git a/plasma/generic/applets/systemtray/core/task.h b/plasma/applets/systemtray/core/task.h similarity index 100% rename from plasma/generic/applets/systemtray/core/task.h rename to plasma/applets/systemtray/core/task.h diff --git a/plasma/generic/applets/systemtray/package/contents/code/IconsList.js b/plasma/applets/systemtray/package/contents/code/IconsList.js similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/code/IconsList.js rename to plasma/applets/systemtray/package/contents/code/IconsList.js diff --git a/plasma/generic/applets/systemtray/package/contents/code/TasksSet.js b/plasma/applets/systemtray/package/contents/code/TasksSet.js similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/code/TasksSet.js rename to plasma/applets/systemtray/package/contents/code/TasksSet.js diff --git a/plasma/generic/applets/systemtray/package/contents/code/main.js b/plasma/applets/systemtray/package/contents/code/main.js similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/code/main.js rename to plasma/applets/systemtray/package/contents/code/main.js diff --git a/plasma/generic/applets/systemtray/package/contents/ui/ArrowArea.qml b/plasma/applets/systemtray/package/contents/ui/ArrowArea.qml similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/ui/ArrowArea.qml rename to plasma/applets/systemtray/package/contents/ui/ArrowArea.qml diff --git a/plasma/generic/applets/systemtray/package/contents/ui/IconsGrid.qml b/plasma/applets/systemtray/package/contents/ui/IconsGrid.qml similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/ui/IconsGrid.qml rename to plasma/applets/systemtray/package/contents/ui/IconsGrid.qml diff --git a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml b/plasma/applets/systemtray/package/contents/ui/IconsList.qml similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml rename to plasma/applets/systemtray/package/contents/ui/IconsList.qml diff --git a/plasma/generic/applets/systemtray/package/contents/ui/StatusNotifierItem.qml b/plasma/applets/systemtray/package/contents/ui/StatusNotifierItem.qml similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/ui/StatusNotifierItem.qml rename to plasma/applets/systemtray/package/contents/ui/StatusNotifierItem.qml diff --git a/plasma/generic/applets/systemtray/package/contents/ui/TrayIcon.qml b/plasma/applets/systemtray/package/contents/ui/TrayIcon.qml similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/ui/TrayIcon.qml rename to plasma/applets/systemtray/package/contents/ui/TrayIcon.qml diff --git a/plasma/generic/applets/systemtray/package/contents/ui/main.qml b/plasma/applets/systemtray/package/contents/ui/main.qml similarity index 100% rename from plasma/generic/applets/systemtray/package/contents/ui/main.qml rename to plasma/applets/systemtray/package/contents/ui/main.qml diff --git a/plasma/generic/applets/systemtray/plasma-applet-systemtray.desktop b/plasma/applets/systemtray/plasma-applet-systemtray.desktop similarity index 100% rename from plasma/generic/applets/systemtray/plasma-applet-systemtray.desktop rename to plasma/applets/systemtray/plasma-applet-systemtray.desktop diff --git a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.cpp b/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.cpp rename to plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.cpp diff --git a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.h b/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.h rename to plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.h diff --git a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp b/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp rename to plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.cpp diff --git a/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.h b/plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.h rename to plasma/applets/systemtray/protocols/dbussystemtray/dbussystemtraytask.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp b/plasma/applets/systemtray/protocols/fdo/fdographicswidget.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp rename to plasma/applets/systemtray/protocols/fdo/fdographicswidget.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.h b/plasma/applets/systemtray/protocols/fdo/fdographicswidget.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.h rename to plasma/applets/systemtray/protocols/fdo/fdographicswidget.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdonotification.cpp b/plasma/applets/systemtray/protocols/fdo/fdonotification.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdonotification.cpp rename to plasma/applets/systemtray/protocols/fdo/fdonotification.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdonotification.h b/plasma/applets/systemtray/protocols/fdo/fdonotification.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdonotification.h rename to plasma/applets/systemtray/protocols/fdo/fdonotification.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdoprotocol.cpp b/plasma/applets/systemtray/protocols/fdo/fdoprotocol.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdoprotocol.cpp rename to plasma/applets/systemtray/protocols/fdo/fdoprotocol.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdoprotocol.h b/plasma/applets/systemtray/protocols/fdo/fdoprotocol.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdoprotocol.h rename to plasma/applets/systemtray/protocols/fdo/fdoprotocol.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp b/plasma/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp rename to plasma/applets/systemtray/protocols/fdo/fdoselectionmanager.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.h b/plasma/applets/systemtray/protocols/fdo/fdoselectionmanager.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdoselectionmanager.h rename to plasma/applets/systemtray/protocols/fdo/fdoselectionmanager.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdotask.cpp b/plasma/applets/systemtray/protocols/fdo/fdotask.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdotask.cpp rename to plasma/applets/systemtray/protocols/fdo/fdotask.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdotask.h b/plasma/applets/systemtray/protocols/fdo/fdotask.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/fdotask.h rename to plasma/applets/systemtray/protocols/fdo/fdotask.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/applets/systemtray/protocols/fdo/x11embedcontainer.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp rename to plasma/applets/systemtray/protocols/fdo/x11embedcontainer.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h b/plasma/applets/systemtray/protocols/fdo/x11embedcontainer.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.h rename to plasma/applets/systemtray/protocols/fdo/x11embedcontainer.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embeddelegate.cpp b/plasma/applets/systemtray/protocols/fdo/x11embeddelegate.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/x11embeddelegate.cpp rename to plasma/applets/systemtray/protocols/fdo/x11embeddelegate.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embeddelegate.h b/plasma/applets/systemtray/protocols/fdo/x11embeddelegate.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/x11embeddelegate.h rename to plasma/applets/systemtray/protocols/fdo/x11embeddelegate.h diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.cpp b/plasma/applets/systemtray/protocols/fdo/x11embedpainter.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.cpp rename to plasma/applets/systemtray/protocols/fdo/x11embedpainter.cpp diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.h b/plasma/applets/systemtray/protocols/fdo/x11embedpainter.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/fdo/x11embedpainter.h rename to plasma/applets/systemtray/protocols/fdo/x11embedpainter.h diff --git a/plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtask.cpp b/plasma/applets/systemtray/protocols/plasmoid/plasmoidtask.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtask.cpp rename to plasma/applets/systemtray/protocols/plasmoid/plasmoidtask.cpp diff --git a/plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtask.h b/plasma/applets/systemtray/protocols/plasmoid/plasmoidtask.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtask.h rename to plasma/applets/systemtray/protocols/plasmoid/plasmoidtask.h diff --git a/plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.cpp b/plasma/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.cpp similarity index 100% rename from plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.cpp rename to plasma/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.cpp diff --git a/plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.h b/plasma/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.h similarity index 100% rename from plasma/generic/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.h rename to plasma/applets/systemtray/protocols/plasmoid/plasmoidtaskprotocol.h diff --git a/plasma/generic/applets/systemtray/ui/applet.cpp b/plasma/applets/systemtray/ui/applet.cpp similarity index 100% rename from plasma/generic/applets/systemtray/ui/applet.cpp rename to plasma/applets/systemtray/ui/applet.cpp diff --git a/plasma/generic/applets/systemtray/ui/applet.h b/plasma/applets/systemtray/ui/applet.h similarity index 100% rename from plasma/generic/applets/systemtray/ui/applet.h rename to plasma/applets/systemtray/ui/applet.h diff --git a/plasma/generic/applets/systemtray/ui/autohide.ui b/plasma/applets/systemtray/ui/autohide.ui similarity index 100% rename from plasma/generic/applets/systemtray/ui/autohide.ui rename to plasma/applets/systemtray/ui/autohide.ui diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp b/plasma/applets/systemtray/ui/mouseredirectarea.cpp similarity index 100% rename from plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp rename to plasma/applets/systemtray/ui/mouseredirectarea.cpp diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h b/plasma/applets/systemtray/ui/mouseredirectarea.h similarity index 100% rename from plasma/generic/applets/systemtray/ui/mouseredirectarea.h rename to plasma/applets/systemtray/ui/mouseredirectarea.h diff --git a/plasma/generic/applets/systemtray/ui/visibleitems.ui b/plasma/applets/systemtray/ui/visibleitems.ui similarity index 100% rename from plasma/generic/applets/systemtray/ui/visibleitems.ui rename to plasma/applets/systemtray/ui/visibleitems.ui diff --git a/plasma/generic/applets/systemtray/ui/widgetitem.cpp b/plasma/applets/systemtray/ui/widgetitem.cpp similarity index 100% rename from plasma/generic/applets/systemtray/ui/widgetitem.cpp rename to plasma/applets/systemtray/ui/widgetitem.cpp diff --git a/plasma/generic/applets/systemtray/ui/widgetitem.h b/plasma/applets/systemtray/ui/widgetitem.h similarity index 100% rename from plasma/generic/applets/systemtray/ui/widgetitem.h rename to plasma/applets/systemtray/ui/widgetitem.h diff --git a/plasma/desktop/applets/tasks/CMakeLists.txt b/plasma/applets/tasks/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/tasks/CMakeLists.txt rename to plasma/applets/tasks/CMakeLists.txt diff --git a/plasma/desktop/applets/tasks/Messages.sh b/plasma/applets/tasks/Messages.sh similarity index 100% rename from plasma/desktop/applets/tasks/Messages.sh rename to plasma/applets/tasks/Messages.sh diff --git a/plasma/desktop/applets/tasks/package/contents/code/layout.js b/plasma/applets/tasks/package/contents/code/layout.js similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/code/layout.js rename to plasma/applets/tasks/package/contents/code/layout.js diff --git a/plasma/desktop/applets/tasks/package/contents/code/tools.js b/plasma/applets/tasks/package/contents/code/tools.js similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/code/tools.js rename to plasma/applets/tasks/package/contents/code/tools.js diff --git a/plasma/desktop/applets/tasks/package/contents/ui/GroupDialog.qml b/plasma/applets/tasks/package/contents/ui/GroupDialog.qml similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/ui/GroupDialog.qml rename to plasma/applets/tasks/package/contents/ui/GroupDialog.qml diff --git a/plasma/desktop/applets/tasks/package/contents/ui/GroupExpanderOverlay.qml b/plasma/applets/tasks/package/contents/ui/GroupExpanderOverlay.qml similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/ui/GroupExpanderOverlay.qml rename to plasma/applets/tasks/package/contents/ui/GroupExpanderOverlay.qml diff --git a/plasma/desktop/applets/tasks/package/contents/ui/MouseHandler.qml b/plasma/applets/tasks/package/contents/ui/MouseHandler.qml similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/ui/MouseHandler.qml rename to plasma/applets/tasks/package/contents/ui/MouseHandler.qml diff --git a/plasma/desktop/applets/tasks/package/contents/ui/Task.qml b/plasma/applets/tasks/package/contents/ui/Task.qml similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/ui/Task.qml rename to plasma/applets/tasks/package/contents/ui/Task.qml diff --git a/plasma/desktop/applets/tasks/package/contents/ui/TaskList.qml b/plasma/applets/tasks/package/contents/ui/TaskList.qml similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/ui/TaskList.qml rename to plasma/applets/tasks/package/contents/ui/TaskList.qml diff --git a/plasma/desktop/applets/tasks/package/contents/ui/main.qml b/plasma/applets/tasks/package/contents/ui/main.qml similarity index 100% rename from plasma/desktop/applets/tasks/package/contents/ui/main.qml rename to plasma/applets/tasks/package/contents/ui/main.qml diff --git a/plasma/desktop/applets/tasks/package/metadata.desktop b/plasma/applets/tasks/package/metadata.desktop similarity index 100% rename from plasma/desktop/applets/tasks/package/metadata.desktop rename to plasma/applets/tasks/package/metadata.desktop diff --git a/plasma/desktop/applets/tasks/plasma-tasks-default.desktop b/plasma/applets/tasks/plasma-tasks-default.desktop similarity index 100% rename from plasma/desktop/applets/tasks/plasma-tasks-default.desktop rename to plasma/applets/tasks/plasma-tasks-default.desktop diff --git a/plasma/desktop/applets/tasks/support/declarativeitemcontainer.cpp b/plasma/applets/tasks/support/declarativeitemcontainer.cpp similarity index 100% rename from plasma/desktop/applets/tasks/support/declarativeitemcontainer.cpp rename to plasma/applets/tasks/support/declarativeitemcontainer.cpp diff --git a/plasma/desktop/applets/tasks/support/declarativeitemcontainer_p.h b/plasma/applets/tasks/support/declarativeitemcontainer_p.h similarity index 100% rename from plasma/desktop/applets/tasks/support/declarativeitemcontainer_p.h rename to plasma/applets/tasks/support/declarativeitemcontainer_p.h diff --git a/plasma/desktop/applets/tasks/support/draghelper.cpp b/plasma/applets/tasks/support/draghelper.cpp similarity index 100% rename from plasma/desktop/applets/tasks/support/draghelper.cpp rename to plasma/applets/tasks/support/draghelper.cpp diff --git a/plasma/desktop/applets/tasks/support/draghelper.h b/plasma/applets/tasks/support/draghelper.h similarity index 100% rename from plasma/desktop/applets/tasks/support/draghelper.h rename to plasma/applets/tasks/support/draghelper.h diff --git a/plasma/desktop/applets/tasks/support/textlabel.cpp b/plasma/applets/tasks/support/textlabel.cpp similarity index 100% rename from plasma/desktop/applets/tasks/support/textlabel.cpp rename to plasma/applets/tasks/support/textlabel.cpp diff --git a/plasma/desktop/applets/tasks/support/textlabel.h b/plasma/applets/tasks/support/textlabel.h similarity index 100% rename from plasma/desktop/applets/tasks/support/textlabel.h rename to plasma/applets/tasks/support/textlabel.h diff --git a/plasma/desktop/applets/tasks/support/tooltip.cpp b/plasma/applets/tasks/support/tooltip.cpp similarity index 100% rename from plasma/desktop/applets/tasks/support/tooltip.cpp rename to plasma/applets/tasks/support/tooltip.cpp diff --git a/plasma/desktop/applets/tasks/support/tooltip.h b/plasma/applets/tasks/support/tooltip.h similarity index 100% rename from plasma/desktop/applets/tasks/support/tooltip.h rename to plasma/applets/tasks/support/tooltip.h diff --git a/plasma/desktop/applets/tasks/tasks.cpp b/plasma/applets/tasks/tasks.cpp similarity index 100% rename from plasma/desktop/applets/tasks/tasks.cpp rename to plasma/applets/tasks/tasks.cpp diff --git a/plasma/desktop/applets/tasks/tasks.h b/plasma/applets/tasks/tasks.h similarity index 100% rename from plasma/desktop/applets/tasks/tasks.h rename to plasma/applets/tasks/tasks.h diff --git a/plasma/desktop/applets/tasks/tasksConfig.ui b/plasma/applets/tasks/tasksConfig.ui similarity index 100% rename from plasma/desktop/applets/tasks/tasksConfig.ui rename to plasma/applets/tasks/tasksConfig.ui diff --git a/plasma/desktop/applets/trash/CMakeLists.txt b/plasma/applets/trash/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/trash/CMakeLists.txt rename to plasma/applets/trash/CMakeLists.txt diff --git a/plasma/desktop/applets/trash/Messages.sh b/plasma/applets/trash/Messages.sh similarity index 100% rename from plasma/desktop/applets/trash/Messages.sh rename to plasma/applets/trash/Messages.sh diff --git a/plasma/desktop/applets/trash/plasma-applet-trash.desktop b/plasma/applets/trash/plasma-applet-trash.desktop similarity index 100% rename from plasma/desktop/applets/trash/plasma-applet-trash.desktop rename to plasma/applets/trash/plasma-applet-trash.desktop diff --git a/plasma/desktop/applets/trash/trash.cpp b/plasma/applets/trash/trash.cpp similarity index 100% rename from plasma/desktop/applets/trash/trash.cpp rename to plasma/applets/trash/trash.cpp diff --git a/plasma/desktop/applets/trash/trash.h b/plasma/applets/trash/trash.h similarity index 100% rename from plasma/desktop/applets/trash/trash.h rename to plasma/applets/trash/trash.h diff --git a/plasma/generic/applets/webbrowser/CMakeLists.txt b/plasma/applets/webbrowser/CMakeLists.txt similarity index 100% rename from plasma/generic/applets/webbrowser/CMakeLists.txt rename to plasma/applets/webbrowser/CMakeLists.txt diff --git a/plasma/generic/applets/webbrowser/Messages.sh b/plasma/applets/webbrowser/Messages.sh similarity index 100% rename from plasma/generic/applets/webbrowser/Messages.sh rename to plasma/applets/webbrowser/Messages.sh diff --git a/plasma/generic/applets/webbrowser/bookmarkitem.cpp b/plasma/applets/webbrowser/bookmarkitem.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/bookmarkitem.cpp rename to plasma/applets/webbrowser/bookmarkitem.cpp diff --git a/plasma/generic/applets/webbrowser/bookmarkitem.h b/plasma/applets/webbrowser/bookmarkitem.h similarity index 100% rename from plasma/generic/applets/webbrowser/bookmarkitem.h rename to plasma/applets/webbrowser/bookmarkitem.h diff --git a/plasma/generic/applets/webbrowser/bookmarksdelegate.cpp b/plasma/applets/webbrowser/bookmarksdelegate.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/bookmarksdelegate.cpp rename to plasma/applets/webbrowser/bookmarksdelegate.cpp diff --git a/plasma/generic/applets/webbrowser/bookmarksdelegate.h b/plasma/applets/webbrowser/bookmarksdelegate.h similarity index 100% rename from plasma/generic/applets/webbrowser/bookmarksdelegate.h rename to plasma/applets/webbrowser/bookmarksdelegate.h diff --git a/plasma/generic/applets/webbrowser/browserhistorycombobox.cpp b/plasma/applets/webbrowser/browserhistorycombobox.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/browserhistorycombobox.cpp rename to plasma/applets/webbrowser/browserhistorycombobox.cpp diff --git a/plasma/generic/applets/webbrowser/browserhistorycombobox.h b/plasma/applets/webbrowser/browserhistorycombobox.h similarity index 100% rename from plasma/generic/applets/webbrowser/browserhistorycombobox.h rename to plasma/applets/webbrowser/browserhistorycombobox.h diff --git a/plasma/generic/applets/webbrowser/browsermessagebox.cpp b/plasma/applets/webbrowser/browsermessagebox.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/browsermessagebox.cpp rename to plasma/applets/webbrowser/browsermessagebox.cpp diff --git a/plasma/generic/applets/webbrowser/browsermessagebox.h b/plasma/applets/webbrowser/browsermessagebox.h similarity index 100% rename from plasma/generic/applets/webbrowser/browsermessagebox.h rename to plasma/applets/webbrowser/browsermessagebox.h diff --git a/plasma/generic/applets/webbrowser/errorpage.cpp b/plasma/applets/webbrowser/errorpage.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/errorpage.cpp rename to plasma/applets/webbrowser/errorpage.cpp diff --git a/plasma/generic/applets/webbrowser/errorpage.h b/plasma/applets/webbrowser/errorpage.h similarity index 100% rename from plasma/generic/applets/webbrowser/errorpage.h rename to plasma/applets/webbrowser/errorpage.h diff --git a/plasma/generic/applets/webbrowser/plasma-applet-webbrowser.desktop b/plasma/applets/webbrowser/plasma-applet-webbrowser.desktop similarity index 100% rename from plasma/generic/applets/webbrowser/plasma-applet-webbrowser.desktop rename to plasma/applets/webbrowser/plasma-applet-webbrowser.desktop diff --git a/plasma/generic/applets/webbrowser/webbrowser.cpp b/plasma/applets/webbrowser/webbrowser.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/webbrowser.cpp rename to plasma/applets/webbrowser/webbrowser.cpp diff --git a/plasma/generic/applets/webbrowser/webbrowser.h b/plasma/applets/webbrowser/webbrowser.h similarity index 100% rename from plasma/generic/applets/webbrowser/webbrowser.h rename to plasma/applets/webbrowser/webbrowser.h diff --git a/plasma/generic/applets/webbrowser/webbrowserconfig.ui b/plasma/applets/webbrowser/webbrowserconfig.ui similarity index 100% rename from plasma/generic/applets/webbrowser/webbrowserconfig.ui rename to plasma/applets/webbrowser/webbrowserconfig.ui diff --git a/plasma/generic/applets/webbrowser/webbrowserpage.cpp b/plasma/applets/webbrowser/webbrowserpage.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/webbrowserpage.cpp rename to plasma/applets/webbrowser/webbrowserpage.cpp diff --git a/plasma/generic/applets/webbrowser/webbrowserpage.h b/plasma/applets/webbrowser/webbrowserpage.h similarity index 100% rename from plasma/generic/applets/webbrowser/webbrowserpage.h rename to plasma/applets/webbrowser/webbrowserpage.h diff --git a/plasma/generic/applets/webbrowser/webviewoverlay.cpp b/plasma/applets/webbrowser/webviewoverlay.cpp similarity index 100% rename from plasma/generic/applets/webbrowser/webviewoverlay.cpp rename to plasma/applets/webbrowser/webviewoverlay.cpp diff --git a/plasma/generic/applets/webbrowser/webviewoverlay.h b/plasma/applets/webbrowser/webviewoverlay.h similarity index 100% rename from plasma/generic/applets/webbrowser/webviewoverlay.h rename to plasma/applets/webbrowser/webviewoverlay.h diff --git a/plasma/desktop/applets/windowlist/CMakeLists.txt b/plasma/applets/windowlist/CMakeLists.txt similarity index 100% rename from plasma/desktop/applets/windowlist/CMakeLists.txt rename to plasma/applets/windowlist/CMakeLists.txt diff --git a/plasma/desktop/applets/windowlist/Messages.sh b/plasma/applets/windowlist/Messages.sh similarity index 100% rename from plasma/desktop/applets/windowlist/Messages.sh rename to plasma/applets/windowlist/Messages.sh diff --git a/plasma/desktop/applets/windowlist/WindowList.cpp b/plasma/applets/windowlist/WindowList.cpp similarity index 100% rename from plasma/desktop/applets/windowlist/WindowList.cpp rename to plasma/applets/windowlist/WindowList.cpp diff --git a/plasma/desktop/applets/windowlist/WindowList.h b/plasma/applets/windowlist/WindowList.h similarity index 100% rename from plasma/desktop/applets/windowlist/WindowList.h rename to plasma/applets/windowlist/WindowList.h diff --git a/plasma/desktop/applets/windowlist/plasma-applet-windowlist.desktop b/plasma/applets/windowlist/plasma-applet-windowlist.desktop similarity index 100% rename from plasma/desktop/applets/windowlist/plasma-applet-windowlist.desktop rename to plasma/applets/windowlist/plasma-applet-windowlist.desktop diff --git a/plasma/generic/containmentactions/CMakeLists.txt b/plasma/containmentactions/CMakeLists.txt similarity index 100% rename from plasma/generic/containmentactions/CMakeLists.txt rename to plasma/containmentactions/CMakeLists.txt diff --git a/plasma/generic/containmentactions/applauncher/CMakeLists.txt b/plasma/containmentactions/applauncher/CMakeLists.txt similarity index 100% rename from plasma/generic/containmentactions/applauncher/CMakeLists.txt rename to plasma/containmentactions/applauncher/CMakeLists.txt diff --git a/plasma/generic/containmentactions/applauncher/launch.cpp b/plasma/containmentactions/applauncher/launch.cpp similarity index 100% rename from plasma/generic/containmentactions/applauncher/launch.cpp rename to plasma/containmentactions/applauncher/launch.cpp diff --git a/plasma/generic/containmentactions/applauncher/launch.h b/plasma/containmentactions/applauncher/launch.h similarity index 100% rename from plasma/generic/containmentactions/applauncher/launch.h rename to plasma/containmentactions/applauncher/launch.h diff --git a/plasma/generic/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop b/plasma/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop similarity index 100% rename from plasma/generic/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop rename to plasma/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop diff --git a/plasma/generic/containmentactions/contextmenu/CMakeLists.txt b/plasma/containmentactions/contextmenu/CMakeLists.txt similarity index 100% rename from plasma/generic/containmentactions/contextmenu/CMakeLists.txt rename to plasma/containmentactions/contextmenu/CMakeLists.txt diff --git a/plasma/generic/containmentactions/contextmenu/Messages.sh b/plasma/containmentactions/contextmenu/Messages.sh similarity index 100% rename from plasma/generic/containmentactions/contextmenu/Messages.sh rename to plasma/containmentactions/contextmenu/Messages.sh diff --git a/plasma/generic/containmentactions/contextmenu/menu.cpp b/plasma/containmentactions/contextmenu/menu.cpp similarity index 100% rename from plasma/generic/containmentactions/contextmenu/menu.cpp rename to plasma/containmentactions/contextmenu/menu.cpp diff --git a/plasma/generic/containmentactions/contextmenu/menu.h b/plasma/containmentactions/contextmenu/menu.h similarity index 100% rename from plasma/generic/containmentactions/contextmenu/menu.h rename to plasma/containmentactions/contextmenu/menu.h diff --git a/plasma/generic/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop b/plasma/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop similarity index 100% rename from plasma/generic/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop rename to plasma/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop diff --git a/plasma/generic/containmentactions/minimalcontextmenu/CMakeLists.txt b/plasma/containmentactions/minimalcontextmenu/CMakeLists.txt similarity index 100% rename from plasma/generic/containmentactions/minimalcontextmenu/CMakeLists.txt rename to plasma/containmentactions/minimalcontextmenu/CMakeLists.txt diff --git a/plasma/generic/containmentactions/minimalcontextmenu/menu.cpp b/plasma/containmentactions/minimalcontextmenu/menu.cpp similarity index 100% rename from plasma/generic/containmentactions/minimalcontextmenu/menu.cpp rename to plasma/containmentactions/minimalcontextmenu/menu.cpp diff --git a/plasma/generic/containmentactions/minimalcontextmenu/menu.h b/plasma/containmentactions/minimalcontextmenu/menu.h similarity index 100% rename from plasma/generic/containmentactions/minimalcontextmenu/menu.h rename to plasma/containmentactions/minimalcontextmenu/menu.h diff --git a/plasma/generic/containmentactions/minimalcontextmenu/plasma-containmentactions-minimalcontextmenu.desktop b/plasma/containmentactions/minimalcontextmenu/plasma-containmentactions-minimalcontextmenu.desktop similarity index 100% rename from plasma/generic/containmentactions/minimalcontextmenu/plasma-containmentactions-minimalcontextmenu.desktop rename to plasma/containmentactions/minimalcontextmenu/plasma-containmentactions-minimalcontextmenu.desktop diff --git a/plasma/generic/containmentactions/paste/CMakeLists.txt b/plasma/containmentactions/paste/CMakeLists.txt similarity index 100% rename from plasma/generic/containmentactions/paste/CMakeLists.txt rename to plasma/containmentactions/paste/CMakeLists.txt diff --git a/plasma/generic/containmentactions/paste/paste.cpp b/plasma/containmentactions/paste/paste.cpp similarity index 100% rename from plasma/generic/containmentactions/paste/paste.cpp rename to plasma/containmentactions/paste/paste.cpp diff --git a/plasma/generic/containmentactions/paste/paste.h b/plasma/containmentactions/paste/paste.h similarity index 100% rename from plasma/generic/containmentactions/paste/paste.h rename to plasma/containmentactions/paste/paste.h diff --git a/plasma/generic/containmentactions/paste/plasma-containmentactions-paste.desktop b/plasma/containmentactions/paste/plasma-containmentactions-paste.desktop similarity index 100% rename from plasma/generic/containmentactions/paste/plasma-containmentactions-paste.desktop rename to plasma/containmentactions/paste/plasma-containmentactions-paste.desktop diff --git a/plasma/generic/containmentactions/switchdesktop/CMakeLists.txt b/plasma/containmentactions/switchdesktop/CMakeLists.txt similarity index 100% rename from plasma/generic/containmentactions/switchdesktop/CMakeLists.txt rename to plasma/containmentactions/switchdesktop/CMakeLists.txt diff --git a/plasma/generic/containmentactions/switchdesktop/Messages.sh b/plasma/containmentactions/switchdesktop/Messages.sh similarity index 100% rename from plasma/generic/containmentactions/switchdesktop/Messages.sh rename to plasma/containmentactions/switchdesktop/Messages.sh diff --git a/plasma/generic/containmentactions/switchdesktop/desktop.cpp b/plasma/containmentactions/switchdesktop/desktop.cpp similarity index 100% rename from plasma/generic/containmentactions/switchdesktop/desktop.cpp rename to plasma/containmentactions/switchdesktop/desktop.cpp diff --git a/plasma/generic/containmentactions/switchdesktop/desktop.h b/plasma/containmentactions/switchdesktop/desktop.h similarity index 100% rename from plasma/generic/containmentactions/switchdesktop/desktop.h rename to plasma/containmentactions/switchdesktop/desktop.h diff --git a/plasma/generic/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop b/plasma/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop similarity index 100% rename from plasma/generic/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop rename to plasma/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop diff --git a/plasma/generic/containmentactions/switchwindow/CMakeLists.txt b/plasma/containmentactions/switchwindow/CMakeLists.txt similarity index 100% rename from plasma/generic/containmentactions/switchwindow/CMakeLists.txt rename to plasma/containmentactions/switchwindow/CMakeLists.txt diff --git a/plasma/generic/containmentactions/switchwindow/Messages.sh b/plasma/containmentactions/switchwindow/Messages.sh similarity index 100% rename from plasma/generic/containmentactions/switchwindow/Messages.sh rename to plasma/containmentactions/switchwindow/Messages.sh diff --git a/plasma/generic/containmentactions/switchwindow/config.ui b/plasma/containmentactions/switchwindow/config.ui similarity index 100% rename from plasma/generic/containmentactions/switchwindow/config.ui rename to plasma/containmentactions/switchwindow/config.ui diff --git a/plasma/generic/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop b/plasma/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop similarity index 100% rename from plasma/generic/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop rename to plasma/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop diff --git a/plasma/generic/containmentactions/switchwindow/switch.cpp b/plasma/containmentactions/switchwindow/switch.cpp similarity index 100% rename from plasma/generic/containmentactions/switchwindow/switch.cpp rename to plasma/containmentactions/switchwindow/switch.cpp diff --git a/plasma/generic/containmentactions/switchwindow/switch.h b/plasma/containmentactions/switchwindow/switch.h similarity index 100% rename from plasma/generic/containmentactions/switchwindow/switch.h rename to plasma/containmentactions/switchwindow/switch.h diff --git a/plasma/containments/CMakeLists.txt b/plasma/containments/CMakeLists.txt new file mode 100644 index 00000000..2cf476d0 --- /dev/null +++ b/plasma/containments/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(newspaper) +add_subdirectory(screensaver) +add_subdirectory(desktop) +add_subdirectory(panel) diff --git a/plasma/desktop/containments/desktop/CMakeLists.txt b/plasma/containments/desktop/CMakeLists.txt similarity index 100% rename from plasma/desktop/containments/desktop/CMakeLists.txt rename to plasma/containments/desktop/CMakeLists.txt diff --git a/plasma/desktop/containments/desktop/Messages.sh b/plasma/containments/desktop/Messages.sh similarity index 100% rename from plasma/desktop/containments/desktop/Messages.sh rename to plasma/containments/desktop/Messages.sh diff --git a/plasma/desktop/containments/desktop/desktop.cpp b/plasma/containments/desktop/desktop.cpp similarity index 100% rename from plasma/desktop/containments/desktop/desktop.cpp rename to plasma/containments/desktop/desktop.cpp diff --git a/plasma/desktop/containments/desktop/desktop.h b/plasma/containments/desktop/desktop.h similarity index 100% rename from plasma/desktop/containments/desktop/desktop.h rename to plasma/containments/desktop/desktop.h diff --git a/plasma/desktop/containments/desktop/desktoplayout.cpp b/plasma/containments/desktop/desktoplayout.cpp similarity index 100% rename from plasma/desktop/containments/desktop/desktoplayout.cpp rename to plasma/containments/desktop/desktoplayout.cpp diff --git a/plasma/desktop/containments/desktop/desktoplayout.h b/plasma/containments/desktop/desktoplayout.h similarity index 100% rename from plasma/desktop/containments/desktop/desktoplayout.h rename to plasma/containments/desktop/desktoplayout.h diff --git a/plasma/desktop/containments/desktop/itemspace.cpp b/plasma/containments/desktop/itemspace.cpp similarity index 100% rename from plasma/desktop/containments/desktop/itemspace.cpp rename to plasma/containments/desktop/itemspace.cpp diff --git a/plasma/desktop/containments/desktop/itemspace.h b/plasma/containments/desktop/itemspace.h similarity index 100% rename from plasma/desktop/containments/desktop/itemspace.h rename to plasma/containments/desktop/itemspace.h diff --git a/plasma/desktop/containments/desktop/plasma-containment-desktop.desktop b/plasma/containments/desktop/plasma-containment-desktop.desktop similarity index 100% rename from plasma/desktop/containments/desktop/plasma-containment-desktop.desktop rename to plasma/containments/desktop/plasma-containment-desktop.desktop diff --git a/plasma/desktop/containments/desktop/plasma-containment-desktopdashboard.desktop b/plasma/containments/desktop/plasma-containment-desktopdashboard.desktop similarity index 100% rename from plasma/desktop/containments/desktop/plasma-containment-desktopdashboard.desktop rename to plasma/containments/desktop/plasma-containment-desktopdashboard.desktop diff --git a/plasma/desktop/containments/desktop/plasma_desktop_containment.kwinrules b/plasma/containments/desktop/plasma_desktop_containment.kwinrules similarity index 100% rename from plasma/desktop/containments/desktop/plasma_desktop_containment.kwinrules rename to plasma/containments/desktop/plasma_desktop_containment.kwinrules diff --git a/plasma/generic/containments/newspaper/CMakeLists.txt b/plasma/containments/newspaper/CMakeLists.txt similarity index 100% rename from plasma/generic/containments/newspaper/CMakeLists.txt rename to plasma/containments/newspaper/CMakeLists.txt diff --git a/plasma/generic/containments/newspaper/Messages.sh b/plasma/containments/newspaper/Messages.sh similarity index 100% rename from plasma/generic/containments/newspaper/Messages.sh rename to plasma/containments/newspaper/Messages.sh diff --git a/plasma/generic/containments/newspaper/appletmovespacer.cpp b/plasma/containments/newspaper/appletmovespacer.cpp similarity index 100% rename from plasma/generic/containments/newspaper/appletmovespacer.cpp rename to plasma/containments/newspaper/appletmovespacer.cpp diff --git a/plasma/generic/containments/newspaper/appletmovespacer.h b/plasma/containments/newspaper/appletmovespacer.h similarity index 100% rename from plasma/generic/containments/newspaper/appletmovespacer.h rename to plasma/containments/newspaper/appletmovespacer.h diff --git a/plasma/generic/containments/newspaper/appletoverlay.cpp b/plasma/containments/newspaper/appletoverlay.cpp similarity index 100% rename from plasma/generic/containments/newspaper/appletoverlay.cpp rename to plasma/containments/newspaper/appletoverlay.cpp diff --git a/plasma/generic/containments/newspaper/appletoverlay.h b/plasma/containments/newspaper/appletoverlay.h similarity index 100% rename from plasma/generic/containments/newspaper/appletoverlay.h rename to plasma/containments/newspaper/appletoverlay.h diff --git a/plasma/generic/containments/newspaper/appletscontainer.cpp b/plasma/containments/newspaper/appletscontainer.cpp similarity index 100% rename from plasma/generic/containments/newspaper/appletscontainer.cpp rename to plasma/containments/newspaper/appletscontainer.cpp diff --git a/plasma/generic/containments/newspaper/appletscontainer.h b/plasma/containments/newspaper/appletscontainer.h similarity index 100% rename from plasma/generic/containments/newspaper/appletscontainer.h rename to plasma/containments/newspaper/appletscontainer.h diff --git a/plasma/generic/containments/newspaper/appletsview.cpp b/plasma/containments/newspaper/appletsview.cpp similarity index 100% rename from plasma/generic/containments/newspaper/appletsview.cpp rename to plasma/containments/newspaper/appletsview.cpp diff --git a/plasma/generic/containments/newspaper/appletsview.h b/plasma/containments/newspaper/appletsview.h similarity index 100% rename from plasma/generic/containments/newspaper/appletsview.h rename to plasma/containments/newspaper/appletsview.h diff --git a/plasma/generic/containments/newspaper/applettitlebar.cpp b/plasma/containments/newspaper/applettitlebar.cpp similarity index 100% rename from plasma/generic/containments/newspaper/applettitlebar.cpp rename to plasma/containments/newspaper/applettitlebar.cpp diff --git a/plasma/generic/containments/newspaper/applettitlebar.h b/plasma/containments/newspaper/applettitlebar.h similarity index 100% rename from plasma/generic/containments/newspaper/applettitlebar.h rename to plasma/containments/newspaper/applettitlebar.h diff --git a/plasma/generic/containments/newspaper/dragcountdown.cpp b/plasma/containments/newspaper/dragcountdown.cpp similarity index 100% rename from plasma/generic/containments/newspaper/dragcountdown.cpp rename to plasma/containments/newspaper/dragcountdown.cpp diff --git a/plasma/generic/containments/newspaper/dragcountdown.h b/plasma/containments/newspaper/dragcountdown.h similarity index 100% rename from plasma/generic/containments/newspaper/dragcountdown.h rename to plasma/containments/newspaper/dragcountdown.h diff --git a/plasma/generic/containments/newspaper/newspaper.cpp b/plasma/containments/newspaper/newspaper.cpp similarity index 100% rename from plasma/generic/containments/newspaper/newspaper.cpp rename to plasma/containments/newspaper/newspaper.cpp diff --git a/plasma/generic/containments/newspaper/newspaper.h b/plasma/containments/newspaper/newspaper.h similarity index 100% rename from plasma/generic/containments/newspaper/newspaper.h rename to plasma/containments/newspaper/newspaper.h diff --git a/plasma/generic/containments/newspaper/plasma-containment-newspaper.desktop b/plasma/containments/newspaper/plasma-containment-newspaper.desktop similarity index 100% rename from plasma/generic/containments/newspaper/plasma-containment-newspaper.desktop rename to plasma/containments/newspaper/plasma-containment-newspaper.desktop diff --git a/plasma/desktop/containments/panel/CMakeLists.txt b/plasma/containments/panel/CMakeLists.txt similarity index 100% rename from plasma/desktop/containments/panel/CMakeLists.txt rename to plasma/containments/panel/CMakeLists.txt diff --git a/plasma/desktop/containments/panel/Messages.sh b/plasma/containments/panel/Messages.sh similarity index 100% rename from plasma/desktop/containments/panel/Messages.sh rename to plasma/containments/panel/Messages.sh diff --git a/plasma/desktop/containments/panel/panel.cpp b/plasma/containments/panel/panel.cpp similarity index 100% rename from plasma/desktop/containments/panel/panel.cpp rename to plasma/containments/panel/panel.cpp diff --git a/plasma/desktop/containments/panel/panel.h b/plasma/containments/panel/panel.h similarity index 100% rename from plasma/desktop/containments/panel/panel.h rename to plasma/containments/panel/panel.h diff --git a/plasma/desktop/containments/panel/plasma-containment-panel.desktop b/plasma/containments/panel/plasma-containment-panel.desktop similarity index 100% rename from plasma/desktop/containments/panel/plasma-containment-panel.desktop rename to plasma/containments/panel/plasma-containment-panel.desktop diff --git a/plasma/screensaver/containments/screensaver/CMakeLists.txt b/plasma/containments/screensaver/CMakeLists.txt similarity index 87% rename from plasma/screensaver/containments/screensaver/CMakeLists.txt rename to plasma/containments/screensaver/CMakeLists.txt index b18c2dbf..b11dbd9f 100644 --- a/plasma/screensaver/containments/screensaver/CMakeLists.txt +++ b/plasma/containments/screensaver/CMakeLists.txt @@ -1,6 +1,6 @@ set(desktop_SRCS desktop.cpp - ../../../desktop/toolboxes/internaltoolbox.cpp) + ../../toolboxes/internaltoolbox.cpp) kde4_add_plugin(plasma_containment_saverdesktop ${desktop_SRCS}) target_link_libraries(plasma_containment_saverdesktop ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS}) diff --git a/plasma/screensaver/containments/screensaver/Messages.sh b/plasma/containments/screensaver/Messages.sh similarity index 100% rename from plasma/screensaver/containments/screensaver/Messages.sh rename to plasma/containments/screensaver/Messages.sh diff --git a/plasma/screensaver/containments/screensaver/desktop.cpp b/plasma/containments/screensaver/desktop.cpp similarity index 98% rename from plasma/screensaver/containments/screensaver/desktop.cpp rename to plasma/containments/screensaver/desktop.cpp index a18032b2..3d0101f9 100644 --- a/plasma/screensaver/containments/screensaver/desktop.cpp +++ b/plasma/containments/screensaver/desktop.cpp @@ -33,7 +33,7 @@ #include #endif -#include <../../../desktop/toolboxes/internaltoolbox.h> +#include "../../toolboxes/internaltoolbox.h" using namespace Plasma; diff --git a/plasma/screensaver/containments/screensaver/desktop.h b/plasma/containments/screensaver/desktop.h similarity index 100% rename from plasma/screensaver/containments/screensaver/desktop.h rename to plasma/containments/screensaver/desktop.h diff --git a/plasma/screensaver/containments/screensaver/plasma-containment-saverdesktop.desktop b/plasma/containments/screensaver/plasma-containment-saverdesktop.desktop similarity index 100% rename from plasma/screensaver/containments/screensaver/plasma-containment-saverdesktop.desktop rename to plasma/containments/screensaver/plasma-containment-saverdesktop.desktop diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/dataengines/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/CMakeLists.txt rename to plasma/dataengines/CMakeLists.txt diff --git a/plasma/generic/dataengines/applicationjobs/CMakeLists.txt b/plasma/dataengines/applicationjobs/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/applicationjobs/CMakeLists.txt rename to plasma/dataengines/applicationjobs/CMakeLists.txt diff --git a/plasma/generic/dataengines/applicationjobs/Messages.sh b/plasma/dataengines/applicationjobs/Messages.sh similarity index 100% rename from plasma/generic/dataengines/applicationjobs/Messages.sh rename to plasma/dataengines/applicationjobs/Messages.sh diff --git a/plasma/generic/dataengines/applicationjobs/applicationjobs.operations b/plasma/dataengines/applicationjobs/applicationjobs.operations similarity index 100% rename from plasma/generic/dataengines/applicationjobs/applicationjobs.operations rename to plasma/dataengines/applicationjobs/applicationjobs.operations diff --git a/plasma/generic/dataengines/applicationjobs/jobaction.cpp b/plasma/dataengines/applicationjobs/jobaction.cpp similarity index 100% rename from plasma/generic/dataengines/applicationjobs/jobaction.cpp rename to plasma/dataengines/applicationjobs/jobaction.cpp diff --git a/plasma/generic/dataengines/applicationjobs/jobaction.h b/plasma/dataengines/applicationjobs/jobaction.h similarity index 100% rename from plasma/generic/dataengines/applicationjobs/jobaction.h rename to plasma/dataengines/applicationjobs/jobaction.h diff --git a/plasma/generic/dataengines/applicationjobs/jobcontrol.cpp b/plasma/dataengines/applicationjobs/jobcontrol.cpp similarity index 100% rename from plasma/generic/dataengines/applicationjobs/jobcontrol.cpp rename to plasma/dataengines/applicationjobs/jobcontrol.cpp diff --git a/plasma/generic/dataengines/applicationjobs/jobcontrol.h b/plasma/dataengines/applicationjobs/jobcontrol.h similarity index 100% rename from plasma/generic/dataengines/applicationjobs/jobcontrol.h rename to plasma/dataengines/applicationjobs/jobcontrol.h diff --git a/plasma/generic/dataengines/applicationjobs/kuiserverengine.cpp b/plasma/dataengines/applicationjobs/kuiserverengine.cpp similarity index 100% rename from plasma/generic/dataengines/applicationjobs/kuiserverengine.cpp rename to plasma/dataengines/applicationjobs/kuiserverengine.cpp diff --git a/plasma/generic/dataengines/applicationjobs/kuiserverengine.h b/plasma/dataengines/applicationjobs/kuiserverengine.h similarity index 100% rename from plasma/generic/dataengines/applicationjobs/kuiserverengine.h rename to plasma/dataengines/applicationjobs/kuiserverengine.h diff --git a/plasma/generic/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop b/plasma/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop similarity index 100% rename from plasma/generic/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop rename to plasma/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop diff --git a/plasma/generic/dataengines/apps/CMakeLists.txt b/plasma/dataengines/apps/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/apps/CMakeLists.txt rename to plasma/dataengines/apps/CMakeLists.txt diff --git a/plasma/generic/dataengines/apps/appjob.cpp b/plasma/dataengines/apps/appjob.cpp similarity index 100% rename from plasma/generic/dataengines/apps/appjob.cpp rename to plasma/dataengines/apps/appjob.cpp diff --git a/plasma/generic/dataengines/apps/appjob.h b/plasma/dataengines/apps/appjob.h similarity index 100% rename from plasma/generic/dataengines/apps/appjob.h rename to plasma/dataengines/apps/appjob.h diff --git a/plasma/generic/dataengines/apps/apps.operations b/plasma/dataengines/apps/apps.operations similarity index 100% rename from plasma/generic/dataengines/apps/apps.operations rename to plasma/dataengines/apps/apps.operations diff --git a/plasma/generic/dataengines/apps/appsengine.cpp b/plasma/dataengines/apps/appsengine.cpp similarity index 100% rename from plasma/generic/dataengines/apps/appsengine.cpp rename to plasma/dataengines/apps/appsengine.cpp diff --git a/plasma/generic/dataengines/apps/appsengine.h b/plasma/dataengines/apps/appsengine.h similarity index 100% rename from plasma/generic/dataengines/apps/appsengine.h rename to plasma/dataengines/apps/appsengine.h diff --git a/plasma/generic/dataengines/apps/appservice.cpp b/plasma/dataengines/apps/appservice.cpp similarity index 100% rename from plasma/generic/dataengines/apps/appservice.cpp rename to plasma/dataengines/apps/appservice.cpp diff --git a/plasma/generic/dataengines/apps/appservice.h b/plasma/dataengines/apps/appservice.h similarity index 100% rename from plasma/generic/dataengines/apps/appservice.h rename to plasma/dataengines/apps/appservice.h diff --git a/plasma/generic/dataengines/apps/appsource.cpp b/plasma/dataengines/apps/appsource.cpp similarity index 100% rename from plasma/generic/dataengines/apps/appsource.cpp rename to plasma/dataengines/apps/appsource.cpp diff --git a/plasma/generic/dataengines/apps/appsource.h b/plasma/dataengines/apps/appsource.h similarity index 100% rename from plasma/generic/dataengines/apps/appsource.h rename to plasma/dataengines/apps/appsource.h diff --git a/plasma/generic/dataengines/apps/plasma-dataengine-apps.desktop b/plasma/dataengines/apps/plasma-dataengine-apps.desktop similarity index 100% rename from plasma/generic/dataengines/apps/plasma-dataengine-apps.desktop rename to plasma/dataengines/apps/plasma-dataengine-apps.desktop diff --git a/plasma/generic/dataengines/devicenotifications/CMakeLists.txt b/plasma/dataengines/devicenotifications/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/devicenotifications/CMakeLists.txt rename to plasma/dataengines/devicenotifications/CMakeLists.txt diff --git a/plasma/generic/dataengines/devicenotifications/devicenotificationsengine.cpp b/plasma/dataengines/devicenotifications/devicenotificationsengine.cpp similarity index 100% rename from plasma/generic/dataengines/devicenotifications/devicenotificationsengine.cpp rename to plasma/dataengines/devicenotifications/devicenotificationsengine.cpp diff --git a/plasma/generic/dataengines/devicenotifications/devicenotificationsengine.h b/plasma/dataengines/devicenotifications/devicenotificationsengine.h similarity index 100% rename from plasma/generic/dataengines/devicenotifications/devicenotificationsengine.h rename to plasma/dataengines/devicenotifications/devicenotificationsengine.h diff --git a/plasma/generic/dataengines/devicenotifications/org.kde.DeviceNotifications.xml b/plasma/dataengines/devicenotifications/org.kde.DeviceNotifications.xml similarity index 100% rename from plasma/generic/dataengines/devicenotifications/org.kde.DeviceNotifications.xml rename to plasma/dataengines/devicenotifications/org.kde.DeviceNotifications.xml diff --git a/plasma/generic/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop b/plasma/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop similarity index 100% rename from plasma/generic/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop rename to plasma/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop diff --git a/plasma/generic/dataengines/dict/CMakeLists.txt b/plasma/dataengines/dict/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/dict/CMakeLists.txt rename to plasma/dataengines/dict/CMakeLists.txt diff --git a/plasma/generic/dataengines/dict/Messages.sh b/plasma/dataengines/dict/Messages.sh similarity index 100% rename from plasma/generic/dataengines/dict/Messages.sh rename to plasma/dataengines/dict/Messages.sh diff --git a/plasma/generic/dataengines/dict/buggywords b/plasma/dataengines/dict/buggywords similarity index 100% rename from plasma/generic/dataengines/dict/buggywords rename to plasma/dataengines/dict/buggywords diff --git a/plasma/generic/dataengines/dict/dictengine.cpp b/plasma/dataengines/dict/dictengine.cpp similarity index 100% rename from plasma/generic/dataengines/dict/dictengine.cpp rename to plasma/dataengines/dict/dictengine.cpp diff --git a/plasma/generic/dataengines/dict/dictengine.h b/plasma/dataengines/dict/dictengine.h similarity index 100% rename from plasma/generic/dataengines/dict/dictengine.h rename to plasma/dataengines/dict/dictengine.h diff --git a/plasma/generic/dataengines/dict/plasma-dataengine-dict.desktop b/plasma/dataengines/dict/plasma-dataengine-dict.desktop similarity index 100% rename from plasma/generic/dataengines/dict/plasma-dataengine-dict.desktop rename to plasma/dataengines/dict/plasma-dataengine-dict.desktop diff --git a/plasma/generic/dataengines/executable/CMakeLists.txt b/plasma/dataengines/executable/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/executable/CMakeLists.txt rename to plasma/dataengines/executable/CMakeLists.txt diff --git a/plasma/generic/dataengines/executable/executable.cpp b/plasma/dataengines/executable/executable.cpp similarity index 100% rename from plasma/generic/dataengines/executable/executable.cpp rename to plasma/dataengines/executable/executable.cpp diff --git a/plasma/generic/dataengines/executable/executable.h b/plasma/dataengines/executable/executable.h similarity index 100% rename from plasma/generic/dataengines/executable/executable.h rename to plasma/dataengines/executable/executable.h diff --git a/plasma/generic/dataengines/executable/plasma-dataengine-executable.desktop b/plasma/dataengines/executable/plasma-dataengine-executable.desktop similarity index 100% rename from plasma/generic/dataengines/executable/plasma-dataengine-executable.desktop rename to plasma/dataengines/executable/plasma-dataengine-executable.desktop diff --git a/plasma/generic/dataengines/favicons/CMakeLists.txt b/plasma/dataengines/favicons/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/favicons/CMakeLists.txt rename to plasma/dataengines/favicons/CMakeLists.txt diff --git a/plasma/generic/dataengines/favicons/faviconprovider.cpp b/plasma/dataengines/favicons/faviconprovider.cpp similarity index 100% rename from plasma/generic/dataengines/favicons/faviconprovider.cpp rename to plasma/dataengines/favicons/faviconprovider.cpp diff --git a/plasma/generic/dataengines/favicons/faviconprovider.h b/plasma/dataengines/favicons/faviconprovider.h similarity index 100% rename from plasma/generic/dataengines/favicons/faviconprovider.h rename to plasma/dataengines/favicons/faviconprovider.h diff --git a/plasma/generic/dataengines/favicons/favicons.cpp b/plasma/dataengines/favicons/favicons.cpp similarity index 100% rename from plasma/generic/dataengines/favicons/favicons.cpp rename to plasma/dataengines/favicons/favicons.cpp diff --git a/plasma/generic/dataengines/favicons/favicons.h b/plasma/dataengines/favicons/favicons.h similarity index 100% rename from plasma/generic/dataengines/favicons/favicons.h rename to plasma/dataengines/favicons/favicons.h diff --git a/plasma/generic/dataengines/favicons/plasma-dataengine-favicons.desktop b/plasma/dataengines/favicons/plasma-dataengine-favicons.desktop similarity index 100% rename from plasma/generic/dataengines/favicons/plasma-dataengine-favicons.desktop rename to plasma/dataengines/favicons/plasma-dataengine-favicons.desktop diff --git a/plasma/generic/dataengines/filebrowser/CMakeLists.txt b/plasma/dataengines/filebrowser/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/filebrowser/CMakeLists.txt rename to plasma/dataengines/filebrowser/CMakeLists.txt diff --git a/plasma/generic/dataengines/filebrowser/filebrowserengine.cpp b/plasma/dataengines/filebrowser/filebrowserengine.cpp similarity index 100% rename from plasma/generic/dataengines/filebrowser/filebrowserengine.cpp rename to plasma/dataengines/filebrowser/filebrowserengine.cpp diff --git a/plasma/generic/dataengines/filebrowser/filebrowserengine.h b/plasma/dataengines/filebrowser/filebrowserengine.h similarity index 100% rename from plasma/generic/dataengines/filebrowser/filebrowserengine.h rename to plasma/dataengines/filebrowser/filebrowserengine.h diff --git a/plasma/generic/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop b/plasma/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop similarity index 100% rename from plasma/generic/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop rename to plasma/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop diff --git a/plasma/generic/dataengines/geolocation/CMakeLists.txt b/plasma/dataengines/geolocation/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/geolocation/CMakeLists.txt rename to plasma/dataengines/geolocation/CMakeLists.txt diff --git a/plasma/generic/dataengines/geolocation/geolocation.cpp b/plasma/dataengines/geolocation/geolocation.cpp similarity index 100% rename from plasma/generic/dataengines/geolocation/geolocation.cpp rename to plasma/dataengines/geolocation/geolocation.cpp diff --git a/plasma/generic/dataengines/geolocation/geolocation.h b/plasma/dataengines/geolocation/geolocation.h similarity index 100% rename from plasma/generic/dataengines/geolocation/geolocation.h rename to plasma/dataengines/geolocation/geolocation.h diff --git a/plasma/generic/dataengines/geolocation/geolocation_export.h b/plasma/dataengines/geolocation/geolocation_export.h similarity index 100% rename from plasma/generic/dataengines/geolocation/geolocation_export.h rename to plasma/dataengines/geolocation/geolocation_export.h diff --git a/plasma/generic/dataengines/geolocation/geolocationprovider.cpp b/plasma/dataengines/geolocation/geolocationprovider.cpp similarity index 100% rename from plasma/generic/dataengines/geolocation/geolocationprovider.cpp rename to plasma/dataengines/geolocation/geolocationprovider.cpp diff --git a/plasma/generic/dataengines/geolocation/geolocationprovider.h b/plasma/dataengines/geolocation/geolocationprovider.h similarity index 100% rename from plasma/generic/dataengines/geolocation/geolocationprovider.h rename to plasma/dataengines/geolocation/geolocationprovider.h diff --git a/plasma/generic/dataengines/geolocation/location_gps.cpp b/plasma/dataengines/geolocation/location_gps.cpp similarity index 100% rename from plasma/generic/dataengines/geolocation/location_gps.cpp rename to plasma/dataengines/geolocation/location_gps.cpp diff --git a/plasma/generic/dataengines/geolocation/location_gps.h b/plasma/dataengines/geolocation/location_gps.h similarity index 100% rename from plasma/generic/dataengines/geolocation/location_gps.h rename to plasma/dataengines/geolocation/location_gps.h diff --git a/plasma/generic/dataengines/geolocation/location_ip.cpp b/plasma/dataengines/geolocation/location_ip.cpp similarity index 100% rename from plasma/generic/dataengines/geolocation/location_ip.cpp rename to plasma/dataengines/geolocation/location_ip.cpp diff --git a/plasma/generic/dataengines/geolocation/location_ip.h b/plasma/dataengines/geolocation/location_ip.h similarity index 100% rename from plasma/generic/dataengines/geolocation/location_ip.h rename to plasma/dataengines/geolocation/location_ip.h diff --git a/plasma/generic/dataengines/geolocation/plasma-dataengine-geolocation.desktop b/plasma/dataengines/geolocation/plasma-dataengine-geolocation.desktop similarity index 100% rename from plasma/generic/dataengines/geolocation/plasma-dataengine-geolocation.desktop rename to plasma/dataengines/geolocation/plasma-dataengine-geolocation.desktop diff --git a/plasma/generic/dataengines/geolocation/plasma-geolocation-gps.desktop b/plasma/dataengines/geolocation/plasma-geolocation-gps.desktop similarity index 100% rename from plasma/generic/dataengines/geolocation/plasma-geolocation-gps.desktop rename to plasma/dataengines/geolocation/plasma-geolocation-gps.desktop diff --git a/plasma/generic/dataengines/geolocation/plasma-geolocation-ip.desktop b/plasma/dataengines/geolocation/plasma-geolocation-ip.desktop similarity index 100% rename from plasma/generic/dataengines/geolocation/plasma-geolocation-ip.desktop rename to plasma/dataengines/geolocation/plasma-geolocation-ip.desktop diff --git a/plasma/generic/dataengines/geolocation/plasma-geolocationprovider.desktop b/plasma/dataengines/geolocation/plasma-geolocationprovider.desktop similarity index 100% rename from plasma/generic/dataengines/geolocation/plasma-geolocationprovider.desktop rename to plasma/dataengines/geolocation/plasma-geolocationprovider.desktop diff --git a/plasma/generic/dataengines/hotplug/CMakeLists.txt b/plasma/dataengines/hotplug/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/hotplug/CMakeLists.txt rename to plasma/dataengines/hotplug/CMakeLists.txt diff --git a/plasma/generic/dataengines/hotplug/hotplug.operations b/plasma/dataengines/hotplug/hotplug.operations similarity index 100% rename from plasma/generic/dataengines/hotplug/hotplug.operations rename to plasma/dataengines/hotplug/hotplug.operations diff --git a/plasma/generic/dataengines/hotplug/hotplugengine.cpp b/plasma/dataengines/hotplug/hotplugengine.cpp similarity index 100% rename from plasma/generic/dataengines/hotplug/hotplugengine.cpp rename to plasma/dataengines/hotplug/hotplugengine.cpp diff --git a/plasma/generic/dataengines/hotplug/hotplugengine.h b/plasma/dataengines/hotplug/hotplugengine.h similarity index 100% rename from plasma/generic/dataengines/hotplug/hotplugengine.h rename to plasma/dataengines/hotplug/hotplugengine.h diff --git a/plasma/generic/dataengines/hotplug/hotplugjob.cpp b/plasma/dataengines/hotplug/hotplugjob.cpp similarity index 100% rename from plasma/generic/dataengines/hotplug/hotplugjob.cpp rename to plasma/dataengines/hotplug/hotplugjob.cpp diff --git a/plasma/generic/dataengines/hotplug/hotplugjob.h b/plasma/dataengines/hotplug/hotplugjob.h similarity index 100% rename from plasma/generic/dataengines/hotplug/hotplugjob.h rename to plasma/dataengines/hotplug/hotplugjob.h diff --git a/plasma/generic/dataengines/hotplug/hotplugservice.cpp b/plasma/dataengines/hotplug/hotplugservice.cpp similarity index 100% rename from plasma/generic/dataengines/hotplug/hotplugservice.cpp rename to plasma/dataengines/hotplug/hotplugservice.cpp diff --git a/plasma/generic/dataengines/hotplug/hotplugservice.h b/plasma/dataengines/hotplug/hotplugservice.h similarity index 100% rename from plasma/generic/dataengines/hotplug/hotplugservice.h rename to plasma/dataengines/hotplug/hotplugservice.h diff --git a/plasma/generic/dataengines/hotplug/plasma-dataengine-hotplug.desktop b/plasma/dataengines/hotplug/plasma-dataengine-hotplug.desktop similarity index 100% rename from plasma/generic/dataengines/hotplug/plasma-dataengine-hotplug.desktop rename to plasma/dataengines/hotplug/plasma-dataengine-hotplug.desktop diff --git a/plasma/generic/dataengines/keystate/CMakeLists.txt b/plasma/dataengines/keystate/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/keystate/CMakeLists.txt rename to plasma/dataengines/keystate/CMakeLists.txt diff --git a/plasma/generic/dataengines/keystate/Messages.sh b/plasma/dataengines/keystate/Messages.sh similarity index 100% rename from plasma/generic/dataengines/keystate/Messages.sh rename to plasma/dataengines/keystate/Messages.sh diff --git a/plasma/generic/dataengines/keystate/keyservice.cpp b/plasma/dataengines/keystate/keyservice.cpp similarity index 100% rename from plasma/generic/dataengines/keystate/keyservice.cpp rename to plasma/dataengines/keystate/keyservice.cpp diff --git a/plasma/generic/dataengines/keystate/keyservice.h b/plasma/dataengines/keystate/keyservice.h similarity index 100% rename from plasma/generic/dataengines/keystate/keyservice.h rename to plasma/dataengines/keystate/keyservice.h diff --git a/plasma/generic/dataengines/keystate/keystate.cpp b/plasma/dataengines/keystate/keystate.cpp similarity index 100% rename from plasma/generic/dataengines/keystate/keystate.cpp rename to plasma/dataengines/keystate/keystate.cpp diff --git a/plasma/generic/dataengines/keystate/keystate.h b/plasma/dataengines/keystate/keystate.h similarity index 100% rename from plasma/generic/dataengines/keystate/keystate.h rename to plasma/dataengines/keystate/keystate.h diff --git a/plasma/generic/dataengines/keystate/modifierkeystate.operations b/plasma/dataengines/keystate/modifierkeystate.operations similarity index 100% rename from plasma/generic/dataengines/keystate/modifierkeystate.operations rename to plasma/dataengines/keystate/modifierkeystate.operations diff --git a/plasma/generic/dataengines/keystate/plasma-dataengine-keystate.desktop b/plasma/dataengines/keystate/plasma-dataengine-keystate.desktop similarity index 100% rename from plasma/generic/dataengines/keystate/plasma-dataengine-keystate.desktop rename to plasma/dataengines/keystate/plasma-dataengine-keystate.desktop diff --git a/plasma/generic/dataengines/mouse/CMakeLists.txt b/plasma/dataengines/mouse/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/mouse/CMakeLists.txt rename to plasma/dataengines/mouse/CMakeLists.txt diff --git a/plasma/generic/dataengines/mouse/cursornotificationhandler.cpp b/plasma/dataengines/mouse/cursornotificationhandler.cpp similarity index 100% rename from plasma/generic/dataengines/mouse/cursornotificationhandler.cpp rename to plasma/dataengines/mouse/cursornotificationhandler.cpp diff --git a/plasma/generic/dataengines/mouse/cursornotificationhandler.h b/plasma/dataengines/mouse/cursornotificationhandler.h similarity index 100% rename from plasma/generic/dataengines/mouse/cursornotificationhandler.h rename to plasma/dataengines/mouse/cursornotificationhandler.h diff --git a/plasma/generic/dataengines/mouse/mouseengine.cpp b/plasma/dataengines/mouse/mouseengine.cpp similarity index 100% rename from plasma/generic/dataengines/mouse/mouseengine.cpp rename to plasma/dataengines/mouse/mouseengine.cpp diff --git a/plasma/generic/dataengines/mouse/mouseengine.h b/plasma/dataengines/mouse/mouseengine.h similarity index 100% rename from plasma/generic/dataengines/mouse/mouseengine.h rename to plasma/dataengines/mouse/mouseengine.h diff --git a/plasma/generic/dataengines/mouse/plasma-dataengine-mouse.desktop b/plasma/dataengines/mouse/plasma-dataengine-mouse.desktop similarity index 100% rename from plasma/generic/dataengines/mouse/plasma-dataengine-mouse.desktop rename to plasma/dataengines/mouse/plasma-dataengine-mouse.desktop diff --git a/plasma/generic/dataengines/mpris2/CMakeLists.txt b/plasma/dataengines/mpris2/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/mpris2/CMakeLists.txt rename to plasma/dataengines/mpris2/CMakeLists.txt diff --git a/plasma/generic/dataengines/mpris2/Messages.sh b/plasma/dataengines/mpris2/Messages.sh similarity index 100% rename from plasma/generic/dataengines/mpris2/Messages.sh rename to plasma/dataengines/mpris2/Messages.sh diff --git a/plasma/generic/dataengines/mpris2/TODO b/plasma/dataengines/mpris2/TODO similarity index 100% rename from plasma/generic/dataengines/mpris2/TODO rename to plasma/dataengines/mpris2/TODO diff --git a/plasma/generic/dataengines/mpris2/mpris2.operations b/plasma/dataengines/mpris2/mpris2.operations similarity index 100% rename from plasma/generic/dataengines/mpris2/mpris2.operations rename to plasma/dataengines/mpris2/mpris2.operations diff --git a/plasma/generic/dataengines/mpris2/mpris2engine.cpp b/plasma/dataengines/mpris2/mpris2engine.cpp similarity index 100% rename from plasma/generic/dataengines/mpris2/mpris2engine.cpp rename to plasma/dataengines/mpris2/mpris2engine.cpp diff --git a/plasma/generic/dataengines/mpris2/mpris2engine.h b/plasma/dataengines/mpris2/mpris2engine.h similarity index 100% rename from plasma/generic/dataengines/mpris2/mpris2engine.h rename to plasma/dataengines/mpris2/mpris2engine.h diff --git a/plasma/generic/dataengines/mpris2/multiplexedservice.cpp b/plasma/dataengines/mpris2/multiplexedservice.cpp similarity index 100% rename from plasma/generic/dataengines/mpris2/multiplexedservice.cpp rename to plasma/dataengines/mpris2/multiplexedservice.cpp diff --git a/plasma/generic/dataengines/mpris2/multiplexedservice.h b/plasma/dataengines/mpris2/multiplexedservice.h similarity index 100% rename from plasma/generic/dataengines/mpris2/multiplexedservice.h rename to plasma/dataengines/mpris2/multiplexedservice.h diff --git a/plasma/generic/dataengines/mpris2/multiplexer.cpp b/plasma/dataengines/mpris2/multiplexer.cpp similarity index 100% rename from plasma/generic/dataengines/mpris2/multiplexer.cpp rename to plasma/dataengines/mpris2/multiplexer.cpp diff --git a/plasma/generic/dataengines/mpris2/multiplexer.h b/plasma/dataengines/mpris2/multiplexer.h similarity index 100% rename from plasma/generic/dataengines/mpris2/multiplexer.h rename to plasma/dataengines/mpris2/multiplexer.h diff --git a/plasma/generic/dataengines/mpris2/org.freedesktop.DBus.Properties.xml b/plasma/dataengines/mpris2/org.freedesktop.DBus.Properties.xml similarity index 100% rename from plasma/generic/dataengines/mpris2/org.freedesktop.DBus.Properties.xml rename to plasma/dataengines/mpris2/org.freedesktop.DBus.Properties.xml diff --git a/plasma/generic/dataengines/mpris2/org.mpris.MediaPlayer2.Player.xml b/plasma/dataengines/mpris2/org.mpris.MediaPlayer2.Player.xml similarity index 100% rename from plasma/generic/dataengines/mpris2/org.mpris.MediaPlayer2.Player.xml rename to plasma/dataengines/mpris2/org.mpris.MediaPlayer2.Player.xml diff --git a/plasma/generic/dataengines/mpris2/org.mpris.MediaPlayer2.xml b/plasma/dataengines/mpris2/org.mpris.MediaPlayer2.xml similarity index 100% rename from plasma/generic/dataengines/mpris2/org.mpris.MediaPlayer2.xml rename to plasma/dataengines/mpris2/org.mpris.MediaPlayer2.xml diff --git a/plasma/generic/dataengines/mpris2/plasma-dataengine-mpris2.desktop b/plasma/dataengines/mpris2/plasma-dataengine-mpris2.desktop similarity index 100% rename from plasma/generic/dataengines/mpris2/plasma-dataengine-mpris2.desktop rename to plasma/dataengines/mpris2/plasma-dataengine-mpris2.desktop diff --git a/plasma/generic/dataengines/mpris2/playeractionjob.cpp b/plasma/dataengines/mpris2/playeractionjob.cpp similarity index 100% rename from plasma/generic/dataengines/mpris2/playeractionjob.cpp rename to plasma/dataengines/mpris2/playeractionjob.cpp diff --git a/plasma/generic/dataengines/mpris2/playeractionjob.h b/plasma/dataengines/mpris2/playeractionjob.h similarity index 100% rename from plasma/generic/dataengines/mpris2/playeractionjob.h rename to plasma/dataengines/mpris2/playeractionjob.h diff --git a/plasma/generic/dataengines/mpris2/playercontainer.cpp b/plasma/dataengines/mpris2/playercontainer.cpp similarity index 100% rename from plasma/generic/dataengines/mpris2/playercontainer.cpp rename to plasma/dataengines/mpris2/playercontainer.cpp diff --git a/plasma/generic/dataengines/mpris2/playercontainer.h b/plasma/dataengines/mpris2/playercontainer.h similarity index 100% rename from plasma/generic/dataengines/mpris2/playercontainer.h rename to plasma/dataengines/mpris2/playercontainer.h diff --git a/plasma/generic/dataengines/mpris2/playercontrol.cpp b/plasma/dataengines/mpris2/playercontrol.cpp similarity index 100% rename from plasma/generic/dataengines/mpris2/playercontrol.cpp rename to plasma/dataengines/mpris2/playercontrol.cpp diff --git a/plasma/generic/dataengines/mpris2/playercontrol.h b/plasma/dataengines/mpris2/playercontrol.h similarity index 100% rename from plasma/generic/dataengines/mpris2/playercontrol.h rename to plasma/dataengines/mpris2/playercontrol.h diff --git a/plasma/generic/dataengines/network/CMakeLists.txt b/plasma/dataengines/network/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/network/CMakeLists.txt rename to plasma/dataengines/network/CMakeLists.txt diff --git a/plasma/generic/dataengines/network/Messages.sh b/plasma/dataengines/network/Messages.sh similarity index 100% rename from plasma/generic/dataengines/network/Messages.sh rename to plasma/dataengines/network/Messages.sh diff --git a/plasma/generic/dataengines/network/networkengine.cpp b/plasma/dataengines/network/networkengine.cpp similarity index 100% rename from plasma/generic/dataengines/network/networkengine.cpp rename to plasma/dataengines/network/networkengine.cpp diff --git a/plasma/generic/dataengines/network/networkengine.h b/plasma/dataengines/network/networkengine.h similarity index 100% rename from plasma/generic/dataengines/network/networkengine.h rename to plasma/dataengines/network/networkengine.h diff --git a/plasma/generic/dataengines/network/plasma-dataengine-network.desktop b/plasma/dataengines/network/plasma-dataengine-network.desktop similarity index 100% rename from plasma/generic/dataengines/network/plasma-dataengine-network.desktop rename to plasma/dataengines/network/plasma-dataengine-network.desktop diff --git a/plasma/generic/dataengines/notifications/CMakeLists.txt b/plasma/dataengines/notifications/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/notifications/CMakeLists.txt rename to plasma/dataengines/notifications/CMakeLists.txt diff --git a/plasma/generic/dataengines/notifications/Messages.sh b/plasma/dataengines/notifications/Messages.sh similarity index 100% rename from plasma/generic/dataengines/notifications/Messages.sh rename to plasma/dataengines/notifications/Messages.sh diff --git a/plasma/generic/dataengines/notifications/notificationaction.cpp b/plasma/dataengines/notifications/notificationaction.cpp similarity index 100% rename from plasma/generic/dataengines/notifications/notificationaction.cpp rename to plasma/dataengines/notifications/notificationaction.cpp diff --git a/plasma/generic/dataengines/notifications/notificationaction.h b/plasma/dataengines/notifications/notificationaction.h similarity index 100% rename from plasma/generic/dataengines/notifications/notificationaction.h rename to plasma/dataengines/notifications/notificationaction.h diff --git a/plasma/generic/dataengines/notifications/notifications.operations b/plasma/dataengines/notifications/notifications.operations similarity index 100% rename from plasma/generic/dataengines/notifications/notifications.operations rename to plasma/dataengines/notifications/notifications.operations diff --git a/plasma/generic/dataengines/notifications/notificationsengine.cpp b/plasma/dataengines/notifications/notificationsengine.cpp similarity index 100% rename from plasma/generic/dataengines/notifications/notificationsengine.cpp rename to plasma/dataengines/notifications/notificationsengine.cpp diff --git a/plasma/generic/dataengines/notifications/notificationsengine.h b/plasma/dataengines/notifications/notificationsengine.h similarity index 100% rename from plasma/generic/dataengines/notifications/notificationsengine.h rename to plasma/dataengines/notifications/notificationsengine.h diff --git a/plasma/generic/dataengines/notifications/notificationservice.cpp b/plasma/dataengines/notifications/notificationservice.cpp similarity index 100% rename from plasma/generic/dataengines/notifications/notificationservice.cpp rename to plasma/dataengines/notifications/notificationservice.cpp diff --git a/plasma/generic/dataengines/notifications/notificationservice.h b/plasma/dataengines/notifications/notificationservice.h similarity index 100% rename from plasma/generic/dataengines/notifications/notificationservice.h rename to plasma/dataengines/notifications/notificationservice.h diff --git a/plasma/generic/dataengines/notifications/org.freedesktop.Notifications.xml b/plasma/dataengines/notifications/org.freedesktop.Notifications.xml similarity index 100% rename from plasma/generic/dataengines/notifications/org.freedesktop.Notifications.xml rename to plasma/dataengines/notifications/org.freedesktop.Notifications.xml diff --git a/plasma/generic/dataengines/notifications/plasma-dataengine-notifications.desktop b/plasma/dataengines/notifications/plasma-dataengine-notifications.desktop similarity index 100% rename from plasma/generic/dataengines/notifications/plasma-dataengine-notifications.desktop rename to plasma/dataengines/notifications/plasma-dataengine-notifications.desktop diff --git a/plasma/generic/dataengines/nowplaying/CMakeLists.txt b/plasma/dataengines/nowplaying/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/nowplaying/CMakeLists.txt rename to plasma/dataengines/nowplaying/CMakeLists.txt diff --git a/plasma/generic/dataengines/nowplaying/Messages.sh b/plasma/dataengines/nowplaying/Messages.sh similarity index 100% rename from plasma/generic/dataengines/nowplaying/Messages.sh rename to plasma/dataengines/nowplaying/Messages.sh diff --git a/plasma/generic/dataengines/nowplaying/TODO b/plasma/dataengines/nowplaying/TODO similarity index 100% rename from plasma/generic/dataengines/nowplaying/TODO rename to plasma/dataengines/nowplaying/TODO diff --git a/plasma/generic/dataengines/nowplaying/config-nowplaying.cmake b/plasma/dataengines/nowplaying/config-nowplaying.cmake similarity index 100% rename from plasma/generic/dataengines/nowplaying/config-nowplaying.cmake rename to plasma/dataengines/nowplaying/config-nowplaying.cmake diff --git a/plasma/generic/dataengines/nowplaying/nowplaying.operations b/plasma/dataengines/nowplaying/nowplaying.operations similarity index 100% rename from plasma/generic/dataengines/nowplaying/nowplaying.operations rename to plasma/dataengines/nowplaying/nowplaying.operations diff --git a/plasma/generic/dataengines/nowplaying/nowplayingengine.cpp b/plasma/dataengines/nowplaying/nowplayingengine.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/nowplayingengine.cpp rename to plasma/dataengines/nowplaying/nowplayingengine.cpp diff --git a/plasma/generic/dataengines/nowplaying/nowplayingengine.h b/plasma/dataengines/nowplaying/nowplayingengine.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/nowplayingengine.h rename to plasma/dataengines/nowplaying/nowplayingengine.h diff --git a/plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop b/plasma/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop similarity index 100% rename from plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop rename to plasma/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop diff --git a/plasma/generic/dataengines/nowplaying/playeractionjob.cpp b/plasma/dataengines/nowplaying/playeractionjob.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playeractionjob.cpp rename to plasma/dataengines/nowplaying/playeractionjob.cpp diff --git a/plasma/generic/dataengines/nowplaying/playeractionjob.h b/plasma/dataengines/nowplaying/playeractionjob.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playeractionjob.h rename to plasma/dataengines/nowplaying/playeractionjob.h diff --git a/plasma/generic/dataengines/nowplaying/playercontainer.cpp b/plasma/dataengines/nowplaying/playercontainer.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playercontainer.cpp rename to plasma/dataengines/nowplaying/playercontainer.cpp diff --git a/plasma/generic/dataengines/nowplaying/playercontainer.h b/plasma/dataengines/nowplaying/playercontainer.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playercontainer.h rename to plasma/dataengines/nowplaying/playercontainer.h diff --git a/plasma/generic/dataengines/nowplaying/playercontrol.cpp b/plasma/dataengines/nowplaying/playercontrol.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playercontrol.cpp rename to plasma/dataengines/nowplaying/playercontrol.cpp diff --git a/plasma/generic/dataengines/nowplaying/playercontrol.h b/plasma/dataengines/nowplaying/playercontrol.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playercontrol.h rename to plasma/dataengines/nowplaying/playercontrol.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/dbuswatcher.cpp b/plasma/dataengines/nowplaying/playerinterface/dbuswatcher.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/dbuswatcher.cpp rename to plasma/dataengines/nowplaying/playerinterface/dbuswatcher.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/dbuswatcher.h b/plasma/dataengines/nowplaying/playerinterface/dbuswatcher.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/dbuswatcher.h rename to plasma/dataengines/nowplaying/playerinterface/dbuswatcher.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/juk.cpp b/plasma/dataengines/nowplaying/playerinterface/juk.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/juk.cpp rename to plasma/dataengines/nowplaying/playerinterface/juk.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/juk.h b/plasma/dataengines/nowplaying/playerinterface/juk.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/juk.h rename to plasma/dataengines/nowplaying/playerinterface/juk.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/juk_p.h b/plasma/dataengines/nowplaying/playerinterface/juk_p.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/juk_p.h rename to plasma/dataengines/nowplaying/playerinterface/juk_p.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris.cpp b/plasma/dataengines/nowplaying/playerinterface/mpris/mpris.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris.cpp rename to plasma/dataengines/nowplaying/playerinterface/mpris/mpris.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris.h b/plasma/dataengines/nowplaying/playerinterface/mpris/mpris.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris.h rename to plasma/dataengines/nowplaying/playerinterface/mpris/mpris.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris_p.h b/plasma/dataengines/nowplaying/playerinterface/mpris/mpris_p.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/mpris_p.h rename to plasma/dataengines/nowplaying/playerinterface/mpris/mpris_p.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.cpp b/plasma/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.cpp rename to plasma/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.h b/plasma/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.h rename to plasma/dataengines/nowplaying/playerinterface/mpris/mprisdbustypes.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml b/plasma/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml rename to plasma/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml b/plasma/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml rename to plasma/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml b/plasma/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml rename to plasma/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2.cpp b/plasma/dataengines/nowplaying/playerinterface/mpris2/mpris2.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2.cpp rename to plasma/dataengines/nowplaying/playerinterface/mpris2/mpris2.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2.h b/plasma/dataengines/nowplaying/playerinterface/mpris2/mpris2.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2.h rename to plasma/dataengines/nowplaying/playerinterface/mpris2/mpris2.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h b/plasma/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h rename to plasma/dataengines/nowplaying/playerinterface/mpris2/mpris2_p.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/org.kde.juk.player.xml b/plasma/dataengines/nowplaying/playerinterface/org.kde.juk.player.xml similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/org.kde.juk.player.xml rename to plasma/dataengines/nowplaying/playerinterface/org.kde.juk.player.xml diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/player.cpp b/plasma/dataengines/nowplaying/playerinterface/player.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/player.cpp rename to plasma/dataengines/nowplaying/playerinterface/player.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/player.h b/plasma/dataengines/nowplaying/playerinterface/player.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/player.h rename to plasma/dataengines/nowplaying/playerinterface/player.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.cpp b/plasma/dataengines/nowplaying/playerinterface/playerfactory.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.cpp rename to plasma/dataengines/nowplaying/playerinterface/playerfactory.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.h b/plasma/dataengines/nowplaying/playerinterface/playerfactory.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/playerfactory.h rename to plasma/dataengines/nowplaying/playerinterface/playerfactory.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/pollingwatcher.cpp b/plasma/dataengines/nowplaying/playerinterface/pollingwatcher.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/pollingwatcher.cpp rename to plasma/dataengines/nowplaying/playerinterface/pollingwatcher.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/pollingwatcher.h b/plasma/dataengines/nowplaying/playerinterface/pollingwatcher.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/pollingwatcher.h rename to plasma/dataengines/nowplaying/playerinterface/pollingwatcher.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/xmms.cpp b/plasma/dataengines/nowplaying/playerinterface/xmms.cpp similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/xmms.cpp rename to plasma/dataengines/nowplaying/playerinterface/xmms.cpp diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/xmms.h b/plasma/dataengines/nowplaying/playerinterface/xmms.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/xmms.h rename to plasma/dataengines/nowplaying/playerinterface/xmms.h diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/xmms_p.h b/plasma/dataengines/nowplaying/playerinterface/xmms_p.h similarity index 100% rename from plasma/generic/dataengines/nowplaying/playerinterface/xmms_p.h rename to plasma/dataengines/nowplaying/playerinterface/xmms_p.h diff --git a/plasma/generic/dataengines/places/CMakeLists.txt b/plasma/dataengines/places/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/places/CMakeLists.txt rename to plasma/dataengines/places/CMakeLists.txt diff --git a/plasma/generic/dataengines/places/TODO b/plasma/dataengines/places/TODO similarity index 100% rename from plasma/generic/dataengines/places/TODO rename to plasma/dataengines/places/TODO diff --git a/plasma/generic/dataengines/places/jobs.h b/plasma/dataengines/places/jobs.h similarity index 100% rename from plasma/generic/dataengines/places/jobs.h rename to plasma/dataengines/places/jobs.h diff --git a/plasma/generic/dataengines/places/modeljob.h b/plasma/dataengines/places/modeljob.h similarity index 100% rename from plasma/generic/dataengines/places/modeljob.h rename to plasma/dataengines/places/modeljob.h diff --git a/plasma/generic/dataengines/places/org.kde.places.operations b/plasma/dataengines/places/org.kde.places.operations similarity index 100% rename from plasma/generic/dataengines/places/org.kde.places.operations rename to plasma/dataengines/places/org.kde.places.operations diff --git a/plasma/generic/dataengines/places/placesengine.cpp b/plasma/dataengines/places/placesengine.cpp similarity index 100% rename from plasma/generic/dataengines/places/placesengine.cpp rename to plasma/dataengines/places/placesengine.cpp diff --git a/plasma/generic/dataengines/places/placesengine.h b/plasma/dataengines/places/placesengine.h similarity index 100% rename from plasma/generic/dataengines/places/placesengine.h rename to plasma/dataengines/places/placesengine.h diff --git a/plasma/generic/dataengines/places/placeservice.cpp b/plasma/dataengines/places/placeservice.cpp similarity index 100% rename from plasma/generic/dataengines/places/placeservice.cpp rename to plasma/dataengines/places/placeservice.cpp diff --git a/plasma/generic/dataengines/places/placeservice.h b/plasma/dataengines/places/placeservice.h similarity index 100% rename from plasma/generic/dataengines/places/placeservice.h rename to plasma/dataengines/places/placeservice.h diff --git a/plasma/generic/dataengines/places/plasma-dataengine-places.desktop b/plasma/dataengines/places/plasma-dataengine-places.desktop similarity index 100% rename from plasma/generic/dataengines/places/plasma-dataengine-places.desktop rename to plasma/dataengines/places/plasma-dataengine-places.desktop diff --git a/plasma/generic/dataengines/places/setupdevicejob.cpp b/plasma/dataengines/places/setupdevicejob.cpp similarity index 100% rename from plasma/generic/dataengines/places/setupdevicejob.cpp rename to plasma/dataengines/places/setupdevicejob.cpp diff --git a/plasma/generic/dataengines/places/setupdevicejob.h b/plasma/dataengines/places/setupdevicejob.h similarity index 100% rename from plasma/generic/dataengines/places/setupdevicejob.h rename to plasma/dataengines/places/setupdevicejob.h diff --git a/plasma/generic/dataengines/powermanagement/CMakeLists.txt b/plasma/dataengines/powermanagement/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/powermanagement/CMakeLists.txt rename to plasma/dataengines/powermanagement/CMakeLists.txt diff --git a/plasma/generic/dataengines/powermanagement/README.txt b/plasma/dataengines/powermanagement/README.txt similarity index 100% rename from plasma/generic/dataengines/powermanagement/README.txt rename to plasma/dataengines/powermanagement/README.txt diff --git a/plasma/generic/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop b/plasma/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop similarity index 100% rename from plasma/generic/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop rename to plasma/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop diff --git a/plasma/generic/dataengines/powermanagement/powermanagementengine.cpp b/plasma/dataengines/powermanagement/powermanagementengine.cpp similarity index 100% rename from plasma/generic/dataengines/powermanagement/powermanagementengine.cpp rename to plasma/dataengines/powermanagement/powermanagementengine.cpp diff --git a/plasma/generic/dataengines/powermanagement/powermanagementengine.h b/plasma/dataengines/powermanagement/powermanagementengine.h similarity index 100% rename from plasma/generic/dataengines/powermanagement/powermanagementengine.h rename to plasma/dataengines/powermanagement/powermanagementengine.h diff --git a/plasma/generic/dataengines/powermanagement/powermanagementjob.cpp b/plasma/dataengines/powermanagement/powermanagementjob.cpp similarity index 100% rename from plasma/generic/dataengines/powermanagement/powermanagementjob.cpp rename to plasma/dataengines/powermanagement/powermanagementjob.cpp diff --git a/plasma/generic/dataengines/powermanagement/powermanagementjob.h b/plasma/dataengines/powermanagement/powermanagementjob.h similarity index 100% rename from plasma/generic/dataengines/powermanagement/powermanagementjob.h rename to plasma/dataengines/powermanagement/powermanagementjob.h diff --git a/plasma/generic/dataengines/powermanagement/powermanagementservice.cpp b/plasma/dataengines/powermanagement/powermanagementservice.cpp similarity index 100% rename from plasma/generic/dataengines/powermanagement/powermanagementservice.cpp rename to plasma/dataengines/powermanagement/powermanagementservice.cpp diff --git a/plasma/generic/dataengines/powermanagement/powermanagementservice.h b/plasma/dataengines/powermanagement/powermanagementservice.h similarity index 100% rename from plasma/generic/dataengines/powermanagement/powermanagementservice.h rename to plasma/dataengines/powermanagement/powermanagementservice.h diff --git a/plasma/generic/dataengines/powermanagement/powermanagementservice.operations b/plasma/dataengines/powermanagement/powermanagementservice.operations similarity index 100% rename from plasma/generic/dataengines/powermanagement/powermanagementservice.operations rename to plasma/dataengines/powermanagement/powermanagementservice.operations diff --git a/plasma/generic/dataengines/share/CMakeLists.txt b/plasma/dataengines/share/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/CMakeLists.txt rename to plasma/dataengines/share/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/Messages.sh b/plasma/dataengines/share/Messages.sh similarity index 100% rename from plasma/generic/dataengines/share/Messages.sh rename to plasma/dataengines/share/Messages.sh diff --git a/plasma/generic/dataengines/share/backends/CMakeLists.txt b/plasma/dataengines/share/backends/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/CMakeLists.txt rename to plasma/dataengines/share/backends/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/im9/CMakeLists.txt b/plasma/dataengines/share/backends/im9/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/im9/CMakeLists.txt rename to plasma/dataengines/share/backends/im9/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/im9/contents/code/main.js b/plasma/dataengines/share/backends/im9/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/im9/contents/code/main.js rename to plasma/dataengines/share/backends/im9/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/im9/metadata.desktop b/plasma/dataengines/share/backends/im9/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/im9/metadata.desktop rename to plasma/dataengines/share/backends/im9/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt b/plasma/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt rename to plasma/dataengines/share/backends/imgsusepasteorg/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/imgsusepasteorg/contents/code/main.js b/plasma/dataengines/share/backends/imgsusepasteorg/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/imgsusepasteorg/contents/code/main.js rename to plasma/dataengines/share/backends/imgsusepasteorg/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/imgsusepasteorg/metadata.desktop b/plasma/dataengines/share/backends/imgsusepasteorg/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/imgsusepasteorg/metadata.desktop rename to plasma/dataengines/share/backends/imgsusepasteorg/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/imgur/CMakeLists.txt b/plasma/dataengines/share/backends/imgur/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/imgur/CMakeLists.txt rename to plasma/dataengines/share/backends/imgur/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/imgur/contents/code/main.js b/plasma/dataengines/share/backends/imgur/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/imgur/contents/code/main.js rename to plasma/dataengines/share/backends/imgur/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/imgur/metadata.desktop b/plasma/dataengines/share/backends/imgur/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/imgur/metadata.desktop rename to plasma/dataengines/share/backends/imgur/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/kde/CMakeLists.txt b/plasma/dataengines/share/backends/kde/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/kde/CMakeLists.txt rename to plasma/dataengines/share/backends/kde/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/kde/contents/code/main.js b/plasma/dataengines/share/backends/kde/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/kde/contents/code/main.js rename to plasma/dataengines/share/backends/kde/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/kde/metadata.desktop b/plasma/dataengines/share/backends/kde/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/kde/metadata.desktop rename to plasma/dataengines/share/backends/kde/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/pastebincom/CMakeLists.txt b/plasma/dataengines/share/backends/pastebincom/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/pastebincom/CMakeLists.txt rename to plasma/dataengines/share/backends/pastebincom/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/pastebincom/contents/code/main.js b/plasma/dataengines/share/backends/pastebincom/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/pastebincom/contents/code/main.js rename to plasma/dataengines/share/backends/pastebincom/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/pastebincom/metadata.desktop b/plasma/dataengines/share/backends/pastebincom/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/pastebincom/metadata.desktop rename to plasma/dataengines/share/backends/pastebincom/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt b/plasma/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt rename to plasma/dataengines/share/backends/pasteopensuseorg/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/pasteopensuseorg/contents/code/main.js b/plasma/dataengines/share/backends/pasteopensuseorg/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/pasteopensuseorg/contents/code/main.js rename to plasma/dataengines/share/backends/pasteopensuseorg/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/pasteopensuseorg/metadata.desktop b/plasma/dataengines/share/backends/pasteopensuseorg/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/pasteopensuseorg/metadata.desktop rename to plasma/dataengines/share/backends/pasteopensuseorg/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/pasteubuntucom/CMakeLists.txt b/plasma/dataengines/share/backends/pasteubuntucom/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/pasteubuntucom/CMakeLists.txt rename to plasma/dataengines/share/backends/pasteubuntucom/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/pasteubuntucom/contents/code/main.js b/plasma/dataengines/share/backends/pasteubuntucom/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/pasteubuntucom/contents/code/main.js rename to plasma/dataengines/share/backends/pasteubuntucom/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/pasteubuntucom/metadata.desktop b/plasma/dataengines/share/backends/pasteubuntucom/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/pasteubuntucom/metadata.desktop rename to plasma/dataengines/share/backends/pasteubuntucom/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/privatepaste/CMakeLists.txt b/plasma/dataengines/share/backends/privatepaste/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/privatepaste/CMakeLists.txt rename to plasma/dataengines/share/backends/privatepaste/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/privatepaste/contents/code/main.js b/plasma/dataengines/share/backends/privatepaste/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/privatepaste/contents/code/main.js rename to plasma/dataengines/share/backends/privatepaste/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/privatepaste/metadata.desktop b/plasma/dataengines/share/backends/privatepaste/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/privatepaste/metadata.desktop rename to plasma/dataengines/share/backends/privatepaste/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/simplestimagehosting/CMakeLists.txt b/plasma/dataengines/share/backends/simplestimagehosting/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/simplestimagehosting/CMakeLists.txt rename to plasma/dataengines/share/backends/simplestimagehosting/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/simplestimagehosting/contents/code/main.js b/plasma/dataengines/share/backends/simplestimagehosting/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/simplestimagehosting/contents/code/main.js rename to plasma/dataengines/share/backends/simplestimagehosting/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/simplestimagehosting/metadata.desktop b/plasma/dataengines/share/backends/simplestimagehosting/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/simplestimagehosting/metadata.desktop rename to plasma/dataengines/share/backends/simplestimagehosting/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/wklej/CMakeLists.txt b/plasma/dataengines/share/backends/wklej/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/wklej/CMakeLists.txt rename to plasma/dataengines/share/backends/wklej/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/wklej/contents/code/main.js b/plasma/dataengines/share/backends/wklej/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/wklej/contents/code/main.js rename to plasma/dataengines/share/backends/wklej/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/wklej/metadata.desktop b/plasma/dataengines/share/backends/wklej/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/wklej/metadata.desktop rename to plasma/dataengines/share/backends/wklej/metadata.desktop diff --git a/plasma/generic/dataengines/share/backends/wstaw/CMakeLists.txt b/plasma/dataengines/share/backends/wstaw/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/share/backends/wstaw/CMakeLists.txt rename to plasma/dataengines/share/backends/wstaw/CMakeLists.txt diff --git a/plasma/generic/dataengines/share/backends/wstaw/contents/code/main.js b/plasma/dataengines/share/backends/wstaw/contents/code/main.js similarity index 100% rename from plasma/generic/dataengines/share/backends/wstaw/contents/code/main.js rename to plasma/dataengines/share/backends/wstaw/contents/code/main.js diff --git a/plasma/generic/dataengines/share/backends/wstaw/metadata.desktop b/plasma/dataengines/share/backends/wstaw/metadata.desktop similarity index 100% rename from plasma/generic/dataengines/share/backends/wstaw/metadata.desktop rename to plasma/dataengines/share/backends/wstaw/metadata.desktop diff --git a/plasma/generic/dataengines/share/data/plasma-dataengine-share.desktop b/plasma/dataengines/share/data/plasma-dataengine-share.desktop similarity index 100% rename from plasma/generic/dataengines/share/data/plasma-dataengine-share.desktop rename to plasma/dataengines/share/data/plasma-dataengine-share.desktop diff --git a/plasma/generic/dataengines/share/data/plasma-packagestructure-share.desktop b/plasma/dataengines/share/data/plasma-packagestructure-share.desktop similarity index 100% rename from plasma/generic/dataengines/share/data/plasma-packagestructure-share.desktop rename to plasma/dataengines/share/data/plasma-packagestructure-share.desktop diff --git a/plasma/generic/dataengines/share/data/plasma_shareprovider.desktop b/plasma/dataengines/share/data/plasma_shareprovider.desktop similarity index 100% rename from plasma/generic/dataengines/share/data/plasma_shareprovider.desktop rename to plasma/dataengines/share/data/plasma_shareprovider.desktop diff --git a/plasma/generic/dataengines/share/plugin_share_package.cpp b/plasma/dataengines/share/plugin_share_package.cpp similarity index 100% rename from plasma/generic/dataengines/share/plugin_share_package.cpp rename to plasma/dataengines/share/plugin_share_package.cpp diff --git a/plasma/generic/dataengines/share/share.operations b/plasma/dataengines/share/share.operations similarity index 100% rename from plasma/generic/dataengines/share/share.operations rename to plasma/dataengines/share/share.operations diff --git a/plasma/generic/dataengines/share/share_package.cpp b/plasma/dataengines/share/share_package.cpp similarity index 100% rename from plasma/generic/dataengines/share/share_package.cpp rename to plasma/dataengines/share/share_package.cpp diff --git a/plasma/generic/dataengines/share/share_package.h b/plasma/dataengines/share/share_package.h similarity index 100% rename from plasma/generic/dataengines/share/share_package.h rename to plasma/dataengines/share/share_package.h diff --git a/plasma/generic/dataengines/share/shareengine.cpp b/plasma/dataengines/share/shareengine.cpp similarity index 100% rename from plasma/generic/dataengines/share/shareengine.cpp rename to plasma/dataengines/share/shareengine.cpp diff --git a/plasma/generic/dataengines/share/shareengine.h b/plasma/dataengines/share/shareengine.h similarity index 100% rename from plasma/generic/dataengines/share/shareengine.h rename to plasma/dataengines/share/shareengine.h diff --git a/plasma/generic/dataengines/share/shareprovider.cpp b/plasma/dataengines/share/shareprovider.cpp similarity index 100% rename from plasma/generic/dataengines/share/shareprovider.cpp rename to plasma/dataengines/share/shareprovider.cpp diff --git a/plasma/generic/dataengines/share/shareprovider.h b/plasma/dataengines/share/shareprovider.h similarity index 100% rename from plasma/generic/dataengines/share/shareprovider.h rename to plasma/dataengines/share/shareprovider.h diff --git a/plasma/generic/dataengines/share/shareservice.cpp b/plasma/dataengines/share/shareservice.cpp similarity index 100% rename from plasma/generic/dataengines/share/shareservice.cpp rename to plasma/dataengines/share/shareservice.cpp diff --git a/plasma/generic/dataengines/share/shareservice.h b/plasma/dataengines/share/shareservice.h similarity index 100% rename from plasma/generic/dataengines/share/shareservice.h rename to plasma/dataengines/share/shareservice.h diff --git a/plasma/generic/dataengines/soliddevice/CMakeLists.txt b/plasma/dataengines/soliddevice/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/soliddevice/CMakeLists.txt rename to plasma/dataengines/soliddevice/CMakeLists.txt diff --git a/plasma/generic/dataengines/soliddevice/Messages.sh b/plasma/dataengines/soliddevice/Messages.sh similarity index 100% rename from plasma/generic/dataengines/soliddevice/Messages.sh rename to plasma/dataengines/soliddevice/Messages.sh diff --git a/plasma/generic/dataengines/soliddevice/devicesignalmapmanager.cpp b/plasma/dataengines/soliddevice/devicesignalmapmanager.cpp similarity index 100% rename from plasma/generic/dataengines/soliddevice/devicesignalmapmanager.cpp rename to plasma/dataengines/soliddevice/devicesignalmapmanager.cpp diff --git a/plasma/generic/dataengines/soliddevice/devicesignalmapmanager.h b/plasma/dataengines/soliddevice/devicesignalmapmanager.h similarity index 100% rename from plasma/generic/dataengines/soliddevice/devicesignalmapmanager.h rename to plasma/dataengines/soliddevice/devicesignalmapmanager.h diff --git a/plasma/generic/dataengines/soliddevice/devicesignalmapper.cpp b/plasma/dataengines/soliddevice/devicesignalmapper.cpp similarity index 100% rename from plasma/generic/dataengines/soliddevice/devicesignalmapper.cpp rename to plasma/dataengines/soliddevice/devicesignalmapper.cpp diff --git a/plasma/generic/dataengines/soliddevice/devicesignalmapper.h b/plasma/dataengines/soliddevice/devicesignalmapper.h similarity index 100% rename from plasma/generic/dataengines/soliddevice/devicesignalmapper.h rename to plasma/dataengines/soliddevice/devicesignalmapper.h diff --git a/plasma/generic/dataengines/soliddevice/hddtemp.cpp b/plasma/dataengines/soliddevice/hddtemp.cpp similarity index 100% rename from plasma/generic/dataengines/soliddevice/hddtemp.cpp rename to plasma/dataengines/soliddevice/hddtemp.cpp diff --git a/plasma/generic/dataengines/soliddevice/hddtemp.h b/plasma/dataengines/soliddevice/hddtemp.h similarity index 100% rename from plasma/generic/dataengines/soliddevice/hddtemp.h rename to plasma/dataengines/soliddevice/hddtemp.h diff --git a/plasma/generic/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop b/plasma/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop similarity index 100% rename from plasma/generic/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop rename to plasma/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop diff --git a/plasma/generic/dataengines/soliddevice/soliddevice.operations b/plasma/dataengines/soliddevice/soliddevice.operations similarity index 100% rename from plasma/generic/dataengines/soliddevice/soliddevice.operations rename to plasma/dataengines/soliddevice/soliddevice.operations diff --git a/plasma/generic/dataengines/soliddevice/soliddeviceengine.cpp b/plasma/dataengines/soliddevice/soliddeviceengine.cpp similarity index 100% rename from plasma/generic/dataengines/soliddevice/soliddeviceengine.cpp rename to plasma/dataengines/soliddevice/soliddeviceengine.cpp diff --git a/plasma/generic/dataengines/soliddevice/soliddeviceengine.h b/plasma/dataengines/soliddevice/soliddeviceengine.h similarity index 100% rename from plasma/generic/dataengines/soliddevice/soliddeviceengine.h rename to plasma/dataengines/soliddevice/soliddeviceengine.h diff --git a/plasma/generic/dataengines/soliddevice/soliddevicejob.cpp b/plasma/dataengines/soliddevice/soliddevicejob.cpp similarity index 100% rename from plasma/generic/dataengines/soliddevice/soliddevicejob.cpp rename to plasma/dataengines/soliddevice/soliddevicejob.cpp diff --git a/plasma/generic/dataengines/soliddevice/soliddevicejob.h b/plasma/dataengines/soliddevice/soliddevicejob.h similarity index 100% rename from plasma/generic/dataengines/soliddevice/soliddevicejob.h rename to plasma/dataengines/soliddevice/soliddevicejob.h diff --git a/plasma/generic/dataengines/soliddevice/soliddeviceservice.cpp b/plasma/dataengines/soliddevice/soliddeviceservice.cpp similarity index 100% rename from plasma/generic/dataengines/soliddevice/soliddeviceservice.cpp rename to plasma/dataengines/soliddevice/soliddeviceservice.cpp diff --git a/plasma/generic/dataengines/soliddevice/soliddeviceservice.h b/plasma/dataengines/soliddevice/soliddeviceservice.h similarity index 100% rename from plasma/generic/dataengines/soliddevice/soliddeviceservice.h rename to plasma/dataengines/soliddevice/soliddeviceservice.h diff --git a/plasma/generic/dataengines/statusnotifieritem/CMakeLists.txt b/plasma/dataengines/statusnotifieritem/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/CMakeLists.txt rename to plasma/dataengines/statusnotifieritem/CMakeLists.txt diff --git a/plasma/generic/dataengines/statusnotifieritem/plasma_engine_statusnotifieritem.desktop b/plasma/dataengines/statusnotifieritem/plasma_engine_statusnotifieritem.desktop similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/plasma_engine_statusnotifieritem.desktop rename to plasma/dataengines/statusnotifieritem/plasma_engine_statusnotifieritem.desktop diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritem.operations b/plasma/dataengines/statusnotifieritem/statusnotifieritem.operations similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritem.operations rename to plasma/dataengines/statusnotifieritem/statusnotifieritem.operations diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp b/plasma/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp rename to plasma/dataengines/statusnotifieritem/statusnotifieritem_engine.cpp diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.h b/plasma/dataengines/statusnotifieritem/statusnotifieritem_engine.h similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritem_engine.h rename to plasma/dataengines/statusnotifieritem/statusnotifieritem_engine.h diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemjob.cpp b/plasma/dataengines/statusnotifieritem/statusnotifieritemjob.cpp similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritemjob.cpp rename to plasma/dataengines/statusnotifieritem/statusnotifieritemjob.cpp diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemjob.h b/plasma/dataengines/statusnotifieritem/statusnotifieritemjob.h similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritemjob.h rename to plasma/dataengines/statusnotifieritem/statusnotifieritemjob.h diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemservice.cpp b/plasma/dataengines/statusnotifieritem/statusnotifieritemservice.cpp similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritemservice.cpp rename to plasma/dataengines/statusnotifieritem/statusnotifieritemservice.cpp diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemservice.h b/plasma/dataengines/statusnotifieritem/statusnotifieritemservice.h similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritemservice.h rename to plasma/dataengines/statusnotifieritem/statusnotifieritemservice.h diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/plasma/dataengines/statusnotifieritem/statusnotifieritemsource.cpp similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.cpp rename to plasma/dataengines/statusnotifieritem/statusnotifieritemsource.cpp diff --git a/plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.h b/plasma/dataengines/statusnotifieritem/statusnotifieritemsource.h similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/statusnotifieritemsource.h rename to plasma/dataengines/statusnotifieritem/statusnotifieritemsource.h diff --git a/plasma/generic/dataengines/statusnotifieritem/systemtraytypes.cpp b/plasma/dataengines/statusnotifieritem/systemtraytypes.cpp similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/systemtraytypes.cpp rename to plasma/dataengines/statusnotifieritem/systemtraytypes.cpp diff --git a/plasma/generic/dataengines/statusnotifieritem/systemtraytypes.h b/plasma/dataengines/statusnotifieritem/systemtraytypes.h similarity index 100% rename from plasma/generic/dataengines/statusnotifieritem/systemtraytypes.h rename to plasma/dataengines/statusnotifieritem/systemtraytypes.h diff --git a/plasma/generic/dataengines/systemmonitor/CMakeLists.txt b/plasma/dataengines/systemmonitor/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/systemmonitor/CMakeLists.txt rename to plasma/dataengines/systemmonitor/CMakeLists.txt diff --git a/plasma/generic/dataengines/systemmonitor/Messages.sh b/plasma/dataengines/systemmonitor/Messages.sh similarity index 100% rename from plasma/generic/dataengines/systemmonitor/Messages.sh rename to plasma/dataengines/systemmonitor/Messages.sh diff --git a/plasma/generic/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop b/plasma/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop similarity index 100% rename from plasma/generic/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop rename to plasma/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop diff --git a/plasma/generic/dataengines/systemmonitor/sensorclient.h b/plasma/dataengines/systemmonitor/sensorclient.h similarity index 100% rename from plasma/generic/dataengines/systemmonitor/sensorclient.h rename to plasma/dataengines/systemmonitor/sensorclient.h diff --git a/plasma/generic/dataengines/systemmonitor/systemmonitor.cpp b/plasma/dataengines/systemmonitor/systemmonitor.cpp similarity index 100% rename from plasma/generic/dataengines/systemmonitor/systemmonitor.cpp rename to plasma/dataengines/systemmonitor/systemmonitor.cpp diff --git a/plasma/generic/dataengines/systemmonitor/systemmonitor.h b/plasma/dataengines/systemmonitor/systemmonitor.h similarity index 100% rename from plasma/generic/dataengines/systemmonitor/systemmonitor.h rename to plasma/dataengines/systemmonitor/systemmonitor.h diff --git a/plasma/generic/dataengines/tasks/CMakeLists.txt b/plasma/dataengines/tasks/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/tasks/CMakeLists.txt rename to plasma/dataengines/tasks/CMakeLists.txt diff --git a/plasma/generic/dataengines/tasks/plasma-dataengine-tasks.desktop b/plasma/dataengines/tasks/plasma-dataengine-tasks.desktop similarity index 100% rename from plasma/generic/dataengines/tasks/plasma-dataengine-tasks.desktop rename to plasma/dataengines/tasks/plasma-dataengine-tasks.desktop diff --git a/plasma/generic/dataengines/tasks/taskjob.cpp b/plasma/dataengines/tasks/taskjob.cpp similarity index 100% rename from plasma/generic/dataengines/tasks/taskjob.cpp rename to plasma/dataengines/tasks/taskjob.cpp diff --git a/plasma/generic/dataengines/tasks/taskjob.h b/plasma/dataengines/tasks/taskjob.h similarity index 100% rename from plasma/generic/dataengines/tasks/taskjob.h rename to plasma/dataengines/tasks/taskjob.h diff --git a/plasma/generic/dataengines/tasks/tasks.operations b/plasma/dataengines/tasks/tasks.operations similarity index 100% rename from plasma/generic/dataengines/tasks/tasks.operations rename to plasma/dataengines/tasks/tasks.operations diff --git a/plasma/generic/dataengines/tasks/tasksengine.cpp b/plasma/dataengines/tasks/tasksengine.cpp similarity index 100% rename from plasma/generic/dataengines/tasks/tasksengine.cpp rename to plasma/dataengines/tasks/tasksengine.cpp diff --git a/plasma/generic/dataengines/tasks/tasksengine.h b/plasma/dataengines/tasks/tasksengine.h similarity index 100% rename from plasma/generic/dataengines/tasks/tasksengine.h rename to plasma/dataengines/tasks/tasksengine.h diff --git a/plasma/generic/dataengines/tasks/taskservice.cpp b/plasma/dataengines/tasks/taskservice.cpp similarity index 100% rename from plasma/generic/dataengines/tasks/taskservice.cpp rename to plasma/dataengines/tasks/taskservice.cpp diff --git a/plasma/generic/dataengines/tasks/taskservice.h b/plasma/dataengines/tasks/taskservice.h similarity index 100% rename from plasma/generic/dataengines/tasks/taskservice.h rename to plasma/dataengines/tasks/taskservice.h diff --git a/plasma/generic/dataengines/tasks/tasksource.cpp b/plasma/dataengines/tasks/tasksource.cpp similarity index 100% rename from plasma/generic/dataengines/tasks/tasksource.cpp rename to plasma/dataengines/tasks/tasksource.cpp diff --git a/plasma/generic/dataengines/tasks/tasksource.h b/plasma/dataengines/tasks/tasksource.h similarity index 100% rename from plasma/generic/dataengines/tasks/tasksource.h rename to plasma/dataengines/tasks/tasksource.h diff --git a/plasma/generic/dataengines/tasks/virtualdesktopssource.cpp b/plasma/dataengines/tasks/virtualdesktopssource.cpp similarity index 100% rename from plasma/generic/dataengines/tasks/virtualdesktopssource.cpp rename to plasma/dataengines/tasks/virtualdesktopssource.cpp diff --git a/plasma/generic/dataengines/tasks/virtualdesktopssource.h b/plasma/dataengines/tasks/virtualdesktopssource.h similarity index 100% rename from plasma/generic/dataengines/tasks/virtualdesktopssource.h rename to plasma/dataengines/tasks/virtualdesktopssource.h diff --git a/plasma/generic/dataengines/time/CMakeLists.txt b/plasma/dataengines/time/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/time/CMakeLists.txt rename to plasma/dataengines/time/CMakeLists.txt diff --git a/plasma/generic/dataengines/time/plasma-dataengine-time.desktop b/plasma/dataengines/time/plasma-dataengine-time.desktop similarity index 100% rename from plasma/generic/dataengines/time/plasma-dataengine-time.desktop rename to plasma/dataengines/time/plasma-dataengine-time.desktop diff --git a/plasma/generic/dataengines/time/solarsystem.cpp b/plasma/dataengines/time/solarsystem.cpp similarity index 100% rename from plasma/generic/dataengines/time/solarsystem.cpp rename to plasma/dataengines/time/solarsystem.cpp diff --git a/plasma/generic/dataengines/time/solarsystem.h b/plasma/dataengines/time/solarsystem.h similarity index 100% rename from plasma/generic/dataengines/time/solarsystem.h rename to plasma/dataengines/time/solarsystem.h diff --git a/plasma/generic/dataengines/time/timeengine.cpp b/plasma/dataengines/time/timeengine.cpp similarity index 100% rename from plasma/generic/dataengines/time/timeengine.cpp rename to plasma/dataengines/time/timeengine.cpp diff --git a/plasma/generic/dataengines/time/timeengine.h b/plasma/dataengines/time/timeengine.h similarity index 100% rename from plasma/generic/dataengines/time/timeengine.h rename to plasma/dataengines/time/timeengine.h diff --git a/plasma/generic/dataengines/time/timesource.cpp b/plasma/dataengines/time/timesource.cpp similarity index 100% rename from plasma/generic/dataengines/time/timesource.cpp rename to plasma/dataengines/time/timesource.cpp diff --git a/plasma/generic/dataengines/time/timesource.h b/plasma/dataengines/time/timesource.h similarity index 100% rename from plasma/generic/dataengines/time/timesource.h rename to plasma/dataengines/time/timesource.h diff --git a/plasma/generic/dataengines/weather/CMakeLists.txt b/plasma/dataengines/weather/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/weather/CMakeLists.txt rename to plasma/dataengines/weather/CMakeLists.txt diff --git a/plasma/generic/dataengines/weather/Messages.sh b/plasma/dataengines/weather/Messages.sh similarity index 100% rename from plasma/generic/dataengines/weather/Messages.sh rename to plasma/dataengines/weather/Messages.sh diff --git a/plasma/generic/dataengines/weather/ions/CMakeLists.txt b/plasma/dataengines/weather/ions/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/weather/ions/CMakeLists.txt rename to plasma/dataengines/weather/ions/CMakeLists.txt diff --git a/plasma/generic/dataengines/weather/ions/bbcukmet/CMakeLists.txt b/plasma/dataengines/weather/ions/bbcukmet/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/weather/ions/bbcukmet/CMakeLists.txt rename to plasma/dataengines/weather/ions/bbcukmet/CMakeLists.txt diff --git a/plasma/generic/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop b/plasma/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop similarity index 100% rename from plasma/generic/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop rename to plasma/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop diff --git a/plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp b/plasma/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp similarity index 100% rename from plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp rename to plasma/dataengines/weather/ions/bbcukmet/ion_bbcukmet.cpp diff --git a/plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h b/plasma/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h rename to plasma/dataengines/weather/ions/bbcukmet/ion_bbcukmet.h diff --git a/plasma/generic/dataengines/weather/ions/data/bbcukmet_i18n.dat b/plasma/dataengines/weather/ions/data/bbcukmet_i18n.dat similarity index 100% rename from plasma/generic/dataengines/weather/ions/data/bbcukmet_i18n.dat rename to plasma/dataengines/weather/ions/data/bbcukmet_i18n.dat diff --git a/plasma/generic/dataengines/weather/ions/data/envcan_i18n.dat b/plasma/dataengines/weather/ions/data/envcan_i18n.dat similarity index 100% rename from plasma/generic/dataengines/weather/ions/data/envcan_i18n.dat rename to plasma/dataengines/weather/ions/data/envcan_i18n.dat diff --git a/plasma/generic/dataengines/weather/ions/data/noaa_i18n.dat b/plasma/dataengines/weather/ions/data/noaa_i18n.dat similarity index 100% rename from plasma/generic/dataengines/weather/ions/data/noaa_i18n.dat rename to plasma/dataengines/weather/ions/data/noaa_i18n.dat diff --git a/plasma/generic/dataengines/weather/ions/dataengineconsumer.h b/plasma/dataengines/weather/ions/dataengineconsumer.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/dataengineconsumer.h rename to plasma/dataengines/weather/ions/dataengineconsumer.h diff --git a/plasma/generic/dataengines/weather/ions/debianweather/CMakeLists.txt b/plasma/dataengines/weather/ions/debianweather/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/weather/ions/debianweather/CMakeLists.txt rename to plasma/dataengines/weather/ions/debianweather/CMakeLists.txt diff --git a/plasma/generic/dataengines/weather/ions/debianweather/ion-debianweather.desktop b/plasma/dataengines/weather/ions/debianweather/ion-debianweather.desktop similarity index 100% rename from plasma/generic/dataengines/weather/ions/debianweather/ion-debianweather.desktop rename to plasma/dataengines/weather/ions/debianweather/ion-debianweather.desktop diff --git a/plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.cpp b/plasma/dataengines/weather/ions/debianweather/iondebianweather.cpp similarity index 100% rename from plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.cpp rename to plasma/dataengines/weather/ions/debianweather/iondebianweather.cpp diff --git a/plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.h b/plasma/dataengines/weather/ions/debianweather/iondebianweather.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/debianweather/iondebianweather.h rename to plasma/dataengines/weather/ions/debianweather/iondebianweather.h diff --git a/plasma/generic/dataengines/weather/ions/envcan/CMakeLists.txt b/plasma/dataengines/weather/ions/envcan/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/weather/ions/envcan/CMakeLists.txt rename to plasma/dataengines/weather/ions/envcan/CMakeLists.txt diff --git a/plasma/generic/dataengines/weather/ions/envcan/ion-envcan.desktop b/plasma/dataengines/weather/ions/envcan/ion-envcan.desktop similarity index 100% rename from plasma/generic/dataengines/weather/ions/envcan/ion-envcan.desktop rename to plasma/dataengines/weather/ions/envcan/ion-envcan.desktop diff --git a/plasma/generic/dataengines/weather/ions/envcan/ion_envcan.cpp b/plasma/dataengines/weather/ions/envcan/ion_envcan.cpp similarity index 100% rename from plasma/generic/dataengines/weather/ions/envcan/ion_envcan.cpp rename to plasma/dataengines/weather/ions/envcan/ion_envcan.cpp diff --git a/plasma/generic/dataengines/weather/ions/envcan/ion_envcan.h b/plasma/dataengines/weather/ions/envcan/ion_envcan.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/envcan/ion_envcan.h rename to plasma/dataengines/weather/ions/envcan/ion_envcan.h diff --git a/plasma/generic/dataengines/weather/ions/includes/Ion b/plasma/dataengines/weather/ions/includes/Ion similarity index 100% rename from plasma/generic/dataengines/weather/ions/includes/Ion rename to plasma/dataengines/weather/ions/includes/Ion diff --git a/plasma/generic/dataengines/weather/ions/ion.cpp b/plasma/dataengines/weather/ions/ion.cpp similarity index 100% rename from plasma/generic/dataengines/weather/ions/ion.cpp rename to plasma/dataengines/weather/ions/ion.cpp diff --git a/plasma/generic/dataengines/weather/ions/ion.h b/plasma/dataengines/weather/ions/ion.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/ion.h rename to plasma/dataengines/weather/ions/ion.h diff --git a/plasma/generic/dataengines/weather/ions/ion_export.h b/plasma/dataengines/weather/ions/ion_export.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/ion_export.h rename to plasma/dataengines/weather/ions/ion_export.h diff --git a/plasma/generic/dataengines/weather/ions/noaa/CMakeLists.txt b/plasma/dataengines/weather/ions/noaa/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/weather/ions/noaa/CMakeLists.txt rename to plasma/dataengines/weather/ions/noaa/CMakeLists.txt diff --git a/plasma/generic/dataengines/weather/ions/noaa/ion-noaa.desktop b/plasma/dataengines/weather/ions/noaa/ion-noaa.desktop similarity index 100% rename from plasma/generic/dataengines/weather/ions/noaa/ion-noaa.desktop rename to plasma/dataengines/weather/ions/noaa/ion-noaa.desktop diff --git a/plasma/generic/dataengines/weather/ions/noaa/ion_noaa.cpp b/plasma/dataengines/weather/ions/noaa/ion_noaa.cpp similarity index 100% rename from plasma/generic/dataengines/weather/ions/noaa/ion_noaa.cpp rename to plasma/dataengines/weather/ions/noaa/ion_noaa.cpp diff --git a/plasma/generic/dataengines/weather/ions/noaa/ion_noaa.h b/plasma/dataengines/weather/ions/noaa/ion_noaa.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/noaa/ion_noaa.h rename to plasma/dataengines/weather/ions/noaa/ion_noaa.h diff --git a/plasma/generic/dataengines/weather/ions/wetter.com/CMakeLists.txt b/plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt similarity index 100% rename from plasma/generic/dataengines/weather/ions/wetter.com/CMakeLists.txt rename to plasma/dataengines/weather/ions/wetter.com/CMakeLists.txt diff --git a/plasma/generic/dataengines/weather/ions/wetter.com/ion-wettercom.desktop b/plasma/dataengines/weather/ions/wetter.com/ion-wettercom.desktop similarity index 100% rename from plasma/generic/dataengines/weather/ions/wetter.com/ion-wettercom.desktop rename to plasma/dataengines/weather/ions/wetter.com/ion-wettercom.desktop diff --git a/plasma/generic/dataengines/weather/ions/wetter.com/ion_wettercom.cpp b/plasma/dataengines/weather/ions/wetter.com/ion_wettercom.cpp similarity index 100% rename from plasma/generic/dataengines/weather/ions/wetter.com/ion_wettercom.cpp rename to plasma/dataengines/weather/ions/wetter.com/ion_wettercom.cpp diff --git a/plasma/generic/dataengines/weather/ions/wetter.com/ion_wettercom.h b/plasma/dataengines/weather/ions/wetter.com/ion_wettercom.h similarity index 100% rename from plasma/generic/dataengines/weather/ions/wetter.com/ion_wettercom.h rename to plasma/dataengines/weather/ions/wetter.com/ion_wettercom.h diff --git a/plasma/generic/dataengines/weather/plasma-dataengine-weather.desktop b/plasma/dataengines/weather/plasma-dataengine-weather.desktop similarity index 100% rename from plasma/generic/dataengines/weather/plasma-dataengine-weather.desktop rename to plasma/dataengines/weather/plasma-dataengine-weather.desktop diff --git a/plasma/generic/dataengines/weather/weatherengine.cpp b/plasma/dataengines/weather/weatherengine.cpp similarity index 100% rename from plasma/generic/dataengines/weather/weatherengine.cpp rename to plasma/dataengines/weather/weatherengine.cpp diff --git a/plasma/generic/dataengines/weather/weatherengine.h b/plasma/dataengines/weather/weatherengine.h similarity index 100% rename from plasma/generic/dataengines/weather/weatherengine.h rename to plasma/dataengines/weather/weatherengine.h diff --git a/plasma/generic/declarativeimports/CMakeLists.txt b/plasma/declarativeimports/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/CMakeLists.txt rename to plasma/declarativeimports/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/core/CMakeLists.txt b/plasma/declarativeimports/core/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/core/CMakeLists.txt rename to plasma/declarativeimports/core/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/core/corebindingsplugin.cpp b/plasma/declarativeimports/core/corebindingsplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/corebindingsplugin.cpp rename to plasma/declarativeimports/core/corebindingsplugin.cpp diff --git a/plasma/generic/declarativeimports/core/corebindingsplugin.h b/plasma/declarativeimports/core/corebindingsplugin.h similarity index 100% rename from plasma/generic/declarativeimports/core/corebindingsplugin.h rename to plasma/declarativeimports/core/corebindingsplugin.h diff --git a/plasma/generic/declarativeimports/core/dataenginebindings.cpp b/plasma/declarativeimports/core/dataenginebindings.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/dataenginebindings.cpp rename to plasma/declarativeimports/core/dataenginebindings.cpp diff --git a/plasma/generic/declarativeimports/core/dataenginebindings_p.h b/plasma/declarativeimports/core/dataenginebindings_p.h similarity index 100% rename from plasma/generic/declarativeimports/core/dataenginebindings_p.h rename to plasma/declarativeimports/core/dataenginebindings_p.h diff --git a/plasma/generic/declarativeimports/core/dataengineconsumer.cpp b/plasma/declarativeimports/core/dataengineconsumer.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/dataengineconsumer.cpp rename to plasma/declarativeimports/core/dataengineconsumer.cpp diff --git a/plasma/generic/declarativeimports/core/dataengineconsumer_p.h b/plasma/declarativeimports/core/dataengineconsumer_p.h similarity index 100% rename from plasma/generic/declarativeimports/core/dataengineconsumer_p.h rename to plasma/declarativeimports/core/dataengineconsumer_p.h diff --git a/plasma/generic/declarativeimports/core/datamodel.cpp b/plasma/declarativeimports/core/datamodel.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/datamodel.cpp rename to plasma/declarativeimports/core/datamodel.cpp diff --git a/plasma/generic/declarativeimports/core/datamodel.h b/plasma/declarativeimports/core/datamodel.h similarity index 100% rename from plasma/generic/declarativeimports/core/datamodel.h rename to plasma/declarativeimports/core/datamodel.h diff --git a/plasma/generic/declarativeimports/core/datasource.cpp b/plasma/declarativeimports/core/datasource.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/datasource.cpp rename to plasma/declarativeimports/core/datasource.cpp diff --git a/plasma/generic/declarativeimports/core/datasource.h b/plasma/declarativeimports/core/datasource.h similarity index 100% rename from plasma/generic/declarativeimports/core/datasource.h rename to plasma/declarativeimports/core/datasource.h diff --git a/plasma/generic/declarativeimports/core/declarativeitemcontainer.cpp b/plasma/declarativeimports/core/declarativeitemcontainer.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/declarativeitemcontainer.cpp rename to plasma/declarativeimports/core/declarativeitemcontainer.cpp diff --git a/plasma/generic/declarativeimports/core/declarativeitemcontainer_p.h b/plasma/declarativeimports/core/declarativeitemcontainer_p.h similarity index 100% rename from plasma/generic/declarativeimports/core/declarativeitemcontainer_p.h rename to plasma/declarativeimports/core/declarativeitemcontainer_p.h diff --git a/plasma/generic/declarativeimports/core/dialog.cpp b/plasma/declarativeimports/core/dialog.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/dialog.cpp rename to plasma/declarativeimports/core/dialog.cpp diff --git a/plasma/generic/declarativeimports/core/dialog.h b/plasma/declarativeimports/core/dialog.h similarity index 100% rename from plasma/generic/declarativeimports/core/dialog.h rename to plasma/declarativeimports/core/dialog.h diff --git a/plasma/generic/declarativeimports/core/framesvgitem.cpp b/plasma/declarativeimports/core/framesvgitem.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/framesvgitem.cpp rename to plasma/declarativeimports/core/framesvgitem.cpp diff --git a/plasma/generic/declarativeimports/core/framesvgitem.h b/plasma/declarativeimports/core/framesvgitem.h similarity index 100% rename from plasma/generic/declarativeimports/core/framesvgitem.h rename to plasma/declarativeimports/core/framesvgitem.h diff --git a/plasma/generic/declarativeimports/core/iconitem.cpp b/plasma/declarativeimports/core/iconitem.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/iconitem.cpp rename to plasma/declarativeimports/core/iconitem.cpp diff --git a/plasma/generic/declarativeimports/core/iconitem.h b/plasma/declarativeimports/core/iconitem.h similarity index 100% rename from plasma/generic/declarativeimports/core/iconitem.h rename to plasma/declarativeimports/core/iconitem.h diff --git a/plasma/generic/declarativeimports/core/qmldir b/plasma/declarativeimports/core/qmldir similarity index 100% rename from plasma/generic/declarativeimports/core/qmldir rename to plasma/declarativeimports/core/qmldir diff --git a/plasma/generic/declarativeimports/core/runnermodel.cpp b/plasma/declarativeimports/core/runnermodel.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/runnermodel.cpp rename to plasma/declarativeimports/core/runnermodel.cpp diff --git a/plasma/generic/declarativeimports/core/runnermodel.h b/plasma/declarativeimports/core/runnermodel.h similarity index 100% rename from plasma/generic/declarativeimports/core/runnermodel.h rename to plasma/declarativeimports/core/runnermodel.h diff --git a/plasma/generic/declarativeimports/core/svgitem.cpp b/plasma/declarativeimports/core/svgitem.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/svgitem.cpp rename to plasma/declarativeimports/core/svgitem.cpp diff --git a/plasma/generic/declarativeimports/core/svgitem.h b/plasma/declarativeimports/core/svgitem.h similarity index 100% rename from plasma/generic/declarativeimports/core/svgitem.h rename to plasma/declarativeimports/core/svgitem.h diff --git a/plasma/generic/declarativeimports/core/tests/CMakeLists.txt b/plasma/declarativeimports/core/tests/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/core/tests/CMakeLists.txt rename to plasma/declarativeimports/core/tests/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/core/tests/dynamictreemodel.cpp b/plasma/declarativeimports/core/tests/dynamictreemodel.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/tests/dynamictreemodel.cpp rename to plasma/declarativeimports/core/tests/dynamictreemodel.cpp diff --git a/plasma/generic/declarativeimports/core/tests/dynamictreemodel.h b/plasma/declarativeimports/core/tests/dynamictreemodel.h similarity index 100% rename from plasma/generic/declarativeimports/core/tests/dynamictreemodel.h rename to plasma/declarativeimports/core/tests/dynamictreemodel.h diff --git a/plasma/generic/declarativeimports/core/tests/main.cpp b/plasma/declarativeimports/core/tests/main.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/tests/main.cpp rename to plasma/declarativeimports/core/tests/main.cpp diff --git a/plasma/generic/declarativeimports/core/tests/modeltest.cpp b/plasma/declarativeimports/core/tests/modeltest.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/tests/modeltest.cpp rename to plasma/declarativeimports/core/tests/modeltest.cpp diff --git a/plasma/generic/declarativeimports/core/tests/modeltest.h b/plasma/declarativeimports/core/tests/modeltest.h similarity index 100% rename from plasma/generic/declarativeimports/core/tests/modeltest.h rename to plasma/declarativeimports/core/tests/modeltest.h diff --git a/plasma/generic/declarativeimports/core/tests/sortfiltermodeltest.cpp b/plasma/declarativeimports/core/tests/sortfiltermodeltest.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/tests/sortfiltermodeltest.cpp rename to plasma/declarativeimports/core/tests/sortfiltermodeltest.cpp diff --git a/plasma/generic/declarativeimports/core/tests/sortfiltermodeltest.h b/plasma/declarativeimports/core/tests/sortfiltermodeltest.h similarity index 100% rename from plasma/generic/declarativeimports/core/tests/sortfiltermodeltest.h rename to plasma/declarativeimports/core/tests/sortfiltermodeltest.h diff --git a/plasma/generic/declarativeimports/core/theme.cpp b/plasma/declarativeimports/core/theme.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/theme.cpp rename to plasma/declarativeimports/core/theme.cpp diff --git a/plasma/generic/declarativeimports/core/theme.h b/plasma/declarativeimports/core/theme.h similarity index 100% rename from plasma/generic/declarativeimports/core/theme.h rename to plasma/declarativeimports/core/theme.h diff --git a/plasma/generic/declarativeimports/core/tooltip.cpp b/plasma/declarativeimports/core/tooltip.cpp similarity index 100% rename from plasma/generic/declarativeimports/core/tooltip.cpp rename to plasma/declarativeimports/core/tooltip.cpp diff --git a/plasma/generic/declarativeimports/core/tooltip.h b/plasma/declarativeimports/core/tooltip.h similarity index 100% rename from plasma/generic/declarativeimports/core/tooltip.h rename to plasma/declarativeimports/core/tooltip.h diff --git a/plasma/generic/declarativeimports/dirmodel/CMakeLists.txt b/plasma/declarativeimports/dirmodel/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/dirmodel/CMakeLists.txt rename to plasma/declarativeimports/dirmodel/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/dirmodel/dirmodel.cpp b/plasma/declarativeimports/dirmodel/dirmodel.cpp similarity index 100% rename from plasma/generic/declarativeimports/dirmodel/dirmodel.cpp rename to plasma/declarativeimports/dirmodel/dirmodel.cpp diff --git a/plasma/generic/declarativeimports/dirmodel/dirmodel.h b/plasma/declarativeimports/dirmodel/dirmodel.h similarity index 100% rename from plasma/generic/declarativeimports/dirmodel/dirmodel.h rename to plasma/declarativeimports/dirmodel/dirmodel.h diff --git a/plasma/generic/declarativeimports/dirmodel/dirmodelplugin.cpp b/plasma/declarativeimports/dirmodel/dirmodelplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/dirmodel/dirmodelplugin.cpp rename to plasma/declarativeimports/dirmodel/dirmodelplugin.cpp diff --git a/plasma/generic/declarativeimports/dirmodel/dirmodelplugin.h b/plasma/declarativeimports/dirmodel/dirmodelplugin.h similarity index 100% rename from plasma/generic/declarativeimports/dirmodel/dirmodelplugin.h rename to plasma/declarativeimports/dirmodel/dirmodelplugin.h diff --git a/plasma/generic/declarativeimports/dirmodel/qmldir b/plasma/declarativeimports/dirmodel/qmldir similarity index 100% rename from plasma/generic/declarativeimports/dirmodel/qmldir rename to plasma/declarativeimports/dirmodel/qmldir diff --git a/plasma/generic/declarativeimports/draganddrop/CMakeLists.txt b/plasma/declarativeimports/draganddrop/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/CMakeLists.txt rename to plasma/declarativeimports/draganddrop/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.cpp b/plasma/declarativeimports/draganddrop/DeclarativeDragArea.cpp similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.cpp rename to plasma/declarativeimports/draganddrop/DeclarativeDragArea.cpp diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.h b/plasma/declarativeimports/draganddrop/DeclarativeDragArea.h similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeDragArea.h rename to plasma/declarativeimports/draganddrop/DeclarativeDragArea.h diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.cpp b/plasma/declarativeimports/draganddrop/DeclarativeDragDropEvent.cpp similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.cpp rename to plasma/declarativeimports/draganddrop/DeclarativeDragDropEvent.cpp diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.h b/plasma/declarativeimports/draganddrop/DeclarativeDragDropEvent.h similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeDragDropEvent.h rename to plasma/declarativeimports/draganddrop/DeclarativeDragDropEvent.h diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.cpp b/plasma/declarativeimports/draganddrop/DeclarativeDropArea.cpp similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.cpp rename to plasma/declarativeimports/draganddrop/DeclarativeDropArea.cpp diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.h b/plasma/declarativeimports/draganddrop/DeclarativeDropArea.h similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeDropArea.h rename to plasma/declarativeimports/draganddrop/DeclarativeDropArea.h diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeMimeData.cpp b/plasma/declarativeimports/draganddrop/DeclarativeMimeData.cpp similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeMimeData.cpp rename to plasma/declarativeimports/draganddrop/DeclarativeMimeData.cpp diff --git a/plasma/generic/declarativeimports/draganddrop/DeclarativeMimeData.h b/plasma/declarativeimports/draganddrop/DeclarativeMimeData.h similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/DeclarativeMimeData.h rename to plasma/declarativeimports/draganddrop/DeclarativeMimeData.h diff --git a/plasma/generic/declarativeimports/draganddrop/draganddropplugin.cpp b/plasma/declarativeimports/draganddrop/draganddropplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/draganddropplugin.cpp rename to plasma/declarativeimports/draganddrop/draganddropplugin.cpp diff --git a/plasma/generic/declarativeimports/draganddrop/draganddropplugin.h b/plasma/declarativeimports/draganddrop/draganddropplugin.h similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/draganddropplugin.h rename to plasma/declarativeimports/draganddrop/draganddropplugin.h diff --git a/plasma/generic/declarativeimports/draganddrop/qmldir b/plasma/declarativeimports/draganddrop/qmldir similarity index 100% rename from plasma/generic/declarativeimports/draganddrop/qmldir rename to plasma/declarativeimports/draganddrop/qmldir diff --git a/plasma/generic/declarativeimports/graphicslayouts/CMakeLists.txt b/plasma/declarativeimports/graphicslayouts/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/CMakeLists.txt rename to plasma/declarativeimports/graphicslayouts/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.cpp b/plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.cpp rename to plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.cpp diff --git a/plasma/generic/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h b/plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h rename to plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h diff --git a/plasma/generic/declarativeimports/graphicslayouts/gridlayout.cpp b/plasma/declarativeimports/graphicslayouts/gridlayout.cpp similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/gridlayout.cpp rename to plasma/declarativeimports/graphicslayouts/gridlayout.cpp diff --git a/plasma/generic/declarativeimports/graphicslayouts/gridlayout.h b/plasma/declarativeimports/graphicslayouts/gridlayout.h similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/gridlayout.h rename to plasma/declarativeimports/graphicslayouts/gridlayout.h diff --git a/plasma/generic/declarativeimports/graphicslayouts/linearlayout.cpp b/plasma/declarativeimports/graphicslayouts/linearlayout.cpp similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/linearlayout.cpp rename to plasma/declarativeimports/graphicslayouts/linearlayout.cpp diff --git a/plasma/generic/declarativeimports/graphicslayouts/linearlayout.h b/plasma/declarativeimports/graphicslayouts/linearlayout.h similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/linearlayout.h rename to plasma/declarativeimports/graphicslayouts/linearlayout.h diff --git a/plasma/generic/declarativeimports/graphicslayouts/qmldir b/plasma/declarativeimports/graphicslayouts/qmldir similarity index 100% rename from plasma/generic/declarativeimports/graphicslayouts/qmldir rename to plasma/declarativeimports/graphicslayouts/qmldir diff --git a/plasma/generic/declarativeimports/graphicswidgets/CMakeLists.txt b/plasma/declarativeimports/graphicswidgets/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/graphicswidgets/CMakeLists.txt rename to plasma/declarativeimports/graphicswidgets/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.cpp b/plasma/declarativeimports/graphicswidgets/declarativetabbar.cpp similarity index 100% rename from plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.cpp rename to plasma/declarativeimports/graphicswidgets/declarativetabbar.cpp diff --git a/plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.h b/plasma/declarativeimports/graphicswidgets/declarativetabbar.h similarity index 100% rename from plasma/generic/declarativeimports/graphicswidgets/declarativetabbar.h rename to plasma/declarativeimports/graphicswidgets/declarativetabbar.h diff --git a/plasma/generic/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp b/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp rename to plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp diff --git a/plasma/generic/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h b/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h similarity index 100% rename from plasma/generic/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h rename to plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h diff --git a/plasma/generic/declarativeimports/graphicswidgets/qmldir b/plasma/declarativeimports/graphicswidgets/qmldir similarity index 100% rename from plasma/generic/declarativeimports/graphicswidgets/qmldir rename to plasma/declarativeimports/graphicswidgets/qmldir diff --git a/plasma/generic/declarativeimports/krunnermodel/CMakeLists.txt b/plasma/declarativeimports/krunnermodel/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/krunnermodel/CMakeLists.txt rename to plasma/declarativeimports/krunnermodel/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/krunnermodel/qmldir b/plasma/declarativeimports/krunnermodel/qmldir similarity index 100% rename from plasma/generic/declarativeimports/krunnermodel/qmldir rename to plasma/declarativeimports/krunnermodel/qmldir diff --git a/plasma/generic/declarativeimports/krunnermodel/runnermodelplugin.cpp b/plasma/declarativeimports/krunnermodel/runnermodelplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/krunnermodel/runnermodelplugin.cpp rename to plasma/declarativeimports/krunnermodel/runnermodelplugin.cpp diff --git a/plasma/generic/declarativeimports/krunnermodel/runnermodelplugin.h b/plasma/declarativeimports/krunnermodel/runnermodelplugin.h similarity index 100% rename from plasma/generic/declarativeimports/krunnermodel/runnermodelplugin.h rename to plasma/declarativeimports/krunnermodel/runnermodelplugin.h diff --git a/plasma/generic/declarativeimports/locale/CMakeLists.txt b/plasma/declarativeimports/locale/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/locale/CMakeLists.txt rename to plasma/declarativeimports/locale/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/locale/calendarsystem.cpp b/plasma/declarativeimports/locale/calendarsystem.cpp similarity index 100% rename from plasma/generic/declarativeimports/locale/calendarsystem.cpp rename to plasma/declarativeimports/locale/calendarsystem.cpp diff --git a/plasma/generic/declarativeimports/locale/calendarsystem.h b/plasma/declarativeimports/locale/calendarsystem.h similarity index 100% rename from plasma/generic/declarativeimports/locale/calendarsystem.h rename to plasma/declarativeimports/locale/calendarsystem.h diff --git a/plasma/generic/declarativeimports/locale/locale.cpp b/plasma/declarativeimports/locale/locale.cpp similarity index 100% rename from plasma/generic/declarativeimports/locale/locale.cpp rename to plasma/declarativeimports/locale/locale.cpp diff --git a/plasma/generic/declarativeimports/locale/locale_p.h b/plasma/declarativeimports/locale/locale_p.h similarity index 100% rename from plasma/generic/declarativeimports/locale/locale_p.h rename to plasma/declarativeimports/locale/locale_p.h diff --git a/plasma/generic/declarativeimports/locale/localebindingsplugin.cpp b/plasma/declarativeimports/locale/localebindingsplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/locale/localebindingsplugin.cpp rename to plasma/declarativeimports/locale/localebindingsplugin.cpp diff --git a/plasma/generic/declarativeimports/locale/localebindingsplugin.h b/plasma/declarativeimports/locale/localebindingsplugin.h similarity index 100% rename from plasma/generic/declarativeimports/locale/localebindingsplugin.h rename to plasma/declarativeimports/locale/localebindingsplugin.h diff --git a/plasma/generic/declarativeimports/locale/qmldir b/plasma/declarativeimports/locale/qmldir similarity index 100% rename from plasma/generic/declarativeimports/locale/qmldir rename to plasma/declarativeimports/locale/qmldir diff --git a/plasma/generic/declarativeimports/plasmacomponents/CMakeLists.txt b/plasma/declarativeimports/plasmacomponents/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/CMakeLists.txt rename to plasma/declarativeimports/plasmacomponents/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/plasmacomponents/enums.cpp b/plasma/declarativeimports/plasmacomponents/enums.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/enums.cpp rename to plasma/declarativeimports/plasmacomponents/enums.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/enums.h b/plasma/declarativeimports/plasmacomponents/enums.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/enums.h rename to plasma/declarativeimports/plasmacomponents/enums.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/fullscreensheet.cpp b/plasma/declarativeimports/plasmacomponents/fullscreensheet.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/fullscreensheet.cpp rename to plasma/declarativeimports/plasmacomponents/fullscreensheet.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/fullscreensheet.h b/plasma/declarativeimports/plasmacomponents/fullscreensheet.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/fullscreensheet.h rename to plasma/declarativeimports/plasmacomponents/fullscreensheet.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.cpp b/plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.cpp rename to plasma/declarativeimports/plasmacomponents/fullscreenwindow.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.h b/plasma/declarativeimports/plasmacomponents/fullscreenwindow.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/fullscreenwindow.h rename to plasma/declarativeimports/plasmacomponents/fullscreenwindow.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp b/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp rename to plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/plasmacomponentsplugin.h b/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/plasmacomponentsplugin.h rename to plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/qmenu.cpp b/plasma/declarativeimports/plasmacomponents/qmenu.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qmenu.cpp rename to plasma/declarativeimports/plasmacomponents/qmenu.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/qmenu.h b/plasma/declarativeimports/plasmacomponents/qmenu.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qmenu.h rename to plasma/declarativeimports/plasmacomponents/qmenu.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/qmenuitem.cpp b/plasma/declarativeimports/plasmacomponents/qmenuitem.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qmenuitem.cpp rename to plasma/declarativeimports/plasmacomponents/qmenuitem.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/qmenuitem.h b/plasma/declarativeimports/plasmacomponents/qmenuitem.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qmenuitem.h rename to plasma/declarativeimports/plasmacomponents/qmenuitem.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/BusyIndicator.qml b/plasma/declarativeimports/plasmacomponents/qml/BusyIndicator.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/BusyIndicator.qml rename to plasma/declarativeimports/plasmacomponents/qml/BusyIndicator.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Button.qml b/plasma/declarativeimports/plasmacomponents/qml/Button.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Button.qml rename to plasma/declarativeimports/plasmacomponents/qml/Button.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ButtonColumn.qml b/plasma/declarativeimports/plasmacomponents/qml/ButtonColumn.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ButtonColumn.qml rename to plasma/declarativeimports/plasmacomponents/qml/ButtonColumn.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ButtonGroup.js b/plasma/declarativeimports/plasmacomponents/qml/ButtonGroup.js similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ButtonGroup.js rename to plasma/declarativeimports/plasmacomponents/qml/ButtonGroup.js diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ButtonRow.qml b/plasma/declarativeimports/plasmacomponents/qml/ButtonRow.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ButtonRow.qml rename to plasma/declarativeimports/plasmacomponents/qml/ButtonRow.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/CheckBox.qml b/plasma/declarativeimports/plasmacomponents/qml/CheckBox.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/CheckBox.qml rename to plasma/declarativeimports/plasmacomponents/qml/CheckBox.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/CommonDialog.qml b/plasma/declarativeimports/plasmacomponents/qml/CommonDialog.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/CommonDialog.qml rename to plasma/declarativeimports/plasmacomponents/qml/CommonDialog.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ContextMenu.qml b/plasma/declarativeimports/plasmacomponents/qml/ContextMenu.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ContextMenu.qml rename to plasma/declarativeimports/plasmacomponents/qml/ContextMenu.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Dialog.qml b/plasma/declarativeimports/plasmacomponents/qml/Dialog.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Dialog.qml rename to plasma/declarativeimports/plasmacomponents/qml/Dialog.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Highlight.qml b/plasma/declarativeimports/plasmacomponents/qml/Highlight.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Highlight.qml rename to plasma/declarativeimports/plasmacomponents/qml/Highlight.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Label.qml b/plasma/declarativeimports/plasmacomponents/qml/Label.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Label.qml rename to plasma/declarativeimports/plasmacomponents/qml/Label.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ListItem.qml b/plasma/declarativeimports/plasmacomponents/qml/ListItem.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ListItem.qml rename to plasma/declarativeimports/plasmacomponents/qml/ListItem.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Page.qml b/plasma/declarativeimports/plasmacomponents/qml/Page.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Page.qml rename to plasma/declarativeimports/plasmacomponents/qml/Page.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/PageStack.qml b/plasma/declarativeimports/plasmacomponents/qml/PageStack.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/PageStack.qml rename to plasma/declarativeimports/plasmacomponents/qml/PageStack.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ProgressBar.qml b/plasma/declarativeimports/plasmacomponents/qml/ProgressBar.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ProgressBar.qml rename to plasma/declarativeimports/plasmacomponents/qml/ProgressBar.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/QueryDialog.qml b/plasma/declarativeimports/plasmacomponents/qml/QueryDialog.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/QueryDialog.qml rename to plasma/declarativeimports/plasmacomponents/qml/QueryDialog.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/RadioButton.qml b/plasma/declarativeimports/plasmacomponents/qml/RadioButton.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/RadioButton.qml rename to plasma/declarativeimports/plasmacomponents/qml/RadioButton.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ScrollBar.qml b/plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ScrollBar.qml rename to plasma/declarativeimports/plasmacomponents/qml/ScrollBar.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/SectionScroller.qml b/plasma/declarativeimports/plasmacomponents/qml/SectionScroller.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/SectionScroller.qml rename to plasma/declarativeimports/plasmacomponents/qml/SectionScroller.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/SelectionDialog.qml b/plasma/declarativeimports/plasmacomponents/qml/SelectionDialog.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/SelectionDialog.qml rename to plasma/declarativeimports/plasmacomponents/qml/SelectionDialog.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Sheet.qml b/plasma/declarativeimports/plasmacomponents/qml/Sheet.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Sheet.qml rename to plasma/declarativeimports/plasmacomponents/qml/Sheet.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Slider.qml b/plasma/declarativeimports/plasmacomponents/qml/Slider.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Slider.qml rename to plasma/declarativeimports/plasmacomponents/qml/Slider.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/Switch.qml b/plasma/declarativeimports/plasmacomponents/qml/Switch.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/Switch.qml rename to plasma/declarativeimports/plasmacomponents/qml/Switch.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/TabBar.qml b/plasma/declarativeimports/plasmacomponents/qml/TabBar.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/TabBar.qml rename to plasma/declarativeimports/plasmacomponents/qml/TabBar.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/TabButton.qml b/plasma/declarativeimports/plasmacomponents/qml/TabButton.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/TabButton.qml rename to plasma/declarativeimports/plasmacomponents/qml/TabButton.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/TabGroup.qml b/plasma/declarativeimports/plasmacomponents/qml/TabGroup.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/TabGroup.qml rename to plasma/declarativeimports/plasmacomponents/qml/TabGroup.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/TextArea.qml b/plasma/declarativeimports/plasmacomponents/qml/TextArea.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/TextArea.qml rename to plasma/declarativeimports/plasmacomponents/qml/TextArea.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/TextField.qml b/plasma/declarativeimports/plasmacomponents/qml/TextField.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/TextField.qml rename to plasma/declarativeimports/plasmacomponents/qml/TextField.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ToolBar.qml b/plasma/declarativeimports/plasmacomponents/qml/ToolBar.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ToolBar.qml rename to plasma/declarativeimports/plasmacomponents/qml/ToolBar.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml b/plasma/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml rename to plasma/declarativeimports/plasmacomponents/qml/ToolBarLayout.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/ToolButton.qml b/plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/ToolButton.qml rename to plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/AppManager.js b/plasma/declarativeimports/plasmacomponents/qml/private/AppManager.js similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/AppManager.js rename to plasma/declarativeimports/plasmacomponents/qml/private/AppManager.js diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml b/plasma/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/ButtonShadow.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/Config.js b/plasma/declarativeimports/plasmacomponents/qml/private/Config.js similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/Config.js rename to plasma/declarativeimports/plasmacomponents/qml/private/Config.js diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml b/plasma/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/DualStateButton.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml b/plasma/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/InlineDialog.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/PageStack.js b/plasma/declarativeimports/plasmacomponents/qml/private/PageStack.js similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/PageStack.js rename to plasma/declarativeimports/plasmacomponents/qml/private/PageStack.js diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml b/plasma/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/RoundShadow.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml b/plasma/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/ScrollBarDelegate.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml b/plasma/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/ScrollDecoratorDelegate.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/SectionScroller.js b/plasma/declarativeimports/plasmacomponents/qml/private/SectionScroller.js similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/SectionScroller.js rename to plasma/declarativeimports/plasmacomponents/qml/private/SectionScroller.js diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml b/plasma/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/TabGroup.js b/plasma/declarativeimports/plasmacomponents/qml/private/TabGroup.js similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/TabGroup.js rename to plasma/declarativeimports/plasmacomponents/qml/private/TabGroup.js diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml b/plasma/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml rename to plasma/declarativeimports/plasmacomponents/qml/private/TextFieldFocus.qml diff --git a/plasma/generic/declarativeimports/plasmacomponents/qml/qmldir b/plasma/declarativeimports/plasmacomponents/qml/qmldir similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qml/qmldir rename to plasma/declarativeimports/plasmacomponents/qml/qmldir diff --git a/plasma/generic/declarativeimports/plasmacomponents/qrangemodel.cpp b/plasma/declarativeimports/plasmacomponents/qrangemodel.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qrangemodel.cpp rename to plasma/declarativeimports/plasmacomponents/qrangemodel.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/qrangemodel.h b/plasma/declarativeimports/plasmacomponents/qrangemodel.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qrangemodel.h rename to plasma/declarativeimports/plasmacomponents/qrangemodel.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/qrangemodel_p.h b/plasma/declarativeimports/plasmacomponents/qrangemodel_p.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/qrangemodel_p.h rename to plasma/declarativeimports/plasmacomponents/qrangemodel_p.h diff --git a/plasma/generic/declarativeimports/plasmacomponents/units.cpp b/plasma/declarativeimports/plasmacomponents/units.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/units.cpp rename to plasma/declarativeimports/plasmacomponents/units.cpp diff --git a/plasma/generic/declarativeimports/plasmacomponents/units.h b/plasma/declarativeimports/plasmacomponents/units.h similarity index 100% rename from plasma/generic/declarativeimports/plasmacomponents/units.h rename to plasma/declarativeimports/plasmacomponents/units.h diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/CMakeLists.txt b/plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/CMakeLists.txt rename to plasma/declarativeimports/plasmaextracomponents/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/TODO b/plasma/declarativeimports/plasmaextracomponents/TODO similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/TODO rename to plasma/declarativeimports/plasmaextracomponents/TODO diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp b/plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp rename to plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider.cpp diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h b/plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h rename to plasma/declarativeimports/plasmaextracomponents/appbackgroundprovider_p.h diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp b/plasma/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp rename to plasma/declarativeimports/plasmaextracomponents/fallbackcomponent.cpp diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/fallbackcomponent.h b/plasma/declarativeimports/plasmaextracomponents/fallbackcomponent.h similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/fallbackcomponent.h rename to plasma/declarativeimports/plasmaextracomponents/fallbackcomponent.h diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp b/plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp rename to plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.cpp diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h b/plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h rename to plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/App.qml b/plasma/declarativeimports/plasmaextracomponents/qml/App.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/App.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/App.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/ConditionalLoader.qml b/plasma/declarativeimports/plasmaextracomponents/qml/ConditionalLoader.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/ConditionalLoader.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/ConditionalLoader.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/Heading.qml b/plasma/declarativeimports/plasmaextracomponents/qml/Heading.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/Heading.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/Heading.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/PageRow.qml b/plasma/declarativeimports/plasmaextracomponents/qml/PageRow.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/PageRow.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/PageRow.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/Paragraph.qml b/plasma/declarativeimports/plasmaextracomponents/qml/Paragraph.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/Paragraph.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/Paragraph.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml b/plasma/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/ScrollArea.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/Title.qml b/plasma/declarativeimports/plasmaextracomponents/qml/Title.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/Title.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/Title.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml b/plasma/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/animations/ActivateAnimation.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/Animations.js b/plasma/declarativeimports/plasmaextracomponents/qml/animations/Animations.js similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/Animations.js rename to plasma/declarativeimports/plasmaextracomponents/qml/animations/Animations.js diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml b/plasma/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/animations/AppearAnimation.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml b/plasma/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/animations/DisappearAnimation.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml b/plasma/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/animations/PressedAnimation.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml b/plasma/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml rename to plasma/declarativeimports/plasmaextracomponents/qml/animations/ReleasedAnimation.qml diff --git a/plasma/generic/declarativeimports/plasmaextracomponents/qml/qmldir b/plasma/declarativeimports/plasmaextracomponents/qml/qmldir similarity index 100% rename from plasma/generic/declarativeimports/plasmaextracomponents/qml/qmldir rename to plasma/declarativeimports/plasmaextracomponents/qml/qmldir diff --git a/plasma/generic/declarativeimports/qtextracomponents/CMakeLists.txt b/plasma/declarativeimports/qtextracomponents/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/CMakeLists.txt rename to plasma/declarativeimports/qtextracomponents/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.cpp b/plasma/declarativeimports/qtextracomponents/columnproxymodel.cpp similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.cpp rename to plasma/declarativeimports/qtextracomponents/columnproxymodel.cpp diff --git a/plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.h b/plasma/declarativeimports/qtextracomponents/columnproxymodel.h similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/columnproxymodel.h rename to plasma/declarativeimports/qtextracomponents/columnproxymodel.h diff --git a/plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.cpp rename to plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp diff --git a/plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.h b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.h similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/mouseeventlistener.h rename to plasma/declarativeimports/qtextracomponents/mouseeventlistener.h diff --git a/plasma/generic/declarativeimports/qtextracomponents/qiconitem.cpp b/plasma/declarativeimports/qtextracomponents/qiconitem.cpp similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qiconitem.cpp rename to plasma/declarativeimports/qtextracomponents/qiconitem.cpp diff --git a/plasma/generic/declarativeimports/qtextracomponents/qiconitem.h b/plasma/declarativeimports/qtextracomponents/qiconitem.h similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qiconitem.h rename to plasma/declarativeimports/qtextracomponents/qiconitem.h diff --git a/plasma/generic/declarativeimports/qtextracomponents/qimageitem.cpp b/plasma/declarativeimports/qtextracomponents/qimageitem.cpp similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qimageitem.cpp rename to plasma/declarativeimports/qtextracomponents/qimageitem.cpp diff --git a/plasma/generic/declarativeimports/qtextracomponents/qimageitem.h b/plasma/declarativeimports/qtextracomponents/qimageitem.h similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qimageitem.h rename to plasma/declarativeimports/qtextracomponents/qimageitem.h diff --git a/plasma/generic/declarativeimports/qtextracomponents/qmldir b/plasma/declarativeimports/qtextracomponents/qmldir similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qmldir rename to plasma/declarativeimports/qtextracomponents/qmldir diff --git a/plasma/generic/declarativeimports/qtextracomponents/qpixmapitem.cpp b/plasma/declarativeimports/qtextracomponents/qpixmapitem.cpp similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qpixmapitem.cpp rename to plasma/declarativeimports/qtextracomponents/qpixmapitem.cpp diff --git a/plasma/generic/declarativeimports/qtextracomponents/qpixmapitem.h b/plasma/declarativeimports/qtextracomponents/qpixmapitem.h similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qpixmapitem.h rename to plasma/declarativeimports/qtextracomponents/qpixmapitem.h diff --git a/plasma/generic/declarativeimports/qtextracomponents/qtextracomponentsplugin.cpp b/plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.cpp similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qtextracomponentsplugin.cpp rename to plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.cpp diff --git a/plasma/generic/declarativeimports/qtextracomponents/qtextracomponentsplugin.h b/plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.h similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/qtextracomponentsplugin.h rename to plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.h diff --git a/plasma/generic/declarativeimports/qtextracomponents/tests/CMakeLists.txt b/plasma/declarativeimports/qtextracomponents/tests/CMakeLists.txt similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/tests/CMakeLists.txt rename to plasma/declarativeimports/qtextracomponents/tests/CMakeLists.txt diff --git a/plasma/generic/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp b/plasma/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp rename to plasma/declarativeimports/qtextracomponents/tests/columnproxymodeltest.cpp diff --git a/plasma/generic/declarativeimports/qtextracomponents/tests/columnproxymodeltest.h b/plasma/declarativeimports/qtextracomponents/tests/columnproxymodeltest.h similarity index 100% rename from plasma/generic/declarativeimports/qtextracomponents/tests/columnproxymodeltest.h rename to plasma/declarativeimports/qtextracomponents/tests/columnproxymodeltest.h diff --git a/plasma/desktop/CMakeLists.txt b/plasma/desktop/CMakeLists.txt deleted file mode 100644 index 5bb06b6d..00000000 --- a/plasma/desktop/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_subdirectory(applets) -add_subdirectory(containments) -add_subdirectory(runners) -add_subdirectory(shell) -add_subdirectory(toolboxes) -add_subdirectory(desktoptheme) diff --git a/plasma/desktop/applets/CMakeLists.txt b/plasma/desktop/applets/CMakeLists.txt deleted file mode 100644 index ef68bca7..00000000 --- a/plasma/desktop/applets/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_subdirectory(kickoff) -add_subdirectory(trash) -if(LIBKONQ_FOUND) - add_subdirectory(homerun) - add_subdirectory(folderview) -endif() - -#task and windowlist depend on libs/taskmanager -add_subdirectory(tasks) -add_subdirectory(windowlist) -add_subdirectory(pager) diff --git a/plasma/desktop/containments/CMakeLists.txt b/plasma/desktop/containments/CMakeLists.txt deleted file mode 100644 index 06765f7a..00000000 --- a/plasma/desktop/containments/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(desktop) -add_subdirectory(panel) diff --git a/plasma/desktop/runners/CMakeLists.txt b/plasma/desktop/runners/CMakeLists.txt deleted file mode 100644 index 2da20a12..00000000 --- a/plasma/desktop/runners/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(plasma-desktop) - diff --git a/plasma/desktop/desktoptheme/CMakeLists.txt b/plasma/desktoptheme/CMakeLists.txt similarity index 100% rename from plasma/desktop/desktoptheme/CMakeLists.txt rename to plasma/desktoptheme/CMakeLists.txt diff --git a/plasma/desktop/desktoptheme/air-netbook/CMakeLists.txt b/plasma/desktoptheme/air-netbook/CMakeLists.txt similarity index 100% rename from plasma/desktop/desktoptheme/air-netbook/CMakeLists.txt rename to plasma/desktoptheme/air-netbook/CMakeLists.txt diff --git a/plasma/desktop/desktoptheme/air-netbook/colors b/plasma/desktoptheme/air-netbook/colors similarity index 100% rename from plasma/desktop/desktoptheme/air-netbook/colors rename to plasma/desktoptheme/air-netbook/colors diff --git a/plasma/desktop/desktoptheme/air-netbook/metadata.desktop b/plasma/desktoptheme/air-netbook/metadata.desktop similarity index 100% rename from plasma/desktop/desktoptheme/air-netbook/metadata.desktop rename to plasma/desktoptheme/air-netbook/metadata.desktop diff --git a/plasma/desktop/desktoptheme/air-netbook/widgets/background.svgz b/plasma/desktoptheme/air-netbook/widgets/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air-netbook/widgets/background.svgz rename to plasma/desktoptheme/air-netbook/widgets/background.svgz diff --git a/plasma/desktop/desktoptheme/air-netbook/widgets/panel-background.svgz b/plasma/desktoptheme/air-netbook/widgets/panel-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air-netbook/widgets/panel-background.svgz rename to plasma/desktoptheme/air-netbook/widgets/panel-background.svgz diff --git a/plasma/desktop/desktoptheme/air/CMakeLists.txt b/plasma/desktoptheme/air/CMakeLists.txt similarity index 100% rename from plasma/desktop/desktoptheme/air/CMakeLists.txt rename to plasma/desktoptheme/air/CMakeLists.txt diff --git a/plasma/desktop/desktoptheme/air/colors b/plasma/desktoptheme/air/colors similarity index 100% rename from plasma/desktop/desktoptheme/air/colors rename to plasma/desktoptheme/air/colors diff --git a/plasma/desktop/desktoptheme/air/dialogs/background.svgz b/plasma/desktoptheme/air/dialogs/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/dialogs/background.svgz rename to plasma/desktoptheme/air/dialogs/background.svgz diff --git a/plasma/desktop/desktoptheme/air/dialogs/kickoff.svgz b/plasma/desktoptheme/air/dialogs/kickoff.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/dialogs/kickoff.svgz rename to plasma/desktoptheme/air/dialogs/kickoff.svgz diff --git a/plasma/desktop/desktoptheme/air/dialogs/krunner.svgz b/plasma/desktoptheme/air/dialogs/krunner.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/dialogs/krunner.svgz rename to plasma/desktoptheme/air/dialogs/krunner.svgz diff --git a/plasma/desktop/desktoptheme/air/dialogs/shutdowndialog.svgz b/plasma/desktoptheme/air/dialogs/shutdowndialog.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/dialogs/shutdowndialog.svgz rename to plasma/desktoptheme/air/dialogs/shutdowndialog.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/amarok.svgz b/plasma/desktoptheme/air/icons/amarok.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/amarok.svgz rename to plasma/desktoptheme/air/icons/amarok.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/audio.svgz b/plasma/desktoptheme/air/icons/audio.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/audio.svgz rename to plasma/desktoptheme/air/icons/audio.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/battery.svgz b/plasma/desktoptheme/air/icons/battery.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/battery.svgz rename to plasma/desktoptheme/air/icons/battery.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/device.svgz b/plasma/desktoptheme/air/icons/device.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/device.svgz rename to plasma/desktoptheme/air/icons/device.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/kget.svgz b/plasma/desktoptheme/air/icons/kget.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/kget.svgz rename to plasma/desktoptheme/air/icons/kget.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/klipper.svgz b/plasma/desktoptheme/air/icons/klipper.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/klipper.svgz rename to plasma/desktoptheme/air/icons/klipper.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/konv_message.svgz b/plasma/desktoptheme/air/icons/konv_message.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/konv_message.svgz rename to plasma/desktoptheme/air/icons/konv_message.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/konversation.svgz b/plasma/desktoptheme/air/icons/konversation.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/konversation.svgz rename to plasma/desktoptheme/air/icons/konversation.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/kopete.svgz b/plasma/desktoptheme/air/icons/kopete.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/kopete.svgz rename to plasma/desktoptheme/air/icons/kopete.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/korgac.svgz b/plasma/desktoptheme/air/icons/korgac.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/korgac.svgz rename to plasma/desktoptheme/air/icons/korgac.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/kpackagekit.svgz b/plasma/desktoptheme/air/icons/kpackagekit.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/kpackagekit.svgz rename to plasma/desktoptheme/air/icons/kpackagekit.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/ktorrent.svgz b/plasma/desktoptheme/air/icons/ktorrent.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/ktorrent.svgz rename to plasma/desktoptheme/air/icons/ktorrent.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/nepomuk.svgz b/plasma/desktoptheme/air/icons/nepomuk.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/nepomuk.svgz rename to plasma/desktoptheme/air/icons/nepomuk.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/network.svgz b/plasma/desktoptheme/air/icons/network.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/network.svgz rename to plasma/desktoptheme/air/icons/network.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/notification.svgz b/plasma/desktoptheme/air/icons/notification.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/notification.svgz rename to plasma/desktoptheme/air/icons/notification.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/preferences.svgz b/plasma/desktoptheme/air/icons/preferences.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/preferences.svgz rename to plasma/desktoptheme/air/icons/preferences.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/printer.svgz b/plasma/desktoptheme/air/icons/printer.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/printer.svgz rename to plasma/desktoptheme/air/icons/printer.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/quassel.svgz b/plasma/desktoptheme/air/icons/quassel.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/quassel.svgz rename to plasma/desktoptheme/air/icons/quassel.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/slc.svgz b/plasma/desktoptheme/air/icons/slc.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/slc.svgz rename to plasma/desktoptheme/air/icons/slc.svgz diff --git a/plasma/desktop/desktoptheme/air/icons/wallet.svgz b/plasma/desktoptheme/air/icons/wallet.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/icons/wallet.svgz rename to plasma/desktoptheme/air/icons/wallet.svgz diff --git a/plasma/desktop/desktoptheme/air/metadata.desktop b/plasma/desktoptheme/air/metadata.desktop similarity index 100% rename from plasma/desktop/desktoptheme/air/metadata.desktop rename to plasma/desktoptheme/air/metadata.desktop diff --git a/plasma/desktop/desktoptheme/air/opaque/dialogs/background.svgz b/plasma/desktoptheme/air/opaque/dialogs/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/opaque/dialogs/background.svgz rename to plasma/desktoptheme/air/opaque/dialogs/background.svgz diff --git a/plasma/desktop/desktoptheme/air/opaque/dialogs/krunner.svgz b/plasma/desktoptheme/air/opaque/dialogs/krunner.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/opaque/dialogs/krunner.svgz rename to plasma/desktoptheme/air/opaque/dialogs/krunner.svgz diff --git a/plasma/desktop/desktoptheme/air/opaque/dialogs/shutdowndialog.svgz b/plasma/desktoptheme/air/opaque/dialogs/shutdowndialog.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/opaque/dialogs/shutdowndialog.svgz rename to plasma/desktoptheme/air/opaque/dialogs/shutdowndialog.svgz diff --git a/plasma/desktop/desktoptheme/air/opaque/widgets/extender-background.svgz b/plasma/desktoptheme/air/opaque/widgets/extender-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/opaque/widgets/extender-background.svgz rename to plasma/desktoptheme/air/opaque/widgets/extender-background.svgz diff --git a/plasma/desktop/desktoptheme/air/opaque/widgets/panel-background.svgz b/plasma/desktoptheme/air/opaque/widgets/panel-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/opaque/widgets/panel-background.svgz rename to plasma/desktoptheme/air/opaque/widgets/panel-background.svgz diff --git a/plasma/desktop/desktoptheme/air/opaque/widgets/tooltip.svgz b/plasma/desktoptheme/air/opaque/widgets/tooltip.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/opaque/widgets/tooltip.svgz rename to plasma/desktoptheme/air/opaque/widgets/tooltip.svgz diff --git a/plasma/desktop/desktoptheme/air/toolbar-icons/configure.svgz b/plasma/desktoptheme/air/toolbar-icons/configure.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/toolbar-icons/configure.svgz rename to plasma/desktoptheme/air/toolbar-icons/configure.svgz diff --git a/plasma/desktop/desktoptheme/air/toolbar-icons/edit.svgz b/plasma/desktoptheme/air/toolbar-icons/edit.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/toolbar-icons/edit.svgz rename to plasma/desktoptheme/air/toolbar-icons/edit.svgz diff --git a/plasma/desktop/desktoptheme/air/toolbar-icons/go.svgz b/plasma/desktoptheme/air/toolbar-icons/go.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/toolbar-icons/go.svgz rename to plasma/desktoptheme/air/toolbar-icons/go.svgz diff --git a/plasma/desktop/desktoptheme/air/toolbar-icons/list.svgz b/plasma/desktoptheme/air/toolbar-icons/list.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/toolbar-icons/list.svgz rename to plasma/desktoptheme/air/toolbar-icons/list.svgz diff --git a/plasma/desktop/desktoptheme/air/toolbar-icons/media.svgz b/plasma/desktoptheme/air/toolbar-icons/media.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/toolbar-icons/media.svgz rename to plasma/desktoptheme/air/toolbar-icons/media.svgz diff --git a/plasma/desktop/desktoptheme/air/toolbar-icons/window.svgz b/plasma/desktoptheme/air/toolbar-icons/window.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/toolbar-icons/window.svgz rename to plasma/desktoptheme/air/toolbar-icons/window.svgz diff --git a/plasma/desktop/desktoptheme/air/translucent/dialogs/background.svgz b/plasma/desktoptheme/air/translucent/dialogs/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/translucent/dialogs/background.svgz rename to plasma/desktoptheme/air/translucent/dialogs/background.svgz diff --git a/plasma/desktop/desktoptheme/air/translucent/dialogs/krunner.svgz b/plasma/desktoptheme/air/translucent/dialogs/krunner.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/translucent/dialogs/krunner.svgz rename to plasma/desktoptheme/air/translucent/dialogs/krunner.svgz diff --git a/plasma/desktop/desktoptheme/air/translucent/widgets/extender-background.svgz b/plasma/desktoptheme/air/translucent/widgets/extender-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/translucent/widgets/extender-background.svgz rename to plasma/desktoptheme/air/translucent/widgets/extender-background.svgz diff --git a/plasma/desktop/desktoptheme/air/translucent/widgets/panel-background.svgz b/plasma/desktoptheme/air/translucent/widgets/panel-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/translucent/widgets/panel-background.svgz rename to plasma/desktoptheme/air/translucent/widgets/panel-background.svgz diff --git a/plasma/desktop/desktoptheme/air/translucent/widgets/tooltip.svgz b/plasma/desktoptheme/air/translucent/widgets/tooltip.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/translucent/widgets/tooltip.svgz rename to plasma/desktoptheme/air/translucent/widgets/tooltip.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/action-overlays.svgz b/plasma/desktoptheme/air/widgets/action-overlays.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/action-overlays.svgz rename to plasma/desktoptheme/air/widgets/action-overlays.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/actionbutton.svgz b/plasma/desktoptheme/air/widgets/actionbutton.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/actionbutton.svgz rename to plasma/desktoptheme/air/widgets/actionbutton.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/analog_meter.svgz b/plasma/desktoptheme/air/widgets/analog_meter.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/analog_meter.svgz rename to plasma/desktoptheme/air/widgets/analog_meter.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/arrows.svgz b/plasma/desktoptheme/air/widgets/arrows.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/arrows.svgz rename to plasma/desktoptheme/air/widgets/arrows.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/background.svgz b/plasma/desktoptheme/air/widgets/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/background.svgz rename to plasma/desktoptheme/air/widgets/background.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/bar_meter_horizontal.svgz b/plasma/desktoptheme/air/widgets/bar_meter_horizontal.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/bar_meter_horizontal.svgz rename to plasma/desktoptheme/air/widgets/bar_meter_horizontal.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/bar_meter_vertical.svgz b/plasma/desktoptheme/air/widgets/bar_meter_vertical.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/bar_meter_vertical.svgz rename to plasma/desktoptheme/air/widgets/bar_meter_vertical.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/branding.svgz b/plasma/desktoptheme/air/widgets/branding.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/branding.svgz rename to plasma/desktoptheme/air/widgets/branding.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/busywidget.svgz b/plasma/desktoptheme/air/widgets/busywidget.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/busywidget.svgz rename to plasma/desktoptheme/air/widgets/busywidget.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/button.svgz b/plasma/desktoptheme/air/widgets/button.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/button.svgz rename to plasma/desktoptheme/air/widgets/button.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/calendar.svgz b/plasma/desktoptheme/air/widgets/calendar.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/calendar.svgz rename to plasma/desktoptheme/air/widgets/calendar.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/checkmarks.svgz b/plasma/desktoptheme/air/widgets/checkmarks.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/checkmarks.svgz rename to plasma/desktoptheme/air/widgets/checkmarks.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/clock.svgz b/plasma/desktoptheme/air/widgets/clock.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/clock.svgz rename to plasma/desktoptheme/air/widgets/clock.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/configuration-icons.svgz b/plasma/desktoptheme/air/widgets/configuration-icons.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/configuration-icons.svgz rename to plasma/desktoptheme/air/widgets/configuration-icons.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/containment-controls.svgz b/plasma/desktoptheme/air/widgets/containment-controls.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/containment-controls.svgz rename to plasma/desktoptheme/air/widgets/containment-controls.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/dragger.svgz b/plasma/desktoptheme/air/widgets/dragger.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/dragger.svgz rename to plasma/desktoptheme/air/widgets/dragger.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/extender-background.svgz b/plasma/desktoptheme/air/widgets/extender-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/extender-background.svgz rename to plasma/desktoptheme/air/widgets/extender-background.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/extender-dragger.svgz b/plasma/desktoptheme/air/widgets/extender-dragger.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/extender-dragger.svgz rename to plasma/desktoptheme/air/widgets/extender-dragger.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/frame.svgz b/plasma/desktoptheme/air/widgets/frame.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/frame.svgz rename to plasma/desktoptheme/air/widgets/frame.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/glowbar.svgz b/plasma/desktoptheme/air/widgets/glowbar.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/glowbar.svgz rename to plasma/desktoptheme/air/widgets/glowbar.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/identiconshapes.svgz b/plasma/desktoptheme/air/widgets/identiconshapes.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/identiconshapes.svgz rename to plasma/desktoptheme/air/widgets/identiconshapes.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/identicontheme.svgz b/plasma/desktoptheme/air/widgets/identicontheme.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/identicontheme.svgz rename to plasma/desktoptheme/air/widgets/identicontheme.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/labeltexture.svgz b/plasma/desktoptheme/air/widgets/labeltexture.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/labeltexture.svgz rename to plasma/desktoptheme/air/widgets/labeltexture.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/line.svgz b/plasma/desktoptheme/air/widgets/line.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/line.svgz rename to plasma/desktoptheme/air/widgets/line.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/lineedit.svgz b/plasma/desktoptheme/air/widgets/lineedit.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/lineedit.svgz rename to plasma/desktoptheme/air/widgets/lineedit.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/listitem.svgz b/plasma/desktoptheme/air/widgets/listitem.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/listitem.svgz rename to plasma/desktoptheme/air/widgets/listitem.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/media-delegate.svgz b/plasma/desktoptheme/air/widgets/media-delegate.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/media-delegate.svgz rename to plasma/desktoptheme/air/widgets/media-delegate.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/monitor.svgz b/plasma/desktoptheme/air/widgets/monitor.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/monitor.svgz rename to plasma/desktoptheme/air/widgets/monitor.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/pager.svgz b/plasma/desktoptheme/air/widgets/pager.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/pager.svgz rename to plasma/desktoptheme/air/widgets/pager.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/panel-background.svgz b/plasma/desktoptheme/air/widgets/panel-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/panel-background.svgz rename to plasma/desktoptheme/air/widgets/panel-background.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/picker.svgz b/plasma/desktoptheme/air/widgets/picker.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/picker.svgz rename to plasma/desktoptheme/air/widgets/picker.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/plot-background.svgz b/plasma/desktoptheme/air/widgets/plot-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/plot-background.svgz rename to plasma/desktoptheme/air/widgets/plot-background.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/scrollbar.svgz b/plasma/desktoptheme/air/widgets/scrollbar.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/scrollbar.svgz rename to plasma/desktoptheme/air/widgets/scrollbar.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/scrollwidget.svgz b/plasma/desktoptheme/air/widgets/scrollwidget.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/scrollwidget.svgz rename to plasma/desktoptheme/air/widgets/scrollwidget.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/slider.svgz b/plasma/desktoptheme/air/widgets/slider.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/slider.svgz rename to plasma/desktoptheme/air/widgets/slider.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/systemtray.svgz b/plasma/desktoptheme/air/widgets/systemtray.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/systemtray.svgz rename to plasma/desktoptheme/air/widgets/systemtray.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/tasks.svgz b/plasma/desktoptheme/air/widgets/tasks.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/tasks.svgz rename to plasma/desktoptheme/air/widgets/tasks.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/toolbar.svgz b/plasma/desktoptheme/air/widgets/toolbar.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/toolbar.svgz rename to plasma/desktoptheme/air/widgets/toolbar.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/toolbox.svgz b/plasma/desktoptheme/air/widgets/toolbox.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/toolbox.svgz rename to plasma/desktoptheme/air/widgets/toolbox.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/tooltip.svgz b/plasma/desktoptheme/air/widgets/tooltip.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/tooltip.svgz rename to plasma/desktoptheme/air/widgets/tooltip.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/translucentbackground.svgz b/plasma/desktoptheme/air/widgets/translucentbackground.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/translucentbackground.svgz rename to plasma/desktoptheme/air/widgets/translucentbackground.svgz diff --git a/plasma/desktop/desktoptheme/air/widgets/viewitem.svgz b/plasma/desktoptheme/air/widgets/viewitem.svgz similarity index 100% rename from plasma/desktop/desktoptheme/air/widgets/viewitem.svgz rename to plasma/desktoptheme/air/widgets/viewitem.svgz diff --git a/plasma/desktop/desktoptheme/appdashboard/CMakeLists.txt b/plasma/desktoptheme/appdashboard/CMakeLists.txt similarity index 100% rename from plasma/desktop/desktoptheme/appdashboard/CMakeLists.txt rename to plasma/desktoptheme/appdashboard/CMakeLists.txt diff --git a/plasma/desktop/desktoptheme/appdashboard/metadata.desktop b/plasma/desktoptheme/appdashboard/metadata.desktop similarity index 100% rename from plasma/desktop/desktoptheme/appdashboard/metadata.desktop rename to plasma/desktoptheme/appdashboard/metadata.desktop diff --git a/plasma/desktop/desktoptheme/appdashboard/widgets/background.svgz b/plasma/desktoptheme/appdashboard/widgets/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/appdashboard/widgets/background.svgz rename to plasma/desktoptheme/appdashboard/widgets/background.svgz diff --git a/plasma/desktop/desktoptheme/appdashboard/widgets/newspaper-background.svgz b/plasma/desktoptheme/appdashboard/widgets/newspaper-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/appdashboard/widgets/newspaper-background.svgz rename to plasma/desktoptheme/appdashboard/widgets/newspaper-background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/CMakeLists.txt b/plasma/desktoptheme/oxygen/CMakeLists.txt similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/CMakeLists.txt rename to plasma/desktoptheme/oxygen/CMakeLists.txt diff --git a/plasma/desktop/desktoptheme/oxygen/colors b/plasma/desktoptheme/oxygen/colors similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/colors rename to plasma/desktoptheme/oxygen/colors diff --git a/plasma/desktop/desktoptheme/oxygen/dialogs/background.svgz b/plasma/desktoptheme/oxygen/dialogs/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/dialogs/background.svgz rename to plasma/desktoptheme/oxygen/dialogs/background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/dialogs/kickoff.svgz b/plasma/desktoptheme/oxygen/dialogs/kickoff.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/dialogs/kickoff.svgz rename to plasma/desktoptheme/oxygen/dialogs/kickoff.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/dialogs/krunner.svgz b/plasma/desktoptheme/oxygen/dialogs/krunner.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/dialogs/krunner.svgz rename to plasma/desktoptheme/oxygen/dialogs/krunner.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/dialogs/shutdowndialog.source.svgz b/plasma/desktoptheme/oxygen/dialogs/shutdowndialog.source.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/dialogs/shutdowndialog.source.svgz rename to plasma/desktoptheme/oxygen/dialogs/shutdowndialog.source.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/dialogs/shutdowndialog.svgz b/plasma/desktoptheme/oxygen/dialogs/shutdowndialog.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/dialogs/shutdowndialog.svgz rename to plasma/desktoptheme/oxygen/dialogs/shutdowndialog.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/metadata.desktop b/plasma/desktoptheme/oxygen/metadata.desktop similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/metadata.desktop rename to plasma/desktoptheme/oxygen/metadata.desktop diff --git a/plasma/desktop/desktoptheme/oxygen/opaque/dialogs/background.svgz b/plasma/desktoptheme/oxygen/opaque/dialogs/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/opaque/dialogs/background.svgz rename to plasma/desktoptheme/oxygen/opaque/dialogs/background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/opaque/dialogs/krunner.svgz b/plasma/desktoptheme/oxygen/opaque/dialogs/krunner.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/opaque/dialogs/krunner.svgz rename to plasma/desktoptheme/oxygen/opaque/dialogs/krunner.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/opaque/dialogs/shutdowndialog.svgz b/plasma/desktoptheme/oxygen/opaque/dialogs/shutdowndialog.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/opaque/dialogs/shutdowndialog.svgz rename to plasma/desktoptheme/oxygen/opaque/dialogs/shutdowndialog.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/opaque/widgets/extender-background.svgz b/plasma/desktoptheme/oxygen/opaque/widgets/extender-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/opaque/widgets/extender-background.svgz rename to plasma/desktoptheme/oxygen/opaque/widgets/extender-background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/opaque/widgets/panel-background.svgz b/plasma/desktoptheme/oxygen/opaque/widgets/panel-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/opaque/widgets/panel-background.svgz rename to plasma/desktoptheme/oxygen/opaque/widgets/panel-background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/opaque/widgets/tooltip.svgz b/plasma/desktoptheme/oxygen/opaque/widgets/tooltip.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/opaque/widgets/tooltip.svgz rename to plasma/desktoptheme/oxygen/opaque/widgets/tooltip.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/action-overlays.svgz b/plasma/desktoptheme/oxygen/widgets/action-overlays.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/action-overlays.svgz rename to plasma/desktoptheme/oxygen/widgets/action-overlays.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/actionbutton.svgz b/plasma/desktoptheme/oxygen/widgets/actionbutton.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/actionbutton.svgz rename to plasma/desktoptheme/oxygen/widgets/actionbutton.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/analog_meter.svgz b/plasma/desktoptheme/oxygen/widgets/analog_meter.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/analog_meter.svgz rename to plasma/desktoptheme/oxygen/widgets/analog_meter.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/arrows.svgz b/plasma/desktoptheme/oxygen/widgets/arrows.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/arrows.svgz rename to plasma/desktoptheme/oxygen/widgets/arrows.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/background.svgz b/plasma/desktoptheme/oxygen/widgets/background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/background.svgz rename to plasma/desktoptheme/oxygen/widgets/background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/bar_meter_horizontal.svgz b/plasma/desktoptheme/oxygen/widgets/bar_meter_horizontal.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/bar_meter_horizontal.svgz rename to plasma/desktoptheme/oxygen/widgets/bar_meter_horizontal.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/bar_meter_vertical.svgz b/plasma/desktoptheme/oxygen/widgets/bar_meter_vertical.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/bar_meter_vertical.svgz rename to plasma/desktoptheme/oxygen/widgets/bar_meter_vertical.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/branding.svgz b/plasma/desktoptheme/oxygen/widgets/branding.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/branding.svgz rename to plasma/desktoptheme/oxygen/widgets/branding.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/busywidget.svgz b/plasma/desktoptheme/oxygen/widgets/busywidget.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/busywidget.svgz rename to plasma/desktoptheme/oxygen/widgets/busywidget.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/button.svgz b/plasma/desktoptheme/oxygen/widgets/button.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/button.svgz rename to plasma/desktoptheme/oxygen/widgets/button.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/calendar.svgz b/plasma/desktoptheme/oxygen/widgets/calendar.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/calendar.svgz rename to plasma/desktoptheme/oxygen/widgets/calendar.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/clock.svgz b/plasma/desktoptheme/oxygen/widgets/clock.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/clock.svgz rename to plasma/desktoptheme/oxygen/widgets/clock.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/configuration-icons.svgz b/plasma/desktoptheme/oxygen/widgets/configuration-icons.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/configuration-icons.svgz rename to plasma/desktoptheme/oxygen/widgets/configuration-icons.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/containment-controls.svgz b/plasma/desktoptheme/oxygen/widgets/containment-controls.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/containment-controls.svgz rename to plasma/desktoptheme/oxygen/widgets/containment-controls.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/dragger.svgz b/plasma/desktoptheme/oxygen/widgets/dragger.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/dragger.svgz rename to plasma/desktoptheme/oxygen/widgets/dragger.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/extender-background.svgz b/plasma/desktoptheme/oxygen/widgets/extender-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/extender-background.svgz rename to plasma/desktoptheme/oxygen/widgets/extender-background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/extender-dragger.svgz b/plasma/desktoptheme/oxygen/widgets/extender-dragger.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/extender-dragger.svgz rename to plasma/desktoptheme/oxygen/widgets/extender-dragger.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/frame.svgz b/plasma/desktoptheme/oxygen/widgets/frame.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/frame.svgz rename to plasma/desktoptheme/oxygen/widgets/frame.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/glowbar.svgz b/plasma/desktoptheme/oxygen/widgets/glowbar.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/glowbar.svgz rename to plasma/desktoptheme/oxygen/widgets/glowbar.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/line.svgz b/plasma/desktoptheme/oxygen/widgets/line.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/line.svgz rename to plasma/desktoptheme/oxygen/widgets/line.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/lineedit.svgz b/plasma/desktoptheme/oxygen/widgets/lineedit.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/lineedit.svgz rename to plasma/desktoptheme/oxygen/widgets/lineedit.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/media-delegate.svgz b/plasma/desktoptheme/oxygen/widgets/media-delegate.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/media-delegate.svgz rename to plasma/desktoptheme/oxygen/widgets/media-delegate.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/monitor.svgz b/plasma/desktoptheme/oxygen/widgets/monitor.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/monitor.svgz rename to plasma/desktoptheme/oxygen/widgets/monitor.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/pager.svgz b/plasma/desktoptheme/oxygen/widgets/pager.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/pager.svgz rename to plasma/desktoptheme/oxygen/widgets/pager.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/panel-background.svgz b/plasma/desktoptheme/oxygen/widgets/panel-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/panel-background.svgz rename to plasma/desktoptheme/oxygen/widgets/panel-background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/plot-background.svgz b/plasma/desktoptheme/oxygen/widgets/plot-background.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/plot-background.svgz rename to plasma/desktoptheme/oxygen/widgets/plot-background.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/scrollbar.svgz b/plasma/desktoptheme/oxygen/widgets/scrollbar.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/scrollbar.svgz rename to plasma/desktoptheme/oxygen/widgets/scrollbar.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/scrollwidget.svgz b/plasma/desktoptheme/oxygen/widgets/scrollwidget.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/scrollwidget.svgz rename to plasma/desktoptheme/oxygen/widgets/scrollwidget.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/slider.svgz b/plasma/desktoptheme/oxygen/widgets/slider.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/slider.svgz rename to plasma/desktoptheme/oxygen/widgets/slider.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/systemtray.svgz b/plasma/desktoptheme/oxygen/widgets/systemtray.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/systemtray.svgz rename to plasma/desktoptheme/oxygen/widgets/systemtray.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/tasks.svgz b/plasma/desktoptheme/oxygen/widgets/tasks.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/tasks.svgz rename to plasma/desktoptheme/oxygen/widgets/tasks.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/timer.svgz b/plasma/desktoptheme/oxygen/widgets/timer.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/timer.svgz rename to plasma/desktoptheme/oxygen/widgets/timer.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/toolbox.svgz b/plasma/desktoptheme/oxygen/widgets/toolbox.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/toolbox.svgz rename to plasma/desktoptheme/oxygen/widgets/toolbox.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/tooltip.svgz b/plasma/desktoptheme/oxygen/widgets/tooltip.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/tooltip.svgz rename to plasma/desktoptheme/oxygen/widgets/tooltip.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/translucentbackground.svgz b/plasma/desktoptheme/oxygen/widgets/translucentbackground.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/translucentbackground.svgz rename to plasma/desktoptheme/oxygen/widgets/translucentbackground.svgz diff --git a/plasma/desktop/desktoptheme/oxygen/widgets/viewitem.svgz b/plasma/desktoptheme/oxygen/widgets/viewitem.svgz similarity index 100% rename from plasma/desktop/desktoptheme/oxygen/widgets/viewitem.svgz rename to plasma/desktoptheme/oxygen/widgets/viewitem.svgz diff --git a/plasma/generic/CMakeLists.txt b/plasma/generic/CMakeLists.txt deleted file mode 100644 index 0eeac0b4..00000000 --- a/plasma/generic/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -add_subdirectory(containmentactions) - -add_subdirectory(applets) -add_subdirectory(dataengines) -add_subdirectory(runners) -add_subdirectory(scriptengines) -add_subdirectory(shells) -add_subdirectory(wallpapers) -add_subdirectory(containments) -add_subdirectory(declarativeimports) -add_subdirectory(kpart) -add_subdirectory(tools) diff --git a/plasma/generic/containments/CMakeLists.txt b/plasma/generic/containments/CMakeLists.txt deleted file mode 100644 index e6b0bc44..00000000 --- a/plasma/generic/containments/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(newspaper) diff --git a/plasma/generic/shells/CMakeLists.txt b/plasma/generic/shells/CMakeLists.txt deleted file mode 100644 index cbec9580..00000000 --- a/plasma/generic/shells/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(plasma-windowed) diff --git a/plasma/generic/kpart/CMakeLists.txt b/plasma/kpart/CMakeLists.txt similarity index 100% rename from plasma/generic/kpart/CMakeLists.txt rename to plasma/kpart/CMakeLists.txt diff --git a/plasma/generic/kpart/README b/plasma/kpart/README similarity index 100% rename from plasma/generic/kpart/README rename to plasma/kpart/README diff --git a/plasma/generic/kpart/plasma-kpart.desktop b/plasma/kpart/plasma-kpart.desktop similarity index 100% rename from plasma/generic/kpart/plasma-kpart.desktop rename to plasma/kpart/plasma-kpart.desktop diff --git a/plasma/generic/kpart/plasmakpart.cpp b/plasma/kpart/plasmakpart.cpp similarity index 100% rename from plasma/generic/kpart/plasmakpart.cpp rename to plasma/kpart/plasmakpart.cpp diff --git a/plasma/generic/kpart/plasmakpart.h b/plasma/kpart/plasmakpart.h similarity index 100% rename from plasma/generic/kpart/plasmakpart.h rename to plasma/kpart/plasmakpart.h diff --git a/plasma/generic/kpart/plasmakpartcorona.cpp b/plasma/kpart/plasmakpartcorona.cpp similarity index 100% rename from plasma/generic/kpart/plasmakpartcorona.cpp rename to plasma/kpart/plasmakpartcorona.cpp diff --git a/plasma/generic/kpart/plasmakpartcorona.h b/plasma/kpart/plasmakpartcorona.h similarity index 100% rename from plasma/generic/kpart/plasmakpartcorona.h rename to plasma/kpart/plasmakpartcorona.h diff --git a/plasma/generic/kpart/plasmakpartview.cpp b/plasma/kpart/plasmakpartview.cpp similarity index 100% rename from plasma/generic/kpart/plasmakpartview.cpp rename to plasma/kpart/plasmakpartview.cpp diff --git a/plasma/generic/kpart/plasmakpartview.h b/plasma/kpart/plasmakpartview.h similarity index 100% rename from plasma/generic/kpart/plasmakpartview.h rename to plasma/kpart/plasmakpartview.h diff --git a/plasma/generic/kpart/scripting/backportglobal.h b/plasma/kpart/scripting/backportglobal.h similarity index 100% rename from plasma/generic/kpart/scripting/backportglobal.h rename to plasma/kpart/scripting/backportglobal.h diff --git a/plasma/generic/kpart/scripting/rect.cpp b/plasma/kpart/scripting/rect.cpp similarity index 100% rename from plasma/generic/kpart/scripting/rect.cpp rename to plasma/kpart/scripting/rect.cpp diff --git a/plasma/generic/kpart/scripting/scriptengine.cpp b/plasma/kpart/scripting/scriptengine.cpp similarity index 100% rename from plasma/generic/kpart/scripting/scriptengine.cpp rename to plasma/kpart/scripting/scriptengine.cpp diff --git a/plasma/generic/kpart/scripting/scriptengine.h b/plasma/kpart/scripting/scriptengine.h similarity index 100% rename from plasma/generic/kpart/scripting/scriptengine.h rename to plasma/kpart/scripting/scriptengine.h diff --git a/plasma/generic/kpart/scripting/widget.cpp b/plasma/kpart/scripting/widget.cpp similarity index 100% rename from plasma/generic/kpart/scripting/widget.cpp rename to plasma/kpart/scripting/widget.cpp diff --git a/plasma/generic/kpart/scripting/widget.h b/plasma/kpart/scripting/widget.h similarity index 100% rename from plasma/generic/kpart/scripting/widget.h rename to plasma/kpart/scripting/widget.h diff --git a/plasma/generic/runners/CMakeLists.txt b/plasma/runners/CMakeLists.txt similarity index 92% rename from plasma/generic/runners/CMakeLists.txt rename to plasma/runners/CMakeLists.txt index 37e7a819..05aeccc6 100644 --- a/plasma/generic/runners/CMakeLists.txt +++ b/plasma/runners/CMakeLists.txt @@ -2,6 +2,7 @@ add_subdirectory(bookmarks) add_subdirectory(calculator) add_subdirectory(locations) add_subdirectory(places) +add_subdirectory(plasma-desktop) add_subdirectory(services) add_subdirectory(recentdocuments) add_subdirectory(shell) diff --git a/plasma/generic/runners/bookmarks/.gitignore b/plasma/runners/bookmarks/.gitignore similarity index 100% rename from plasma/generic/runners/bookmarks/.gitignore rename to plasma/runners/bookmarks/.gitignore diff --git a/plasma/generic/runners/bookmarks/CMakeLists.txt b/plasma/runners/bookmarks/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/bookmarks/CMakeLists.txt rename to plasma/runners/bookmarks/CMakeLists.txt diff --git a/plasma/generic/runners/bookmarks/Messages.sh b/plasma/runners/bookmarks/Messages.sh similarity index 100% rename from plasma/generic/runners/bookmarks/Messages.sh rename to plasma/runners/bookmarks/Messages.sh diff --git a/plasma/generic/runners/bookmarks/bookmarkmatch.cpp b/plasma/runners/bookmarks/bookmarkmatch.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/bookmarkmatch.cpp rename to plasma/runners/bookmarks/bookmarkmatch.cpp diff --git a/plasma/generic/runners/bookmarks/bookmarkmatch.h b/plasma/runners/bookmarks/bookmarkmatch.h similarity index 100% rename from plasma/generic/runners/bookmarks/bookmarkmatch.h rename to plasma/runners/bookmarks/bookmarkmatch.h diff --git a/plasma/generic/runners/bookmarks/bookmarksrunner.cpp b/plasma/runners/bookmarks/bookmarksrunner.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/bookmarksrunner.cpp rename to plasma/runners/bookmarks/bookmarksrunner.cpp diff --git a/plasma/generic/runners/bookmarks/bookmarksrunner.h b/plasma/runners/bookmarks/bookmarksrunner.h similarity index 100% rename from plasma/generic/runners/bookmarks/bookmarksrunner.h rename to plasma/runners/bookmarks/bookmarksrunner.h diff --git a/plasma/generic/runners/bookmarks/bookmarksrunner_defs.h b/plasma/runners/bookmarks/bookmarksrunner_defs.h similarity index 100% rename from plasma/generic/runners/bookmarks/bookmarksrunner_defs.h rename to plasma/runners/bookmarks/bookmarksrunner_defs.h diff --git a/plasma/generic/runners/bookmarks/browser.h b/plasma/runners/bookmarks/browser.h similarity index 100% rename from plasma/generic/runners/bookmarks/browser.h rename to plasma/runners/bookmarks/browser.h diff --git a/plasma/generic/runners/bookmarks/browserfactory.cpp b/plasma/runners/bookmarks/browserfactory.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/browserfactory.cpp rename to plasma/runners/bookmarks/browserfactory.cpp diff --git a/plasma/generic/runners/bookmarks/browserfactory.h b/plasma/runners/bookmarks/browserfactory.h similarity index 100% rename from plasma/generic/runners/bookmarks/browserfactory.h rename to plasma/runners/bookmarks/browserfactory.h diff --git a/plasma/generic/runners/bookmarks/browsers/chrome.cpp b/plasma/runners/bookmarks/browsers/chrome.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/chrome.cpp rename to plasma/runners/bookmarks/browsers/chrome.cpp diff --git a/plasma/generic/runners/bookmarks/browsers/chrome.h b/plasma/runners/bookmarks/browsers/chrome.h similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/chrome.h rename to plasma/runners/bookmarks/browsers/chrome.h diff --git a/plasma/generic/runners/bookmarks/browsers/chromefindprofile.cpp b/plasma/runners/bookmarks/browsers/chromefindprofile.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/chromefindprofile.cpp rename to plasma/runners/bookmarks/browsers/chromefindprofile.cpp diff --git a/plasma/generic/runners/bookmarks/browsers/chromefindprofile.h b/plasma/runners/bookmarks/browsers/chromefindprofile.h similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/chromefindprofile.h rename to plasma/runners/bookmarks/browsers/chromefindprofile.h diff --git a/plasma/generic/runners/bookmarks/browsers/findprofile.h b/plasma/runners/bookmarks/browsers/findprofile.h similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/findprofile.h rename to plasma/runners/bookmarks/browsers/findprofile.h diff --git a/plasma/generic/runners/bookmarks/browsers/firefox.cpp b/plasma/runners/bookmarks/browsers/firefox.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/firefox.cpp rename to plasma/runners/bookmarks/browsers/firefox.cpp diff --git a/plasma/generic/runners/bookmarks/browsers/firefox.h b/plasma/runners/bookmarks/browsers/firefox.h similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/firefox.h rename to plasma/runners/bookmarks/browsers/firefox.h diff --git a/plasma/generic/runners/bookmarks/browsers/kdebrowser.cpp b/plasma/runners/bookmarks/browsers/kdebrowser.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/kdebrowser.cpp rename to plasma/runners/bookmarks/browsers/kdebrowser.cpp diff --git a/plasma/generic/runners/bookmarks/browsers/kdebrowser.h b/plasma/runners/bookmarks/browsers/kdebrowser.h similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/kdebrowser.h rename to plasma/runners/bookmarks/browsers/kdebrowser.h diff --git a/plasma/generic/runners/bookmarks/browsers/opera.cpp b/plasma/runners/bookmarks/browsers/opera.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/opera.cpp rename to plasma/runners/bookmarks/browsers/opera.cpp diff --git a/plasma/generic/runners/bookmarks/browsers/opera.h b/plasma/runners/bookmarks/browsers/opera.h similarity index 100% rename from plasma/generic/runners/bookmarks/browsers/opera.h rename to plasma/runners/bookmarks/browsers/opera.h diff --git a/plasma/generic/runners/bookmarks/favicon.cpp b/plasma/runners/bookmarks/favicon.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/favicon.cpp rename to plasma/runners/bookmarks/favicon.cpp diff --git a/plasma/generic/runners/bookmarks/favicon.h b/plasma/runners/bookmarks/favicon.h similarity index 100% rename from plasma/generic/runners/bookmarks/favicon.h rename to plasma/runners/bookmarks/favicon.h diff --git a/plasma/generic/runners/bookmarks/faviconfromblob.cpp b/plasma/runners/bookmarks/faviconfromblob.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/faviconfromblob.cpp rename to plasma/runners/bookmarks/faviconfromblob.cpp diff --git a/plasma/generic/runners/bookmarks/faviconfromblob.h b/plasma/runners/bookmarks/faviconfromblob.h similarity index 100% rename from plasma/generic/runners/bookmarks/faviconfromblob.h rename to plasma/runners/bookmarks/faviconfromblob.h diff --git a/plasma/generic/runners/bookmarks/fetchsqlite.cpp b/plasma/runners/bookmarks/fetchsqlite.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/fetchsqlite.cpp rename to plasma/runners/bookmarks/fetchsqlite.cpp diff --git a/plasma/generic/runners/bookmarks/fetchsqlite.h b/plasma/runners/bookmarks/fetchsqlite.h similarity index 100% rename from plasma/generic/runners/bookmarks/fetchsqlite.h rename to plasma/runners/bookmarks/fetchsqlite.h diff --git a/plasma/generic/runners/bookmarks/plasma-runner-bookmarks.desktop b/plasma/runners/bookmarks/plasma-runner-bookmarks.desktop similarity index 100% rename from plasma/generic/runners/bookmarks/plasma-runner-bookmarks.desktop rename to plasma/runners/bookmarks/plasma-runner-bookmarks.desktop diff --git a/plasma/generic/runners/bookmarks/tests/CMakeLists.txt b/plasma/runners/bookmarks/tests/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/bookmarks/tests/CMakeLists.txt rename to plasma/runners/bookmarks/tests/CMakeLists.txt diff --git a/plasma/generic/runners/bookmarks/tests/chrome-config-home/.config/chromium/Local State b/plasma/runners/bookmarks/tests/chrome-config-home/.config/chromium/Local State similarity index 100% rename from plasma/generic/runners/bookmarks/tests/chrome-config-home/.config/chromium/Local State rename to plasma/runners/bookmarks/tests/chrome-config-home/.config/chromium/Local State diff --git a/plasma/generic/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-Sample.json b/plasma/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-Sample.json similarity index 100% rename from plasma/generic/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-Sample.json rename to plasma/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-Sample.json diff --git a/plasma/generic/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-SecondProfile.json b/plasma/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-SecondProfile.json similarity index 100% rename from plasma/generic/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-SecondProfile.json rename to plasma/runners/bookmarks/tests/chrome-config-home/Chrome-Bookmarks-SecondProfile.json diff --git a/plasma/generic/runners/bookmarks/tests/testchromebookmarks.cpp b/plasma/runners/bookmarks/tests/testchromebookmarks.cpp similarity index 100% rename from plasma/generic/runners/bookmarks/tests/testchromebookmarks.cpp rename to plasma/runners/bookmarks/tests/testchromebookmarks.cpp diff --git a/plasma/generic/runners/bookmarks/tests/testchromebookmarks.h b/plasma/runners/bookmarks/tests/testchromebookmarks.h similarity index 100% rename from plasma/generic/runners/bookmarks/tests/testchromebookmarks.h rename to plasma/runners/bookmarks/tests/testchromebookmarks.h diff --git a/plasma/generic/runners/calculator/CMakeLists.txt b/plasma/runners/calculator/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/calculator/CMakeLists.txt rename to plasma/runners/calculator/CMakeLists.txt diff --git a/plasma/generic/runners/calculator/Messages.sh b/plasma/runners/calculator/Messages.sh similarity index 100% rename from plasma/generic/runners/calculator/Messages.sh rename to plasma/runners/calculator/Messages.sh diff --git a/plasma/generic/runners/calculator/calculatorrunner.cpp b/plasma/runners/calculator/calculatorrunner.cpp similarity index 100% rename from plasma/generic/runners/calculator/calculatorrunner.cpp rename to plasma/runners/calculator/calculatorrunner.cpp diff --git a/plasma/generic/runners/calculator/calculatorrunner.h b/plasma/runners/calculator/calculatorrunner.h similarity index 100% rename from plasma/generic/runners/calculator/calculatorrunner.h rename to plasma/runners/calculator/calculatorrunner.h diff --git a/plasma/generic/runners/calculator/plasma-runner-calculator.desktop b/plasma/runners/calculator/plasma-runner-calculator.desktop similarity index 100% rename from plasma/generic/runners/calculator/plasma-runner-calculator.desktop rename to plasma/runners/calculator/plasma-runner-calculator.desktop diff --git a/plasma/generic/runners/calculator/qalculate_engine.cpp b/plasma/runners/calculator/qalculate_engine.cpp similarity index 100% rename from plasma/generic/runners/calculator/qalculate_engine.cpp rename to plasma/runners/calculator/qalculate_engine.cpp diff --git a/plasma/generic/runners/calculator/qalculate_engine.h b/plasma/runners/calculator/qalculate_engine.h similarity index 100% rename from plasma/generic/runners/calculator/qalculate_engine.h rename to plasma/runners/calculator/qalculate_engine.h diff --git a/plasma/generic/runners/kill/CMakeLists.txt b/plasma/runners/kill/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/kill/CMakeLists.txt rename to plasma/runners/kill/CMakeLists.txt diff --git a/plasma/generic/runners/kill/Messages.sh b/plasma/runners/kill/Messages.sh similarity index 100% rename from plasma/generic/runners/kill/Messages.sh rename to plasma/runners/kill/Messages.sh diff --git a/plasma/generic/runners/kill/TODO b/plasma/runners/kill/TODO similarity index 100% rename from plasma/generic/runners/kill/TODO rename to plasma/runners/kill/TODO diff --git a/plasma/generic/runners/kill/killrunner.cpp b/plasma/runners/kill/killrunner.cpp similarity index 100% rename from plasma/generic/runners/kill/killrunner.cpp rename to plasma/runners/kill/killrunner.cpp diff --git a/plasma/generic/runners/kill/killrunner.h b/plasma/runners/kill/killrunner.h similarity index 100% rename from plasma/generic/runners/kill/killrunner.h rename to plasma/runners/kill/killrunner.h diff --git a/plasma/generic/runners/kill/killrunner_config.cpp b/plasma/runners/kill/killrunner_config.cpp similarity index 100% rename from plasma/generic/runners/kill/killrunner_config.cpp rename to plasma/runners/kill/killrunner_config.cpp diff --git a/plasma/generic/runners/kill/killrunner_config.h b/plasma/runners/kill/killrunner_config.h similarity index 100% rename from plasma/generic/runners/kill/killrunner_config.h rename to plasma/runners/kill/killrunner_config.h diff --git a/plasma/generic/runners/kill/killrunner_config.ui b/plasma/runners/kill/killrunner_config.ui similarity index 100% rename from plasma/generic/runners/kill/killrunner_config.ui rename to plasma/runners/kill/killrunner_config.ui diff --git a/plasma/generic/runners/kill/plasma-runner-kill.desktop b/plasma/runners/kill/plasma-runner-kill.desktop similarity index 100% rename from plasma/generic/runners/kill/plasma-runner-kill.desktop rename to plasma/runners/kill/plasma-runner-kill.desktop diff --git a/plasma/generic/runners/kill/plasma-runner-kill_config.desktop b/plasma/runners/kill/plasma-runner-kill_config.desktop similarity index 100% rename from plasma/generic/runners/kill/plasma-runner-kill_config.desktop rename to plasma/runners/kill/plasma-runner-kill_config.desktop diff --git a/plasma/generic/runners/locations/CMakeLists.txt b/plasma/runners/locations/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/locations/CMakeLists.txt rename to plasma/runners/locations/CMakeLists.txt diff --git a/plasma/generic/runners/locations/Messages.sh b/plasma/runners/locations/Messages.sh similarity index 100% rename from plasma/generic/runners/locations/Messages.sh rename to plasma/runners/locations/Messages.sh diff --git a/plasma/generic/runners/locations/locationrunner.cpp b/plasma/runners/locations/locationrunner.cpp similarity index 100% rename from plasma/generic/runners/locations/locationrunner.cpp rename to plasma/runners/locations/locationrunner.cpp diff --git a/plasma/generic/runners/locations/locationrunner.h b/plasma/runners/locations/locationrunner.h similarity index 100% rename from plasma/generic/runners/locations/locationrunner.h rename to plasma/runners/locations/locationrunner.h diff --git a/plasma/generic/runners/locations/plasma-runner-locations.desktop b/plasma/runners/locations/plasma-runner-locations.desktop similarity index 100% rename from plasma/generic/runners/locations/plasma-runner-locations.desktop rename to plasma/runners/locations/plasma-runner-locations.desktop diff --git a/plasma/generic/runners/places/CMakeLists.txt b/plasma/runners/places/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/places/CMakeLists.txt rename to plasma/runners/places/CMakeLists.txt diff --git a/plasma/generic/runners/places/Messages.sh b/plasma/runners/places/Messages.sh similarity index 100% rename from plasma/generic/runners/places/Messages.sh rename to plasma/runners/places/Messages.sh diff --git a/plasma/generic/runners/places/placesrunner.cpp b/plasma/runners/places/placesrunner.cpp similarity index 100% rename from plasma/generic/runners/places/placesrunner.cpp rename to plasma/runners/places/placesrunner.cpp diff --git a/plasma/generic/runners/places/placesrunner.h b/plasma/runners/places/placesrunner.h similarity index 100% rename from plasma/generic/runners/places/placesrunner.h rename to plasma/runners/places/placesrunner.h diff --git a/plasma/generic/runners/places/plasma-runner-places.desktop b/plasma/runners/places/plasma-runner-places.desktop similarity index 100% rename from plasma/generic/runners/places/plasma-runner-places.desktop rename to plasma/runners/places/plasma-runner-places.desktop diff --git a/plasma/desktop/runners/plasma-desktop/CMakeLists.txt b/plasma/runners/plasma-desktop/CMakeLists.txt similarity index 100% rename from plasma/desktop/runners/plasma-desktop/CMakeLists.txt rename to plasma/runners/plasma-desktop/CMakeLists.txt diff --git a/plasma/desktop/runners/plasma-desktop/Messages.sh b/plasma/runners/plasma-desktop/Messages.sh similarity index 100% rename from plasma/desktop/runners/plasma-desktop/Messages.sh rename to plasma/runners/plasma-desktop/Messages.sh diff --git a/plasma/desktop/runners/plasma-desktop/plasma-desktop-runner.cpp b/plasma/runners/plasma-desktop/plasma-desktop-runner.cpp similarity index 100% rename from plasma/desktop/runners/plasma-desktop/plasma-desktop-runner.cpp rename to plasma/runners/plasma-desktop/plasma-desktop-runner.cpp diff --git a/plasma/desktop/runners/plasma-desktop/plasma-desktop-runner.h b/plasma/runners/plasma-desktop/plasma-desktop-runner.h similarity index 100% rename from plasma/desktop/runners/plasma-desktop/plasma-desktop-runner.h rename to plasma/runners/plasma-desktop/plasma-desktop-runner.h diff --git a/plasma/desktop/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop b/plasma/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop similarity index 100% rename from plasma/desktop/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop rename to plasma/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop diff --git a/plasma/generic/runners/powerdevil/CMakeLists.txt b/plasma/runners/powerdevil/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/powerdevil/CMakeLists.txt rename to plasma/runners/powerdevil/CMakeLists.txt diff --git a/plasma/generic/runners/powerdevil/Messages.sh b/plasma/runners/powerdevil/Messages.sh similarity index 100% rename from plasma/generic/runners/powerdevil/Messages.sh rename to plasma/runners/powerdevil/Messages.sh diff --git a/plasma/generic/runners/powerdevil/PowerDevilRunner.cpp b/plasma/runners/powerdevil/PowerDevilRunner.cpp similarity index 100% rename from plasma/generic/runners/powerdevil/PowerDevilRunner.cpp rename to plasma/runners/powerdevil/PowerDevilRunner.cpp diff --git a/plasma/generic/runners/powerdevil/PowerDevilRunner.h b/plasma/runners/powerdevil/PowerDevilRunner.h similarity index 100% rename from plasma/generic/runners/powerdevil/PowerDevilRunner.h rename to plasma/runners/powerdevil/PowerDevilRunner.h diff --git a/plasma/generic/runners/powerdevil/plasma-runner-powerdevil.desktop b/plasma/runners/powerdevil/plasma-runner-powerdevil.desktop similarity index 100% rename from plasma/generic/runners/powerdevil/plasma-runner-powerdevil.desktop rename to plasma/runners/powerdevil/plasma-runner-powerdevil.desktop diff --git a/plasma/generic/runners/recentdocuments/CMakeLists.txt b/plasma/runners/recentdocuments/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/recentdocuments/CMakeLists.txt rename to plasma/runners/recentdocuments/CMakeLists.txt diff --git a/plasma/generic/runners/recentdocuments/Messages.sh b/plasma/runners/recentdocuments/Messages.sh similarity index 100% rename from plasma/generic/runners/recentdocuments/Messages.sh rename to plasma/runners/recentdocuments/Messages.sh diff --git a/plasma/generic/runners/recentdocuments/README b/plasma/runners/recentdocuments/README similarity index 100% rename from plasma/generic/runners/recentdocuments/README rename to plasma/runners/recentdocuments/README diff --git a/plasma/generic/runners/recentdocuments/recentdocuments.cpp b/plasma/runners/recentdocuments/recentdocuments.cpp similarity index 100% rename from plasma/generic/runners/recentdocuments/recentdocuments.cpp rename to plasma/runners/recentdocuments/recentdocuments.cpp diff --git a/plasma/generic/runners/recentdocuments/recentdocuments.desktop b/plasma/runners/recentdocuments/recentdocuments.desktop similarity index 100% rename from plasma/generic/runners/recentdocuments/recentdocuments.desktop rename to plasma/runners/recentdocuments/recentdocuments.desktop diff --git a/plasma/generic/runners/recentdocuments/recentdocuments.h b/plasma/runners/recentdocuments/recentdocuments.h similarity index 100% rename from plasma/generic/runners/recentdocuments/recentdocuments.h rename to plasma/runners/recentdocuments/recentdocuments.h diff --git a/plasma/generic/runners/services/CMakeLists.txt b/plasma/runners/services/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/services/CMakeLists.txt rename to plasma/runners/services/CMakeLists.txt diff --git a/plasma/generic/runners/services/Messages.sh b/plasma/runners/services/Messages.sh similarity index 100% rename from plasma/generic/runners/services/Messages.sh rename to plasma/runners/services/Messages.sh diff --git a/plasma/generic/runners/services/plasma-runner-services.desktop b/plasma/runners/services/plasma-runner-services.desktop similarity index 100% rename from plasma/generic/runners/services/plasma-runner-services.desktop rename to plasma/runners/services/plasma-runner-services.desktop diff --git a/plasma/generic/runners/services/servicerunner.cpp b/plasma/runners/services/servicerunner.cpp similarity index 100% rename from plasma/generic/runners/services/servicerunner.cpp rename to plasma/runners/services/servicerunner.cpp diff --git a/plasma/generic/runners/services/servicerunner.h b/plasma/runners/services/servicerunner.h similarity index 100% rename from plasma/generic/runners/services/servicerunner.h rename to plasma/runners/services/servicerunner.h diff --git a/plasma/generic/runners/sessions/CMakeLists.txt b/plasma/runners/sessions/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/sessions/CMakeLists.txt rename to plasma/runners/sessions/CMakeLists.txt diff --git a/plasma/generic/runners/sessions/Messages.sh b/plasma/runners/sessions/Messages.sh similarity index 100% rename from plasma/generic/runners/sessions/Messages.sh rename to plasma/runners/sessions/Messages.sh diff --git a/plasma/generic/runners/sessions/plasma-runner-sessions.desktop b/plasma/runners/sessions/plasma-runner-sessions.desktop similarity index 100% rename from plasma/generic/runners/sessions/plasma-runner-sessions.desktop rename to plasma/runners/sessions/plasma-runner-sessions.desktop diff --git a/plasma/generic/runners/sessions/sessionrunner.cpp b/plasma/runners/sessions/sessionrunner.cpp similarity index 100% rename from plasma/generic/runners/sessions/sessionrunner.cpp rename to plasma/runners/sessions/sessionrunner.cpp diff --git a/plasma/generic/runners/sessions/sessionrunner.h b/plasma/runners/sessions/sessionrunner.h similarity index 100% rename from plasma/generic/runners/sessions/sessionrunner.h rename to plasma/runners/sessions/sessionrunner.h diff --git a/plasma/generic/runners/shell/CMakeLists.txt b/plasma/runners/shell/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/shell/CMakeLists.txt rename to plasma/runners/shell/CMakeLists.txt diff --git a/plasma/generic/runners/shell/Messages.sh b/plasma/runners/shell/Messages.sh similarity index 100% rename from plasma/generic/runners/shell/Messages.sh rename to plasma/runners/shell/Messages.sh diff --git a/plasma/generic/runners/shell/plasma-runner-shell.desktop b/plasma/runners/shell/plasma-runner-shell.desktop similarity index 100% rename from plasma/generic/runners/shell/plasma-runner-shell.desktop rename to plasma/runners/shell/plasma-runner-shell.desktop diff --git a/plasma/generic/runners/shell/shellOptions.ui b/plasma/runners/shell/shellOptions.ui similarity index 100% rename from plasma/generic/runners/shell/shellOptions.ui rename to plasma/runners/shell/shellOptions.ui diff --git a/plasma/generic/runners/shell/shell_config.cpp b/plasma/runners/shell/shell_config.cpp similarity index 100% rename from plasma/generic/runners/shell/shell_config.cpp rename to plasma/runners/shell/shell_config.cpp diff --git a/plasma/generic/runners/shell/shell_config.h b/plasma/runners/shell/shell_config.h similarity index 100% rename from plasma/generic/runners/shell/shell_config.h rename to plasma/runners/shell/shell_config.h diff --git a/plasma/generic/runners/shell/shellrunner.cpp b/plasma/runners/shell/shellrunner.cpp similarity index 100% rename from plasma/generic/runners/shell/shellrunner.cpp rename to plasma/runners/shell/shellrunner.cpp diff --git a/plasma/generic/runners/shell/shellrunner.h b/plasma/runners/shell/shellrunner.h similarity index 100% rename from plasma/generic/runners/shell/shellrunner.h rename to plasma/runners/shell/shellrunner.h diff --git a/plasma/generic/runners/solid/CMakeLists.txt b/plasma/runners/solid/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/solid/CMakeLists.txt rename to plasma/runners/solid/CMakeLists.txt diff --git a/plasma/generic/runners/solid/Messages.sh b/plasma/runners/solid/Messages.sh similarity index 100% rename from plasma/generic/runners/solid/Messages.sh rename to plasma/runners/solid/Messages.sh diff --git a/plasma/generic/runners/solid/devicewrapper.cpp b/plasma/runners/solid/devicewrapper.cpp similarity index 100% rename from plasma/generic/runners/solid/devicewrapper.cpp rename to plasma/runners/solid/devicewrapper.cpp diff --git a/plasma/generic/runners/solid/devicewrapper.h b/plasma/runners/solid/devicewrapper.h similarity index 100% rename from plasma/generic/runners/solid/devicewrapper.h rename to plasma/runners/solid/devicewrapper.h diff --git a/plasma/generic/runners/solid/plasma-runner-solid.desktop b/plasma/runners/solid/plasma-runner-solid.desktop similarity index 100% rename from plasma/generic/runners/solid/plasma-runner-solid.desktop rename to plasma/runners/solid/plasma-runner-solid.desktop diff --git a/plasma/generic/runners/solid/solidrunner.cpp b/plasma/runners/solid/solidrunner.cpp similarity index 100% rename from plasma/generic/runners/solid/solidrunner.cpp rename to plasma/runners/solid/solidrunner.cpp diff --git a/plasma/generic/runners/solid/solidrunner.h b/plasma/runners/solid/solidrunner.h similarity index 100% rename from plasma/generic/runners/solid/solidrunner.h rename to plasma/runners/solid/solidrunner.h diff --git a/plasma/generic/runners/webshortcuts/CMakeLists.txt b/plasma/runners/webshortcuts/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/webshortcuts/CMakeLists.txt rename to plasma/runners/webshortcuts/CMakeLists.txt diff --git a/plasma/generic/runners/webshortcuts/Messages.sh b/plasma/runners/webshortcuts/Messages.sh similarity index 100% rename from plasma/generic/runners/webshortcuts/Messages.sh rename to plasma/runners/webshortcuts/Messages.sh diff --git a/plasma/generic/runners/webshortcuts/plasma-runner-webshortcuts.desktop b/plasma/runners/webshortcuts/plasma-runner-webshortcuts.desktop similarity index 100% rename from plasma/generic/runners/webshortcuts/plasma-runner-webshortcuts.desktop rename to plasma/runners/webshortcuts/plasma-runner-webshortcuts.desktop diff --git a/plasma/generic/runners/webshortcuts/webshortcutrunner.cpp b/plasma/runners/webshortcuts/webshortcutrunner.cpp similarity index 100% rename from plasma/generic/runners/webshortcuts/webshortcutrunner.cpp rename to plasma/runners/webshortcuts/webshortcutrunner.cpp diff --git a/plasma/generic/runners/webshortcuts/webshortcutrunner.h b/plasma/runners/webshortcuts/webshortcutrunner.h similarity index 100% rename from plasma/generic/runners/webshortcuts/webshortcutrunner.h rename to plasma/runners/webshortcuts/webshortcutrunner.h diff --git a/plasma/generic/runners/windowedwidgets/CMakeLists.txt b/plasma/runners/windowedwidgets/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/windowedwidgets/CMakeLists.txt rename to plasma/runners/windowedwidgets/CMakeLists.txt diff --git a/plasma/generic/runners/windowedwidgets/Messages.sh b/plasma/runners/windowedwidgets/Messages.sh similarity index 100% rename from plasma/generic/runners/windowedwidgets/Messages.sh rename to plasma/runners/windowedwidgets/Messages.sh diff --git a/plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop b/plasma/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop similarity index 100% rename from plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop rename to plasma/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop diff --git a/plasma/generic/runners/windowedwidgets/windowedwidgetsrunner.cpp b/plasma/runners/windowedwidgets/windowedwidgetsrunner.cpp similarity index 100% rename from plasma/generic/runners/windowedwidgets/windowedwidgetsrunner.cpp rename to plasma/runners/windowedwidgets/windowedwidgetsrunner.cpp diff --git a/plasma/generic/runners/windowedwidgets/windowedwidgetsrunner.h b/plasma/runners/windowedwidgets/windowedwidgetsrunner.h similarity index 100% rename from plasma/generic/runners/windowedwidgets/windowedwidgetsrunner.h rename to plasma/runners/windowedwidgets/windowedwidgetsrunner.h diff --git a/plasma/generic/runners/windows/CMakeLists.txt b/plasma/runners/windows/CMakeLists.txt similarity index 100% rename from plasma/generic/runners/windows/CMakeLists.txt rename to plasma/runners/windows/CMakeLists.txt diff --git a/plasma/generic/runners/windows/Messages.sh b/plasma/runners/windows/Messages.sh similarity index 100% rename from plasma/generic/runners/windows/Messages.sh rename to plasma/runners/windows/Messages.sh diff --git a/plasma/generic/runners/windows/plasma-runner-windows.desktop b/plasma/runners/windows/plasma-runner-windows.desktop similarity index 100% rename from plasma/generic/runners/windows/plasma-runner-windows.desktop rename to plasma/runners/windows/plasma-runner-windows.desktop diff --git a/plasma/generic/runners/windows/windowsrunner.cpp b/plasma/runners/windows/windowsrunner.cpp similarity index 100% rename from plasma/generic/runners/windows/windowsrunner.cpp rename to plasma/runners/windows/windowsrunner.cpp diff --git a/plasma/generic/runners/windows/windowsrunner.h b/plasma/runners/windows/windowsrunner.h similarity index 100% rename from plasma/generic/runners/windows/windowsrunner.h rename to plasma/runners/windows/windowsrunner.h diff --git a/plasma/screensaver/CMakeLists.txt b/plasma/screensaver/CMakeLists.txt deleted file mode 100644 index 9e3fd8ee..00000000 --- a/plasma/screensaver/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_subdirectory(containments) -add_subdirectory(shell) - - diff --git a/plasma/screensaver/containments/CMakeLists.txt b/plasma/screensaver/containments/CMakeLists.txt deleted file mode 100644 index 48879e90..00000000 --- a/plasma/screensaver/containments/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(screensaver) - diff --git a/plasma/generic/scriptengines/CMakeLists.txt b/plasma/scriptengines/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/CMakeLists.txt rename to plasma/scriptengines/CMakeLists.txt diff --git a/plasma/generic/scriptengines/javascript/CMakeLists.txt b/plasma/scriptengines/javascript/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/javascript/CMakeLists.txt rename to plasma/scriptengines/javascript/CMakeLists.txt diff --git a/plasma/generic/scriptengines/javascript/Messages.sh b/plasma/scriptengines/javascript/Messages.sh similarity index 100% rename from plasma/generic/scriptengines/javascript/Messages.sh rename to plasma/scriptengines/javascript/Messages.sh diff --git a/plasma/generic/scriptengines/javascript/common/addonpackageplugin.cpp b/plasma/scriptengines/javascript/common/addonpackageplugin.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/common/addonpackageplugin.cpp rename to plasma/scriptengines/javascript/common/addonpackageplugin.cpp diff --git a/plasma/generic/scriptengines/javascript/common/declarativescriptenv.cpp b/plasma/scriptengines/javascript/common/declarativescriptenv.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/common/declarativescriptenv.cpp rename to plasma/scriptengines/javascript/common/declarativescriptenv.cpp diff --git a/plasma/generic/scriptengines/javascript/common/extension_io.cpp b/plasma/scriptengines/javascript/common/extension_io.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/common/extension_io.cpp rename to plasma/scriptengines/javascript/common/extension_io.cpp diff --git a/plasma/generic/scriptengines/javascript/common/extension_launchapp.cpp b/plasma/scriptengines/javascript/common/extension_launchapp.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/common/extension_launchapp.cpp rename to plasma/scriptengines/javascript/common/extension_launchapp.cpp diff --git a/plasma/generic/scriptengines/javascript/common/guiscriptenv.cpp b/plasma/scriptengines/javascript/common/guiscriptenv.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/common/guiscriptenv.cpp rename to plasma/scriptengines/javascript/common/guiscriptenv.cpp diff --git a/plasma/generic/scriptengines/javascript/common/javascriptaddonpackagestructure.cpp b/plasma/scriptengines/javascript/common/javascriptaddonpackagestructure.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/common/javascriptaddonpackagestructure.cpp rename to plasma/scriptengines/javascript/common/javascriptaddonpackagestructure.cpp diff --git a/plasma/generic/scriptengines/javascript/common/javascriptaddonpackagestructure.h b/plasma/scriptengines/javascript/common/javascriptaddonpackagestructure.h similarity index 100% rename from plasma/generic/scriptengines/javascript/common/javascriptaddonpackagestructure.h rename to plasma/scriptengines/javascript/common/javascriptaddonpackagestructure.h diff --git a/plasma/generic/scriptengines/javascript/common/scriptenv.cpp b/plasma/scriptengines/javascript/common/scriptenv.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/common/scriptenv.cpp rename to plasma/scriptengines/javascript/common/scriptenv.cpp diff --git a/plasma/generic/scriptengines/javascript/common/scriptenv.h b/plasma/scriptengines/javascript/common/scriptenv.h similarity index 100% rename from plasma/generic/scriptengines/javascript/common/scriptenv.h rename to plasma/scriptengines/javascript/common/scriptenv.h diff --git a/plasma/generic/scriptengines/javascript/data/plasma-javascriptaddon.desktop b/plasma/scriptengines/javascript/data/plasma-javascriptaddon.desktop similarity index 100% rename from plasma/generic/scriptengines/javascript/data/plasma-javascriptaddon.desktop rename to plasma/scriptengines/javascript/data/plasma-javascriptaddon.desktop diff --git a/plasma/generic/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop b/plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop similarity index 100% rename from plasma/generic/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop rename to plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop diff --git a/plasma/generic/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop b/plasma/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop similarity index 100% rename from plasma/generic/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop rename to plasma/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop diff --git a/plasma/generic/scriptengines/javascript/data/plasma-scriptengine-applet-simple-javascript.desktop b/plasma/scriptengines/javascript/data/plasma-scriptengine-applet-simple-javascript.desktop similarity index 100% rename from plasma/generic/scriptengines/javascript/data/plasma-scriptengine-applet-simple-javascript.desktop rename to plasma/scriptengines/javascript/data/plasma-scriptengine-applet-simple-javascript.desktop diff --git a/plasma/generic/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop b/plasma/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop similarity index 100% rename from plasma/generic/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop rename to plasma/scriptengines/javascript/data/plasma-scriptengine-dataengine-javascript.desktop diff --git a/plasma/generic/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop b/plasma/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop similarity index 100% rename from plasma/generic/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop rename to plasma/scriptengines/javascript/data/plasma-scriptengine-runner-javascript.desktop diff --git a/plasma/generic/scriptengines/javascript/dataengine/javascriptdataengine.cpp b/plasma/scriptengines/javascript/dataengine/javascriptdataengine.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/dataengine/javascriptdataengine.cpp rename to plasma/scriptengines/javascript/dataengine/javascriptdataengine.cpp diff --git a/plasma/generic/scriptengines/javascript/dataengine/javascriptdataengine.h b/plasma/scriptengines/javascript/dataengine/javascriptdataengine.h similarity index 100% rename from plasma/generic/scriptengines/javascript/dataengine/javascriptdataengine.h rename to plasma/scriptengines/javascript/dataengine/javascriptdataengine.h diff --git a/plasma/generic/scriptengines/javascript/dataengine/javascriptservice.cpp b/plasma/scriptengines/javascript/dataengine/javascriptservice.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/dataengine/javascriptservice.cpp rename to plasma/scriptengines/javascript/dataengine/javascriptservice.cpp diff --git a/plasma/generic/scriptengines/javascript/dataengine/javascriptservice.h b/plasma/scriptengines/javascript/dataengine/javascriptservice.h similarity index 100% rename from plasma/generic/scriptengines/javascript/dataengine/javascriptservice.h rename to plasma/scriptengines/javascript/dataengine/javascriptservice.h diff --git a/plasma/generic/scriptengines/javascript/declarative/appletcontainer.cpp b/plasma/scriptengines/javascript/declarative/appletcontainer.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/declarative/appletcontainer.cpp rename to plasma/scriptengines/javascript/declarative/appletcontainer.cpp diff --git a/plasma/generic/scriptengines/javascript/declarative/appletcontainer.h b/plasma/scriptengines/javascript/declarative/appletcontainer.h similarity index 100% rename from plasma/generic/scriptengines/javascript/declarative/appletcontainer.h rename to plasma/scriptengines/javascript/declarative/appletcontainer.h diff --git a/plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer.cpp b/plasma/scriptengines/javascript/declarative/declarativeitemcontainer.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer.cpp rename to plasma/scriptengines/javascript/declarative/declarativeitemcontainer.cpp diff --git a/plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer_p.h b/plasma/scriptengines/javascript/declarative/declarativeitemcontainer_p.h similarity index 100% rename from plasma/generic/scriptengines/javascript/declarative/declarativeitemcontainer_p.h rename to plasma/scriptengines/javascript/declarative/declarativeitemcontainer_p.h diff --git a/plasma/generic/scriptengines/javascript/declarative/toolboxproxy.cpp b/plasma/scriptengines/javascript/declarative/toolboxproxy.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/declarative/toolboxproxy.cpp rename to plasma/scriptengines/javascript/declarative/toolboxproxy.cpp diff --git a/plasma/generic/scriptengines/javascript/declarative/toolboxproxy.h b/plasma/scriptengines/javascript/declarative/toolboxproxy.h similarity index 100% rename from plasma/generic/scriptengines/javascript/declarative/toolboxproxy.h rename to plasma/scriptengines/javascript/declarative/toolboxproxy.h diff --git a/plasma/generic/scriptengines/javascript/plasmoid/abstractjsappletscript.cpp b/plasma/scriptengines/javascript/plasmoid/abstractjsappletscript.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/abstractjsappletscript.cpp rename to plasma/scriptengines/javascript/plasmoid/abstractjsappletscript.cpp diff --git a/plasma/generic/scriptengines/javascript/plasmoid/abstractjsappletscript.h b/plasma/scriptengines/javascript/plasmoid/abstractjsappletscript.h similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/abstractjsappletscript.h rename to plasma/scriptengines/javascript/plasmoid/abstractjsappletscript.h diff --git a/plasma/generic/scriptengines/javascript/plasmoid/appletinterface.cpp b/plasma/scriptengines/javascript/plasmoid/appletinterface.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/appletinterface.cpp rename to plasma/scriptengines/javascript/plasmoid/appletinterface.cpp diff --git a/plasma/generic/scriptengines/javascript/plasmoid/appletinterface.h b/plasma/scriptengines/javascript/plasmoid/appletinterface.h similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/appletinterface.h rename to plasma/scriptengines/javascript/plasmoid/appletinterface.h diff --git a/plasma/generic/scriptengines/javascript/plasmoid/declarativeappletscript.cpp b/plasma/scriptengines/javascript/plasmoid/declarativeappletscript.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/declarativeappletscript.cpp rename to plasma/scriptengines/javascript/plasmoid/declarativeappletscript.cpp diff --git a/plasma/generic/scriptengines/javascript/plasmoid/declarativeappletscript.h b/plasma/scriptengines/javascript/plasmoid/declarativeappletscript.h similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/declarativeappletscript.h rename to plasma/scriptengines/javascript/plasmoid/declarativeappletscript.h diff --git a/plasma/generic/scriptengines/javascript/plasmoid/jsappletinterface.cpp b/plasma/scriptengines/javascript/plasmoid/jsappletinterface.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/jsappletinterface.cpp rename to plasma/scriptengines/javascript/plasmoid/jsappletinterface.cpp diff --git a/plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp b/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp rename to plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.cpp diff --git a/plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.h b/plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.h similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/simplejavascriptapplet.h rename to plasma/scriptengines/javascript/plasmoid/simplejavascriptapplet.h diff --git a/plasma/generic/scriptengines/javascript/plasmoid/themedsvg.cpp b/plasma/scriptengines/javascript/plasmoid/themedsvg.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/themedsvg.cpp rename to plasma/scriptengines/javascript/plasmoid/themedsvg.cpp diff --git a/plasma/generic/scriptengines/javascript/plasmoid/themedsvg.h b/plasma/scriptengines/javascript/plasmoid/themedsvg.h similarity index 100% rename from plasma/generic/scriptengines/javascript/plasmoid/themedsvg.h rename to plasma/scriptengines/javascript/plasmoid/themedsvg.h diff --git a/plasma/generic/scriptengines/javascript/runner/javascriptrunner.cpp b/plasma/scriptengines/javascript/runner/javascriptrunner.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/runner/javascriptrunner.cpp rename to plasma/scriptengines/javascript/runner/javascriptrunner.cpp diff --git a/plasma/generic/scriptengines/javascript/runner/javascriptrunner.h b/plasma/scriptengines/javascript/runner/javascriptrunner.h similarity index 100% rename from plasma/generic/scriptengines/javascript/runner/javascriptrunner.h rename to plasma/scriptengines/javascript/runner/javascriptrunner.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/anchorlayout.cpp b/plasma/scriptengines/javascript/simplebindings/anchorlayout.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/anchorlayout.cpp rename to plasma/scriptengines/javascript/simplebindings/anchorlayout.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/animationgroup.cpp b/plasma/scriptengines/javascript/simplebindings/animationgroup.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/animationgroup.cpp rename to plasma/scriptengines/javascript/simplebindings/animationgroup.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/animationgroup.h b/plasma/scriptengines/javascript/simplebindings/animationgroup.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/animationgroup.h rename to plasma/scriptengines/javascript/simplebindings/animationgroup.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/backportglobal.h b/plasma/scriptengines/javascript/simplebindings/backportglobal.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/backportglobal.h rename to plasma/scriptengines/javascript/simplebindings/backportglobal.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/bytearrayclass.cpp b/plasma/scriptengines/javascript/simplebindings/bytearrayclass.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/bytearrayclass.cpp rename to plasma/scriptengines/javascript/simplebindings/bytearrayclass.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/bytearrayclass.h b/plasma/scriptengines/javascript/simplebindings/bytearrayclass.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/bytearrayclass.h rename to plasma/scriptengines/javascript/simplebindings/bytearrayclass.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/bytearrayprototype.cpp b/plasma/scriptengines/javascript/simplebindings/bytearrayprototype.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/bytearrayprototype.cpp rename to plasma/scriptengines/javascript/simplebindings/bytearrayprototype.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/bytearrayprototype.h b/plasma/scriptengines/javascript/simplebindings/bytearrayprototype.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/bytearrayprototype.h rename to plasma/scriptengines/javascript/simplebindings/bytearrayprototype.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/color.cpp b/plasma/scriptengines/javascript/simplebindings/color.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/color.cpp rename to plasma/scriptengines/javascript/simplebindings/color.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/dataengine.cpp b/plasma/scriptengines/javascript/simplebindings/dataengine.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/dataengine.cpp rename to plasma/scriptengines/javascript/simplebindings/dataengine.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/dataengine.h b/plasma/scriptengines/javascript/simplebindings/dataengine.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/dataengine.h rename to plasma/scriptengines/javascript/simplebindings/dataengine.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/dataenginereceiver.cpp b/plasma/scriptengines/javascript/simplebindings/dataenginereceiver.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/dataenginereceiver.cpp rename to plasma/scriptengines/javascript/simplebindings/dataenginereceiver.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/dataenginereceiver.h b/plasma/scriptengines/javascript/simplebindings/dataenginereceiver.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/dataenginereceiver.h rename to plasma/scriptengines/javascript/simplebindings/dataenginereceiver.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/easingcurve.cpp b/plasma/scriptengines/javascript/simplebindings/easingcurve.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/easingcurve.cpp rename to plasma/scriptengines/javascript/simplebindings/easingcurve.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/filedialogproxy.cpp b/plasma/scriptengines/javascript/simplebindings/filedialogproxy.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/filedialogproxy.cpp rename to plasma/scriptengines/javascript/simplebindings/filedialogproxy.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/filedialogproxy.h b/plasma/scriptengines/javascript/simplebindings/filedialogproxy.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/filedialogproxy.h rename to plasma/scriptengines/javascript/simplebindings/filedialogproxy.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/font.cpp b/plasma/scriptengines/javascript/simplebindings/font.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/font.cpp rename to plasma/scriptengines/javascript/simplebindings/font.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/graphicsitem.cpp b/plasma/scriptengines/javascript/simplebindings/graphicsitem.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/graphicsitem.cpp rename to plasma/scriptengines/javascript/simplebindings/graphicsitem.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/gridlayout.cpp b/plasma/scriptengines/javascript/simplebindings/gridlayout.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/gridlayout.cpp rename to plasma/scriptengines/javascript/simplebindings/gridlayout.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/i18n.cpp b/plasma/scriptengines/javascript/simplebindings/i18n.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/i18n.cpp rename to plasma/scriptengines/javascript/simplebindings/i18n.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/i18n.h b/plasma/scriptengines/javascript/simplebindings/i18n.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/i18n.h rename to plasma/scriptengines/javascript/simplebindings/i18n.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/icon.cpp b/plasma/scriptengines/javascript/simplebindings/icon.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/icon.cpp rename to plasma/scriptengines/javascript/simplebindings/icon.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/linearlayout.cpp b/plasma/scriptengines/javascript/simplebindings/linearlayout.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/linearlayout.cpp rename to plasma/scriptengines/javascript/simplebindings/linearlayout.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/painter.cpp b/plasma/scriptengines/javascript/simplebindings/painter.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/painter.cpp rename to plasma/scriptengines/javascript/simplebindings/painter.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/pen.cpp b/plasma/scriptengines/javascript/simplebindings/pen.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/pen.cpp rename to plasma/scriptengines/javascript/simplebindings/pen.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/pixmap.cpp b/plasma/scriptengines/javascript/simplebindings/pixmap.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/pixmap.cpp rename to plasma/scriptengines/javascript/simplebindings/pixmap.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/point.cpp b/plasma/scriptengines/javascript/simplebindings/point.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/point.cpp rename to plasma/scriptengines/javascript/simplebindings/point.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp b/plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp rename to plasma/scriptengines/javascript/simplebindings/qscriptbookkeeping.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/qscriptnonguibookkeeping.cpp b/plasma/scriptengines/javascript/simplebindings/qscriptnonguibookkeeping.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/qscriptnonguibookkeeping.cpp rename to plasma/scriptengines/javascript/simplebindings/qscriptnonguibookkeeping.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/rect.cpp b/plasma/scriptengines/javascript/simplebindings/rect.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/rect.cpp rename to plasma/scriptengines/javascript/simplebindings/rect.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/size.cpp b/plasma/scriptengines/javascript/simplebindings/size.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/size.cpp rename to plasma/scriptengines/javascript/simplebindings/size.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/sizepolicy.cpp b/plasma/scriptengines/javascript/simplebindings/sizepolicy.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/sizepolicy.cpp rename to plasma/scriptengines/javascript/simplebindings/sizepolicy.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/timer.cpp b/plasma/scriptengines/javascript/simplebindings/timer.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/timer.cpp rename to plasma/scriptengines/javascript/simplebindings/timer.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/uiloader.cpp b/plasma/scriptengines/javascript/simplebindings/uiloader.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/uiloader.cpp rename to plasma/scriptengines/javascript/simplebindings/uiloader.cpp diff --git a/plasma/generic/scriptengines/javascript/simplebindings/uiloader.h b/plasma/scriptengines/javascript/simplebindings/uiloader.h similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/uiloader.h rename to plasma/scriptengines/javascript/simplebindings/uiloader.h diff --git a/plasma/generic/scriptengines/javascript/simplebindings/url.cpp b/plasma/scriptengines/javascript/simplebindings/url.cpp similarity index 100% rename from plasma/generic/scriptengines/javascript/simplebindings/url.cpp rename to plasma/scriptengines/javascript/simplebindings/url.cpp diff --git a/plasma/generic/scriptengines/python/CMakeLists.txt b/plasma/scriptengines/python/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/python/CMakeLists.txt rename to plasma/scriptengines/python/CMakeLists.txt diff --git a/plasma/generic/scriptengines/python/plasma-scriptengine-applet-python.desktop b/plasma/scriptengines/python/plasma-scriptengine-applet-python.desktop similarity index 100% rename from plasma/generic/scriptengines/python/plasma-scriptengine-applet-python.desktop rename to plasma/scriptengines/python/plasma-scriptengine-applet-python.desktop diff --git a/plasma/generic/scriptengines/python/plasma-scriptengine-dataengine-python.desktop b/plasma/scriptengines/python/plasma-scriptengine-dataengine-python.desktop similarity index 100% rename from plasma/generic/scriptengines/python/plasma-scriptengine-dataengine-python.desktop rename to plasma/scriptengines/python/plasma-scriptengine-dataengine-python.desktop diff --git a/plasma/generic/scriptengines/python/plasma-scriptengine-runner-python.desktop b/plasma/scriptengines/python/plasma-scriptengine-runner-python.desktop similarity index 100% rename from plasma/generic/scriptengines/python/plasma-scriptengine-runner-python.desktop rename to plasma/scriptengines/python/plasma-scriptengine-runner-python.desktop diff --git a/plasma/generic/scriptengines/python/plasma-scriptengine-wallpaper-python.desktop b/plasma/scriptengines/python/plasma-scriptengine-wallpaper-python.desktop similarity index 100% rename from plasma/generic/scriptengines/python/plasma-scriptengine-wallpaper-python.desktop rename to plasma/scriptengines/python/plasma-scriptengine-wallpaper-python.desktop diff --git a/plasma/generic/scriptengines/python/plasma_importer.py b/plasma/scriptengines/python/plasma_importer.py similarity index 100% rename from plasma/generic/scriptengines/python/plasma_importer.py rename to plasma/scriptengines/python/plasma_importer.py diff --git a/plasma/generic/scriptengines/python/plasmascript.py b/plasma/scriptengines/python/plasmascript.py similarity index 100% rename from plasma/generic/scriptengines/python/plasmascript.py rename to plasma/scriptengines/python/plasmascript.py diff --git a/plasma/generic/scriptengines/python/pyappletscript.py b/plasma/scriptengines/python/pyappletscript.py similarity index 100% rename from plasma/generic/scriptengines/python/pyappletscript.py rename to plasma/scriptengines/python/pyappletscript.py diff --git a/plasma/generic/scriptengines/python/pydataengine.py b/plasma/scriptengines/python/pydataengine.py similarity index 100% rename from plasma/generic/scriptengines/python/pydataengine.py rename to plasma/scriptengines/python/pydataengine.py diff --git a/plasma/generic/scriptengines/python/pyrunner.py b/plasma/scriptengines/python/pyrunner.py similarity index 100% rename from plasma/generic/scriptengines/python/pyrunner.py rename to plasma/scriptengines/python/pyrunner.py diff --git a/plasma/generic/scriptengines/python/pywallpaper.py b/plasma/scriptengines/python/pywallpaper.py similarity index 100% rename from plasma/generic/scriptengines/python/pywallpaper.py rename to plasma/scriptengines/python/pywallpaper.py diff --git a/plasma/generic/scriptengines/ruby/CMakeLists.txt b/plasma/scriptengines/ruby/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/ruby/CMakeLists.txt rename to plasma/scriptengines/ruby/CMakeLists.txt diff --git a/plasma/generic/scriptengines/ruby/applet.rb b/plasma/scriptengines/ruby/applet.rb similarity index 100% rename from plasma/generic/scriptengines/ruby/applet.rb rename to plasma/scriptengines/ruby/applet.rb diff --git a/plasma/generic/scriptengines/ruby/data_engine.rb b/plasma/scriptengines/ruby/data_engine.rb similarity index 100% rename from plasma/generic/scriptengines/ruby/data_engine.rb rename to plasma/scriptengines/ruby/data_engine.rb diff --git a/plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop b/plasma/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop similarity index 100% rename from plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop rename to plasma/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop diff --git a/plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop b/plasma/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop similarity index 100% rename from plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop rename to plasma/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop diff --git a/plasma/generic/scriptengines/webkit/CMakeLists.txt b/plasma/scriptengines/webkit/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/webkit/CMakeLists.txt rename to plasma/scriptengines/webkit/CMakeLists.txt diff --git a/plasma/generic/scriptengines/webkit/Messages.sh b/plasma/scriptengines/webkit/Messages.sh similarity index 100% rename from plasma/generic/scriptengines/webkit/Messages.sh rename to plasma/scriptengines/webkit/Messages.sh diff --git a/plasma/generic/scriptengines/webkit/README b/plasma/scriptengines/webkit/README similarity index 100% rename from plasma/generic/scriptengines/webkit/README rename to plasma/scriptengines/webkit/README diff --git a/plasma/generic/scriptengines/webkit/bundle.cpp b/plasma/scriptengines/webkit/bundle.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/bundle.cpp rename to plasma/scriptengines/webkit/bundle.cpp diff --git a/plasma/generic/scriptengines/webkit/bundle.h b/plasma/scriptengines/webkit/bundle.h similarity index 100% rename from plasma/generic/scriptengines/webkit/bundle.h rename to plasma/scriptengines/webkit/bundle.h diff --git a/plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleAnimator.js b/plasma/scriptengines/webkit/dashboard/AppleClasses/AppleAnimator.js similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleAnimator.js rename to plasma/scriptengines/webkit/dashboard/AppleClasses/AppleAnimator.js diff --git a/plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleButton.js b/plasma/scriptengines/webkit/dashboard/AppleClasses/AppleButton.js similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleButton.js rename to plasma/scriptengines/webkit/dashboard/AppleClasses/AppleButton.js diff --git a/plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleInfoButton.js b/plasma/scriptengines/webkit/dashboard/AppleClasses/AppleInfoButton.js similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleInfoButton.js rename to plasma/scriptengines/webkit/dashboard/AppleClasses/AppleInfoButton.js diff --git a/plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleScrollArea.js b/plasma/scriptengines/webkit/dashboard/AppleClasses/AppleScrollArea.js similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleScrollArea.js rename to plasma/scriptengines/webkit/dashboard/AppleClasses/AppleScrollArea.js diff --git a/plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleScrollbar.js b/plasma/scriptengines/webkit/dashboard/AppleClasses/AppleScrollbar.js similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleScrollbar.js rename to plasma/scriptengines/webkit/dashboard/AppleClasses/AppleScrollbar.js diff --git a/plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleSlider.js b/plasma/scriptengines/webkit/dashboard/AppleClasses/AppleSlider.js similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/AppleClasses/AppleSlider.js rename to plasma/scriptengines/webkit/dashboard/AppleClasses/AppleSlider.js diff --git a/plasma/generic/scriptengines/webkit/dashboard/AppleClasses/CMakeLists.txt b/plasma/scriptengines/webkit/dashboard/AppleClasses/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/AppleClasses/CMakeLists.txt rename to plasma/scriptengines/webkit/dashboard/AppleClasses/CMakeLists.txt diff --git a/plasma/generic/scriptengines/webkit/dashboard/CMakeLists.txt b/plasma/scriptengines/webkit/dashboard/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/CMakeLists.txt rename to plasma/scriptengines/webkit/dashboard/CMakeLists.txt diff --git a/plasma/generic/scriptengines/webkit/dashboard/button/CMakeLists.txt b/plasma/scriptengines/webkit/dashboard/button/CMakeLists.txt similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/button/CMakeLists.txt rename to plasma/scriptengines/webkit/dashboard/button/CMakeLists.txt diff --git a/plasma/generic/scriptengines/webkit/dashboard/button/genericButton.js b/plasma/scriptengines/webkit/dashboard/button/genericButton.js similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard/button/genericButton.js rename to plasma/scriptengines/webkit/dashboard/button/genericButton.js diff --git a/plasma/generic/scriptengines/webkit/dashboard_plugin.cpp b/plasma/scriptengines/webkit/dashboard_plugin.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboard_plugin.cpp rename to plasma/scriptengines/webkit/dashboard_plugin.cpp diff --git a/plasma/generic/scriptengines/webkit/dashboardapplet.cpp b/plasma/scriptengines/webkit/dashboardapplet.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboardapplet.cpp rename to plasma/scriptengines/webkit/dashboardapplet.cpp diff --git a/plasma/generic/scriptengines/webkit/dashboardapplet.h b/plasma/scriptengines/webkit/dashboardapplet.h similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboardapplet.h rename to plasma/scriptengines/webkit/dashboardapplet.h diff --git a/plasma/generic/scriptengines/webkit/dashboardjs.cpp b/plasma/scriptengines/webkit/dashboardjs.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboardjs.cpp rename to plasma/scriptengines/webkit/dashboardjs.cpp diff --git a/plasma/generic/scriptengines/webkit/dashboardjs.h b/plasma/scriptengines/webkit/dashboardjs.h similarity index 100% rename from plasma/generic/scriptengines/webkit/dashboardjs.h rename to plasma/scriptengines/webkit/dashboardjs.h diff --git a/plasma/generic/scriptengines/webkit/plasma-packagestructure-dashboard.desktop b/plasma/scriptengines/webkit/plasma-packagestructure-dashboard.desktop similarity index 100% rename from plasma/generic/scriptengines/webkit/plasma-packagestructure-dashboard.desktop rename to plasma/scriptengines/webkit/plasma-packagestructure-dashboard.desktop diff --git a/plasma/generic/scriptengines/webkit/plasma-packagestructure-web.desktop b/plasma/scriptengines/webkit/plasma-packagestructure-web.desktop similarity index 100% rename from plasma/generic/scriptengines/webkit/plasma-packagestructure-web.desktop rename to plasma/scriptengines/webkit/plasma-packagestructure-web.desktop diff --git a/plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop b/plasma/scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop similarity index 100% rename from plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop rename to plasma/scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop diff --git a/plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-web.desktop b/plasma/scriptengines/webkit/plasma-scriptengine-applet-web.desktop similarity index 100% rename from plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-web.desktop rename to plasma/scriptengines/webkit/plasma-scriptengine-applet-web.desktop diff --git a/plasma/generic/scriptengines/webkit/plasmajs.cpp b/plasma/scriptengines/webkit/plasmajs.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/plasmajs.cpp rename to plasma/scriptengines/webkit/plasmajs.cpp diff --git a/plasma/generic/scriptengines/webkit/plasmajs.h b/plasma/scriptengines/webkit/plasmajs.h similarity index 100% rename from plasma/generic/scriptengines/webkit/plasmajs.h rename to plasma/scriptengines/webkit/plasmajs.h diff --git a/plasma/generic/scriptengines/webkit/plasmawebapplet.cpp b/plasma/scriptengines/webkit/plasmawebapplet.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/plasmawebapplet.cpp rename to plasma/scriptengines/webkit/plasmawebapplet.cpp diff --git a/plasma/generic/scriptengines/webkit/plasmawebapplet.h b/plasma/scriptengines/webkit/plasmawebapplet.h similarity index 100% rename from plasma/generic/scriptengines/webkit/plasmawebapplet.h rename to plasma/scriptengines/webkit/plasmawebapplet.h diff --git a/plasma/generic/scriptengines/webkit/tests/AppletAnimatorTest.html b/plasma/scriptengines/webkit/tests/AppletAnimatorTest.html similarity index 100% rename from plasma/generic/scriptengines/webkit/tests/AppletAnimatorTest.html rename to plasma/scriptengines/webkit/tests/AppletAnimatorTest.html diff --git a/plasma/generic/scriptengines/webkit/tests/HelloWorld.zip b/plasma/scriptengines/webkit/tests/HelloWorld.zip similarity index 100% rename from plasma/generic/scriptengines/webkit/tests/HelloWorld.zip rename to plasma/scriptengines/webkit/tests/HelloWorld.zip diff --git a/plasma/generic/scriptengines/webkit/webapplet.cpp b/plasma/scriptengines/webkit/webapplet.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/webapplet.cpp rename to plasma/scriptengines/webkit/webapplet.cpp diff --git a/plasma/generic/scriptengines/webkit/webapplet.h b/plasma/scriptengines/webkit/webapplet.h similarity index 100% rename from plasma/generic/scriptengines/webkit/webapplet.h rename to plasma/scriptengines/webkit/webapplet.h diff --git a/plasma/generic/scriptengines/webkit/webapplet_package.cpp b/plasma/scriptengines/webkit/webapplet_package.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/webapplet_package.cpp rename to plasma/scriptengines/webkit/webapplet_package.cpp diff --git a/plasma/generic/scriptengines/webkit/webapplet_package.h b/plasma/scriptengines/webkit/webapplet_package.h similarity index 100% rename from plasma/generic/scriptengines/webkit/webapplet_package.h rename to plasma/scriptengines/webkit/webapplet_package.h diff --git a/plasma/generic/scriptengines/webkit/webapplet_plugin.cpp b/plasma/scriptengines/webkit/webapplet_plugin.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/webapplet_plugin.cpp rename to plasma/scriptengines/webkit/webapplet_plugin.cpp diff --git a/plasma/generic/scriptengines/webkit/webpage.cpp b/plasma/scriptengines/webkit/webpage.cpp similarity index 100% rename from plasma/generic/scriptengines/webkit/webpage.cpp rename to plasma/scriptengines/webkit/webpage.cpp diff --git a/plasma/generic/scriptengines/webkit/webpage.h b/plasma/scriptengines/webkit/webpage.h similarity index 100% rename from plasma/generic/scriptengines/webkit/webpage.h rename to plasma/scriptengines/webkit/webpage.h diff --git a/plasma/shells/CMakeLists.txt b/plasma/shells/CMakeLists.txt new file mode 100644 index 00000000..e418d58f --- /dev/null +++ b/plasma/shells/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(plasma-desktop) +add_subdirectory(plasma-overlay) +add_subdirectory(plasma-windowed) diff --git a/plasma/desktop/shell/CMakeLists.txt b/plasma/shells/plasma-desktop/CMakeLists.txt similarity index 100% rename from plasma/desktop/shell/CMakeLists.txt rename to plasma/shells/plasma-desktop/CMakeLists.txt diff --git a/plasma/desktop/shell/Messages.sh b/plasma/shells/plasma-desktop/Messages.sh similarity index 100% rename from plasma/desktop/shell/Messages.sh rename to plasma/shells/plasma-desktop/Messages.sh diff --git a/plasma/desktop/shell/accessibility/accessiblefactory.cpp b/plasma/shells/plasma-desktop/accessibility/accessiblefactory.cpp similarity index 100% rename from plasma/desktop/shell/accessibility/accessiblefactory.cpp rename to plasma/shells/plasma-desktop/accessibility/accessiblefactory.cpp diff --git a/plasma/desktop/shell/accessibility/accessiblefactory.h b/plasma/shells/plasma-desktop/accessibility/accessiblefactory.h similarity index 100% rename from plasma/desktop/shell/accessibility/accessiblefactory.h rename to plasma/shells/plasma-desktop/accessibility/accessiblefactory.h diff --git a/plasma/desktop/shell/accessibility/accessibleplasmaview.cpp b/plasma/shells/plasma-desktop/accessibility/accessibleplasmaview.cpp similarity index 100% rename from plasma/desktop/shell/accessibility/accessibleplasmaview.cpp rename to plasma/shells/plasma-desktop/accessibility/accessibleplasmaview.cpp diff --git a/plasma/desktop/shell/accessibility/accessibleplasmaview.h b/plasma/shells/plasma-desktop/accessibility/accessibleplasmaview.h similarity index 100% rename from plasma/desktop/shell/accessibility/accessibleplasmaview.h rename to plasma/shells/plasma-desktop/accessibility/accessibleplasmaview.h diff --git a/plasma/desktop/shell/checkbox.cpp b/plasma/shells/plasma-desktop/checkbox.cpp similarity index 100% rename from plasma/desktop/shell/checkbox.cpp rename to plasma/shells/plasma-desktop/checkbox.cpp diff --git a/plasma/desktop/shell/checkbox.h b/plasma/shells/plasma-desktop/checkbox.h similarity index 100% rename from plasma/desktop/shell/checkbox.h rename to plasma/shells/plasma-desktop/checkbox.h diff --git a/plasma/desktop/shell/controllerwindow.cpp b/plasma/shells/plasma-desktop/controllerwindow.cpp similarity index 100% rename from plasma/desktop/shell/controllerwindow.cpp rename to plasma/shells/plasma-desktop/controllerwindow.cpp diff --git a/plasma/desktop/shell/controllerwindow.h b/plasma/shells/plasma-desktop/controllerwindow.h similarity index 100% rename from plasma/desktop/shell/controllerwindow.h rename to plasma/shells/plasma-desktop/controllerwindow.h diff --git a/plasma/desktop/shell/dashboardview.cpp b/plasma/shells/plasma-desktop/dashboardview.cpp similarity index 100% rename from plasma/desktop/shell/dashboardview.cpp rename to plasma/shells/plasma-desktop/dashboardview.cpp diff --git a/plasma/desktop/shell/dashboardview.h b/plasma/shells/plasma-desktop/dashboardview.h similarity index 100% rename from plasma/desktop/shell/dashboardview.h rename to plasma/shells/plasma-desktop/dashboardview.h diff --git a/plasma/desktop/shell/data/plasma-desktop-js.xml b/plasma/shells/plasma-desktop/data/plasma-desktop-js.xml similarity index 100% rename from plasma/desktop/shell/data/plasma-desktop-js.xml rename to plasma/shells/plasma-desktop/data/plasma-desktop-js.xml diff --git a/plasma/desktop/shell/data/plasma-desktop.desktop b/plasma/shells/plasma-desktop/data/plasma-desktop.desktop similarity index 100% rename from plasma/desktop/shell/data/plasma-desktop.desktop rename to plasma/shells/plasma-desktop/data/plasma-desktop.desktop diff --git a/plasma/desktop/shell/data/plasma-desktop.notifyrc b/plasma/shells/plasma-desktop/data/plasma-desktop.notifyrc similarity index 100% rename from plasma/desktop/shell/data/plasma-desktop.notifyrc rename to plasma/shells/plasma-desktop/data/plasma-desktop.notifyrc diff --git a/plasma/desktop/shell/data/plasma-desktoprc.cmake b/plasma/shells/plasma-desktop/data/plasma-desktoprc.cmake similarity index 100% rename from plasma/desktop/shell/data/plasma-desktoprc.cmake rename to plasma/shells/plasma-desktop/data/plasma-desktoprc.cmake diff --git a/plasma/desktop/shell/data/plasma-shell-desktop.kcfg b/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfg similarity index 100% rename from plasma/desktop/shell/data/plasma-shell-desktop.kcfg rename to plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfg diff --git a/plasma/desktop/shell/data/plasma-shell-desktop.kcfgc b/plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfgc similarity index 100% rename from plasma/desktop/shell/data/plasma-shell-desktop.kcfgc rename to plasma/shells/plasma-desktop/data/plasma-shell-desktop.kcfgc diff --git a/plasma/desktop/shell/data/plasma-themes.knsrc b/plasma/shells/plasma-desktop/data/plasma-themes.knsrc similarity index 100% rename from plasma/desktop/shell/data/plasma-themes.knsrc rename to plasma/shells/plasma-desktop/data/plasma-themes.knsrc diff --git a/plasma/desktop/shell/data/plasma.desktop b/plasma/shells/plasma-desktop/data/plasma.desktop similarity index 100% rename from plasma/desktop/shell/data/plasma.desktop rename to plasma/shells/plasma-desktop/data/plasma.desktop diff --git a/plasma/desktop/shell/dbus/org.kde.plasma.App.xml b/plasma/shells/plasma-desktop/dbus/org.kde.plasma.App.xml similarity index 100% rename from plasma/desktop/shell/dbus/org.kde.plasma.App.xml rename to plasma/shells/plasma-desktop/dbus/org.kde.plasma.App.xml diff --git a/plasma/desktop/shell/desktopcorona.cpp b/plasma/shells/plasma-desktop/desktopcorona.cpp similarity index 100% rename from plasma/desktop/shell/desktopcorona.cpp rename to plasma/shells/plasma-desktop/desktopcorona.cpp diff --git a/plasma/desktop/shell/desktopcorona.h b/plasma/shells/plasma-desktop/desktopcorona.h similarity index 100% rename from plasma/desktop/shell/desktopcorona.h rename to plasma/shells/plasma-desktop/desktopcorona.h diff --git a/plasma/desktop/shell/desktopview.cpp b/plasma/shells/plasma-desktop/desktopview.cpp similarity index 100% rename from plasma/desktop/shell/desktopview.cpp rename to plasma/shells/plasma-desktop/desktopview.cpp diff --git a/plasma/desktop/shell/desktopview.h b/plasma/shells/plasma-desktop/desktopview.h similarity index 100% rename from plasma/desktop/shell/desktopview.h rename to plasma/shells/plasma-desktop/desktopview.h diff --git a/plasma/desktop/shell/interactiveconsole.cpp b/plasma/shells/plasma-desktop/interactiveconsole.cpp similarity index 100% rename from plasma/desktop/shell/interactiveconsole.cpp rename to plasma/shells/plasma-desktop/interactiveconsole.cpp diff --git a/plasma/desktop/shell/interactiveconsole.h b/plasma/shells/plasma-desktop/interactiveconsole.h similarity index 100% rename from plasma/desktop/shell/interactiveconsole.h rename to plasma/shells/plasma-desktop/interactiveconsole.h diff --git a/plasma/desktop/shell/klistconfirmationdialog.cpp b/plasma/shells/plasma-desktop/klistconfirmationdialog.cpp similarity index 100% rename from plasma/desktop/shell/klistconfirmationdialog.cpp rename to plasma/shells/plasma-desktop/klistconfirmationdialog.cpp diff --git a/plasma/desktop/shell/klistconfirmationdialog.h b/plasma/shells/plasma-desktop/klistconfirmationdialog.h similarity index 100% rename from plasma/desktop/shell/klistconfirmationdialog.h rename to plasma/shells/plasma-desktop/klistconfirmationdialog.h diff --git a/plasma/desktop/shell/main.cpp b/plasma/shells/plasma-desktop/main.cpp similarity index 100% rename from plasma/desktop/shell/main.cpp rename to plasma/shells/plasma-desktop/main.cpp diff --git a/plasma/desktop/shell/panelapplethandle.cpp b/plasma/shells/plasma-desktop/panelapplethandle.cpp similarity index 100% rename from plasma/desktop/shell/panelapplethandle.cpp rename to plasma/shells/plasma-desktop/panelapplethandle.cpp diff --git a/plasma/desktop/shell/panelapplethandle.h b/plasma/shells/plasma-desktop/panelapplethandle.h similarity index 100% rename from plasma/desktop/shell/panelapplethandle.h rename to plasma/shells/plasma-desktop/panelapplethandle.h diff --git a/plasma/desktop/shell/panelappletoverlay.cpp b/plasma/shells/plasma-desktop/panelappletoverlay.cpp similarity index 100% rename from plasma/desktop/shell/panelappletoverlay.cpp rename to plasma/shells/plasma-desktop/panelappletoverlay.cpp diff --git a/plasma/desktop/shell/panelappletoverlay.h b/plasma/shells/plasma-desktop/panelappletoverlay.h similarity index 100% rename from plasma/desktop/shell/panelappletoverlay.h rename to plasma/shells/plasma-desktop/panelappletoverlay.h diff --git a/plasma/desktop/shell/panelcontroller.cpp b/plasma/shells/plasma-desktop/panelcontroller.cpp similarity index 100% rename from plasma/desktop/shell/panelcontroller.cpp rename to plasma/shells/plasma-desktop/panelcontroller.cpp diff --git a/plasma/desktop/shell/panelcontroller.h b/plasma/shells/plasma-desktop/panelcontroller.h similarity index 100% rename from plasma/desktop/shell/panelcontroller.h rename to plasma/shells/plasma-desktop/panelcontroller.h diff --git a/plasma/desktop/shell/panelview.cpp b/plasma/shells/plasma-desktop/panelview.cpp similarity index 100% rename from plasma/desktop/shell/panelview.cpp rename to plasma/shells/plasma-desktop/panelview.cpp diff --git a/plasma/desktop/shell/panelview.h b/plasma/shells/plasma-desktop/panelview.h similarity index 100% rename from plasma/desktop/shell/panelview.h rename to plasma/shells/plasma-desktop/panelview.h diff --git a/plasma/desktop/shell/plasmaapp.cpp b/plasma/shells/plasma-desktop/plasmaapp.cpp similarity index 100% rename from plasma/desktop/shell/plasmaapp.cpp rename to plasma/shells/plasma-desktop/plasmaapp.cpp diff --git a/plasma/desktop/shell/plasmaapp.h b/plasma/shells/plasma-desktop/plasmaapp.h similarity index 100% rename from plasma/desktop/shell/plasmaapp.h rename to plasma/shells/plasma-desktop/plasmaapp.h diff --git a/plasma/desktop/shell/positioningruler.cpp b/plasma/shells/plasma-desktop/positioningruler.cpp similarity index 100% rename from plasma/desktop/shell/positioningruler.cpp rename to plasma/shells/plasma-desktop/positioningruler.cpp diff --git a/plasma/desktop/shell/positioningruler.h b/plasma/shells/plasma-desktop/positioningruler.h similarity index 100% rename from plasma/desktop/shell/positioningruler.h rename to plasma/shells/plasma-desktop/positioningruler.h diff --git a/plasma/desktop/shell/scripting/desktopscriptengine.cpp b/plasma/shells/plasma-desktop/scripting/desktopscriptengine.cpp similarity index 100% rename from plasma/desktop/shell/scripting/desktopscriptengine.cpp rename to plasma/shells/plasma-desktop/scripting/desktopscriptengine.cpp diff --git a/plasma/desktop/shell/scripting/desktopscriptengine.h b/plasma/shells/plasma-desktop/scripting/desktopscriptengine.h similarity index 100% rename from plasma/desktop/shell/scripting/desktopscriptengine.h rename to plasma/shells/plasma-desktop/scripting/desktopscriptengine.h diff --git a/plasma/desktop/shell/scripting/panel.cpp b/plasma/shells/plasma-desktop/scripting/panel.cpp similarity index 100% rename from plasma/desktop/shell/scripting/panel.cpp rename to plasma/shells/plasma-desktop/scripting/panel.cpp diff --git a/plasma/desktop/shell/scripting/panel.h b/plasma/shells/plasma-desktop/scripting/panel.h similarity index 100% rename from plasma/desktop/shell/scripting/panel.h rename to plasma/shells/plasma-desktop/scripting/panel.h diff --git a/plasma/desktop/shell/supportinformation.cpp b/plasma/shells/plasma-desktop/supportinformation.cpp similarity index 100% rename from plasma/desktop/shell/supportinformation.cpp rename to plasma/shells/plasma-desktop/supportinformation.cpp diff --git a/plasma/desktop/shell/supportinformation.h b/plasma/shells/plasma-desktop/supportinformation.h similarity index 100% rename from plasma/desktop/shell/supportinformation.h rename to plasma/shells/plasma-desktop/supportinformation.h diff --git a/plasma/screensaver/shell/BackgroundDialog.ui b/plasma/shells/plasma-overlay/BackgroundDialog.ui similarity index 100% rename from plasma/screensaver/shell/BackgroundDialog.ui rename to plasma/shells/plasma-overlay/BackgroundDialog.ui diff --git a/plasma/screensaver/shell/CMakeLists.txt b/plasma/shells/plasma-overlay/CMakeLists.txt similarity index 100% rename from plasma/screensaver/shell/CMakeLists.txt rename to plasma/shells/plasma-overlay/CMakeLists.txt diff --git a/plasma/screensaver/shell/Messages.sh b/plasma/shells/plasma-overlay/Messages.sh similarity index 100% rename from plasma/screensaver/shell/Messages.sh rename to plasma/shells/plasma-overlay/Messages.sh diff --git a/plasma/screensaver/shell/backgrounddialog.cpp b/plasma/shells/plasma-overlay/backgrounddialog.cpp similarity index 100% rename from plasma/screensaver/shell/backgrounddialog.cpp rename to plasma/shells/plasma-overlay/backgrounddialog.cpp diff --git a/plasma/screensaver/shell/backgrounddialog.h b/plasma/shells/plasma-overlay/backgrounddialog.h similarity index 100% rename from plasma/screensaver/shell/backgrounddialog.h rename to plasma/shells/plasma-overlay/backgrounddialog.h diff --git a/plasma/screensaver/shell/main.cpp b/plasma/shells/plasma-overlay/main.cpp similarity index 100% rename from plasma/screensaver/shell/main.cpp rename to plasma/shells/plasma-overlay/main.cpp diff --git a/plasma/screensaver/shell/org.kde.plasma-overlay.App.xml b/plasma/shells/plasma-overlay/org.kde.plasma-overlay.App.xml similarity index 100% rename from plasma/screensaver/shell/org.kde.plasma-overlay.App.xml rename to plasma/shells/plasma-overlay/org.kde.plasma-overlay.App.xml diff --git a/plasma/screensaver/shell/plasma-overlayrc b/plasma/shells/plasma-overlay/plasma-overlayrc similarity index 100% rename from plasma/screensaver/shell/plasma-overlayrc rename to plasma/shells/plasma-overlay/plasma-overlayrc diff --git a/plasma/screensaver/shell/plasmaapp.cpp b/plasma/shells/plasma-overlay/plasmaapp.cpp similarity index 100% rename from plasma/screensaver/shell/plasmaapp.cpp rename to plasma/shells/plasma-overlay/plasmaapp.cpp diff --git a/plasma/screensaver/shell/plasmaapp.h b/plasma/shells/plasma-overlay/plasmaapp.h similarity index 100% rename from plasma/screensaver/shell/plasmaapp.h rename to plasma/shells/plasma-overlay/plasmaapp.h diff --git a/plasma/screensaver/shell/savercorona.cpp b/plasma/shells/plasma-overlay/savercorona.cpp similarity index 100% rename from plasma/screensaver/shell/savercorona.cpp rename to plasma/shells/plasma-overlay/savercorona.cpp diff --git a/plasma/screensaver/shell/savercorona.h b/plasma/shells/plasma-overlay/savercorona.h similarity index 100% rename from plasma/screensaver/shell/savercorona.h rename to plasma/shells/plasma-overlay/savercorona.h diff --git a/plasma/screensaver/shell/saverview.cpp b/plasma/shells/plasma-overlay/saverview.cpp similarity index 100% rename from plasma/screensaver/shell/saverview.cpp rename to plasma/shells/plasma-overlay/saverview.cpp diff --git a/plasma/screensaver/shell/saverview.h b/plasma/shells/plasma-overlay/saverview.h similarity index 100% rename from plasma/screensaver/shell/saverview.h rename to plasma/shells/plasma-overlay/saverview.h diff --git a/plasma/generic/shells/plasma-windowed/CMakeLists.txt b/plasma/shells/plasma-windowed/CMakeLists.txt similarity index 100% rename from plasma/generic/shells/plasma-windowed/CMakeLists.txt rename to plasma/shells/plasma-windowed/CMakeLists.txt diff --git a/plasma/generic/shells/plasma-windowed/Messages.sh b/plasma/shells/plasma-windowed/Messages.sh similarity index 100% rename from plasma/generic/shells/plasma-windowed/Messages.sh rename to plasma/shells/plasma-windowed/Messages.sh diff --git a/plasma/generic/shells/plasma-windowed/main.cpp b/plasma/shells/plasma-windowed/main.cpp similarity index 100% rename from plasma/generic/shells/plasma-windowed/main.cpp rename to plasma/shells/plasma-windowed/main.cpp diff --git a/plasma/generic/shells/plasma-windowed/plasmaapp.cpp b/plasma/shells/plasma-windowed/plasmaapp.cpp similarity index 100% rename from plasma/generic/shells/plasma-windowed/plasmaapp.cpp rename to plasma/shells/plasma-windowed/plasmaapp.cpp diff --git a/plasma/generic/shells/plasma-windowed/plasmaapp.h b/plasma/shells/plasma-windowed/plasmaapp.h similarity index 100% rename from plasma/generic/shells/plasma-windowed/plasmaapp.h rename to plasma/shells/plasma-windowed/plasmaapp.h diff --git a/plasma/generic/shells/plasma-windowed/singleview.cpp b/plasma/shells/plasma-windowed/singleview.cpp similarity index 100% rename from plasma/generic/shells/plasma-windowed/singleview.cpp rename to plasma/shells/plasma-windowed/singleview.cpp diff --git a/plasma/generic/shells/plasma-windowed/singleview.h b/plasma/shells/plasma-windowed/singleview.h similarity index 100% rename from plasma/generic/shells/plasma-windowed/singleview.h rename to plasma/shells/plasma-windowed/singleview.h diff --git a/plasma/desktop/toolboxes/CMakeLists.txt b/plasma/toolboxes/CMakeLists.txt similarity index 100% rename from plasma/desktop/toolboxes/CMakeLists.txt rename to plasma/toolboxes/CMakeLists.txt diff --git a/plasma/desktop/toolboxes/Messages.sh b/plasma/toolboxes/Messages.sh similarity index 100% rename from plasma/desktop/toolboxes/Messages.sh rename to plasma/toolboxes/Messages.sh diff --git a/plasma/desktop/toolboxes/desktoptoolbox.cpp b/plasma/toolboxes/desktoptoolbox.cpp similarity index 100% rename from plasma/desktop/toolboxes/desktoptoolbox.cpp rename to plasma/toolboxes/desktoptoolbox.cpp diff --git a/plasma/desktop/toolboxes/desktoptoolbox.h b/plasma/toolboxes/desktoptoolbox.h similarity index 100% rename from plasma/desktop/toolboxes/desktoptoolbox.h rename to plasma/toolboxes/desktoptoolbox.h diff --git a/plasma/desktop/toolboxes/internaltoolbox.cpp b/plasma/toolboxes/internaltoolbox.cpp similarity index 100% rename from plasma/desktop/toolboxes/internaltoolbox.cpp rename to plasma/toolboxes/internaltoolbox.cpp diff --git a/plasma/desktop/toolboxes/internaltoolbox.h b/plasma/toolboxes/internaltoolbox.h similarity index 100% rename from plasma/desktop/toolboxes/internaltoolbox.h rename to plasma/toolboxes/internaltoolbox.h diff --git a/plasma/desktop/toolboxes/paneltoolbox.cpp b/plasma/toolboxes/paneltoolbox.cpp similarity index 100% rename from plasma/desktop/toolboxes/paneltoolbox.cpp rename to plasma/toolboxes/paneltoolbox.cpp diff --git a/plasma/desktop/toolboxes/paneltoolbox.h b/plasma/toolboxes/paneltoolbox.h similarity index 100% rename from plasma/desktop/toolboxes/paneltoolbox.h rename to plasma/toolboxes/paneltoolbox.h diff --git a/plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop b/plasma/toolboxes/plasma-toolbox-desktoptoolbox.desktop similarity index 100% rename from plasma/desktop/toolboxes/plasma-toolbox-desktoptoolbox.desktop rename to plasma/toolboxes/plasma-toolbox-desktoptoolbox.desktop diff --git a/plasma/desktop/toolboxes/plasma-toolbox-paneltoolbox.desktop b/plasma/toolboxes/plasma-toolbox-paneltoolbox.desktop similarity index 100% rename from plasma/desktop/toolboxes/plasma-toolbox-paneltoolbox.desktop rename to plasma/toolboxes/plasma-toolbox-paneltoolbox.desktop diff --git a/plasma/generic/tools/CMakeLists.txt b/plasma/tools/CMakeLists.txt similarity index 100% rename from plasma/generic/tools/CMakeLists.txt rename to plasma/tools/CMakeLists.txt diff --git a/plasma/generic/tools/plasmapkg/CMakeLists.txt b/plasma/tools/plasmapkg/CMakeLists.txt similarity index 100% rename from plasma/generic/tools/plasmapkg/CMakeLists.txt rename to plasma/tools/plasmapkg/CMakeLists.txt diff --git a/plasma/generic/tools/plasmapkg/Messages.sh b/plasma/tools/plasmapkg/Messages.sh similarity index 100% rename from plasma/generic/tools/plasmapkg/Messages.sh rename to plasma/tools/plasmapkg/Messages.sh diff --git a/plasma/generic/tools/plasmapkg/main.cpp b/plasma/tools/plasmapkg/main.cpp similarity index 100% rename from plasma/generic/tools/plasmapkg/main.cpp rename to plasma/tools/plasmapkg/main.cpp diff --git a/plasma/generic/wallpapers/CMakeLists.txt b/plasma/wallpapers/CMakeLists.txt similarity index 100% rename from plasma/generic/wallpapers/CMakeLists.txt rename to plasma/wallpapers/CMakeLists.txt diff --git a/plasma/generic/wallpapers/color/CMakeLists.txt b/plasma/wallpapers/color/CMakeLists.txt similarity index 100% rename from plasma/generic/wallpapers/color/CMakeLists.txt rename to plasma/wallpapers/color/CMakeLists.txt diff --git a/plasma/generic/wallpapers/color/Messages.sh b/plasma/wallpapers/color/Messages.sh similarity index 100% rename from plasma/generic/wallpapers/color/Messages.sh rename to plasma/wallpapers/color/Messages.sh diff --git a/plasma/generic/wallpapers/color/backgrounddelegate.cpp b/plasma/wallpapers/color/backgrounddelegate.cpp similarity index 100% rename from plasma/generic/wallpapers/color/backgrounddelegate.cpp rename to plasma/wallpapers/color/backgrounddelegate.cpp diff --git a/plasma/generic/wallpapers/color/backgrounddelegate.h b/plasma/wallpapers/color/backgrounddelegate.h similarity index 100% rename from plasma/generic/wallpapers/color/backgrounddelegate.h rename to plasma/wallpapers/color/backgrounddelegate.h diff --git a/plasma/generic/wallpapers/color/backgroundlistmodel.cpp b/plasma/wallpapers/color/backgroundlistmodel.cpp similarity index 100% rename from plasma/generic/wallpapers/color/backgroundlistmodel.cpp rename to plasma/wallpapers/color/backgroundlistmodel.cpp diff --git a/plasma/generic/wallpapers/color/backgroundlistmodel.h b/plasma/wallpapers/color/backgroundlistmodel.h similarity index 100% rename from plasma/generic/wallpapers/color/backgroundlistmodel.h rename to plasma/wallpapers/color/backgroundlistmodel.h diff --git a/plasma/generic/wallpapers/color/color.cpp b/plasma/wallpapers/color/color.cpp similarity index 100% rename from plasma/generic/wallpapers/color/color.cpp rename to plasma/wallpapers/color/color.cpp diff --git a/plasma/generic/wallpapers/color/color.h b/plasma/wallpapers/color/color.h similarity index 100% rename from plasma/generic/wallpapers/color/color.h rename to plasma/wallpapers/color/color.h diff --git a/plasma/generic/wallpapers/color/config.ui b/plasma/wallpapers/color/config.ui similarity index 100% rename from plasma/generic/wallpapers/color/config.ui rename to plasma/wallpapers/color/config.ui diff --git a/plasma/generic/wallpapers/color/itemsview.cpp b/plasma/wallpapers/color/itemsview.cpp similarity index 100% rename from plasma/generic/wallpapers/color/itemsview.cpp rename to plasma/wallpapers/color/itemsview.cpp diff --git a/plasma/generic/wallpapers/color/itemsview.h b/plasma/wallpapers/color/itemsview.h similarity index 100% rename from plasma/generic/wallpapers/color/itemsview.h rename to plasma/wallpapers/color/itemsview.h diff --git a/plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop b/plasma/wallpapers/color/plasma-wallpaper-color.desktop similarity index 100% rename from plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop rename to plasma/wallpapers/color/plasma-wallpaper-color.desktop diff --git a/plasma/generic/wallpapers/data/Ariya/contents/images/1024x768.png b/plasma/wallpapers/data/Ariya/contents/images/1024x768.png similarity index 100% rename from plasma/generic/wallpapers/data/Ariya/contents/images/1024x768.png rename to plasma/wallpapers/data/Ariya/contents/images/1024x768.png diff --git a/plasma/generic/wallpapers/data/Ariya/contents/images/1280x720.png b/plasma/wallpapers/data/Ariya/contents/images/1280x720.png similarity index 100% rename from plasma/generic/wallpapers/data/Ariya/contents/images/1280x720.png rename to plasma/wallpapers/data/Ariya/contents/images/1280x720.png diff --git a/plasma/generic/wallpapers/data/Ariya/contents/images/1280x800.png b/plasma/wallpapers/data/Ariya/contents/images/1280x800.png similarity index 100% rename from plasma/generic/wallpapers/data/Ariya/contents/images/1280x800.png rename to plasma/wallpapers/data/Ariya/contents/images/1280x800.png diff --git a/plasma/generic/wallpapers/data/Ariya/contents/screenshot.png b/plasma/wallpapers/data/Ariya/contents/screenshot.png similarity index 100% rename from plasma/generic/wallpapers/data/Ariya/contents/screenshot.png rename to plasma/wallpapers/data/Ariya/contents/screenshot.png diff --git a/plasma/generic/wallpapers/data/Ariya/metadata.desktop b/plasma/wallpapers/data/Ariya/metadata.desktop similarity index 100% rename from plasma/generic/wallpapers/data/Ariya/metadata.desktop rename to plasma/wallpapers/data/Ariya/metadata.desktop diff --git a/plasma/generic/wallpapers/data/Auros/contents/images/1024x748.png b/plasma/wallpapers/data/Auros/contents/images/1024x748.png similarity index 100% rename from plasma/generic/wallpapers/data/Auros/contents/images/1024x748.png rename to plasma/wallpapers/data/Auros/contents/images/1024x748.png diff --git a/plasma/generic/wallpapers/data/Auros/contents/images/1280x720.png b/plasma/wallpapers/data/Auros/contents/images/1280x720.png similarity index 100% rename from plasma/generic/wallpapers/data/Auros/contents/images/1280x720.png rename to plasma/wallpapers/data/Auros/contents/images/1280x720.png diff --git a/plasma/generic/wallpapers/data/Auros/contents/images/1280x800.png b/plasma/wallpapers/data/Auros/contents/images/1280x800.png similarity index 100% rename from plasma/generic/wallpapers/data/Auros/contents/images/1280x800.png rename to plasma/wallpapers/data/Auros/contents/images/1280x800.png diff --git a/plasma/generic/wallpapers/data/Auros/contents/screenshot.png b/plasma/wallpapers/data/Auros/contents/screenshot.png similarity index 100% rename from plasma/generic/wallpapers/data/Auros/contents/screenshot.png rename to plasma/wallpapers/data/Auros/contents/screenshot.png diff --git a/plasma/generic/wallpapers/data/Auros/metadata.desktop b/plasma/wallpapers/data/Auros/metadata.desktop similarity index 100% rename from plasma/generic/wallpapers/data/Auros/metadata.desktop rename to plasma/wallpapers/data/Auros/metadata.desktop diff --git a/plasma/generic/wallpapers/data/CMakeLists.txt b/plasma/wallpapers/data/CMakeLists.txt similarity index 100% rename from plasma/generic/wallpapers/data/CMakeLists.txt rename to plasma/wallpapers/data/CMakeLists.txt diff --git a/plasma/generic/wallpapers/data/Elarun/contents/images/1024x768.png b/plasma/wallpapers/data/Elarun/contents/images/1024x768.png similarity index 100% rename from plasma/generic/wallpapers/data/Elarun/contents/images/1024x768.png rename to plasma/wallpapers/data/Elarun/contents/images/1024x768.png diff --git a/plasma/generic/wallpapers/data/Elarun/contents/images/1280x720.png b/plasma/wallpapers/data/Elarun/contents/images/1280x720.png similarity index 100% rename from plasma/generic/wallpapers/data/Elarun/contents/images/1280x720.png rename to plasma/wallpapers/data/Elarun/contents/images/1280x720.png diff --git a/plasma/generic/wallpapers/data/Elarun/contents/images/1280x800.png b/plasma/wallpapers/data/Elarun/contents/images/1280x800.png similarity index 100% rename from plasma/generic/wallpapers/data/Elarun/contents/images/1280x800.png rename to plasma/wallpapers/data/Elarun/contents/images/1280x800.png diff --git a/plasma/generic/wallpapers/data/Elarun/contents/screenshot.png b/plasma/wallpapers/data/Elarun/contents/screenshot.png similarity index 100% rename from plasma/generic/wallpapers/data/Elarun/contents/screenshot.png rename to plasma/wallpapers/data/Elarun/contents/screenshot.png diff --git a/plasma/generic/wallpapers/data/Elarun/metadata.desktop b/plasma/wallpapers/data/Elarun/metadata.desktop similarity index 100% rename from plasma/generic/wallpapers/data/Elarun/metadata.desktop rename to plasma/wallpapers/data/Elarun/metadata.desktop diff --git a/plasma/generic/wallpapers/data/LICENSE b/plasma/wallpapers/data/LICENSE similarity index 100% rename from plasma/generic/wallpapers/data/LICENSE rename to plasma/wallpapers/data/LICENSE diff --git a/plasma/generic/wallpapers/image/CMakeLists.txt b/plasma/wallpapers/image/CMakeLists.txt similarity index 100% rename from plasma/generic/wallpapers/image/CMakeLists.txt rename to plasma/wallpapers/image/CMakeLists.txt diff --git a/plasma/generic/wallpapers/image/Messages.sh b/plasma/wallpapers/image/Messages.sh similarity index 100% rename from plasma/generic/wallpapers/image/Messages.sh rename to plasma/wallpapers/image/Messages.sh diff --git a/plasma/generic/wallpapers/image/backgrounddelegate.cpp b/plasma/wallpapers/image/backgrounddelegate.cpp similarity index 100% rename from plasma/generic/wallpapers/image/backgrounddelegate.cpp rename to plasma/wallpapers/image/backgrounddelegate.cpp diff --git a/plasma/generic/wallpapers/image/backgrounddelegate.h b/plasma/wallpapers/image/backgrounddelegate.h similarity index 100% rename from plasma/generic/wallpapers/image/backgrounddelegate.h rename to plasma/wallpapers/image/backgrounddelegate.h diff --git a/plasma/generic/wallpapers/image/backgroundlistmodel.cpp b/plasma/wallpapers/image/backgroundlistmodel.cpp similarity index 100% rename from plasma/generic/wallpapers/image/backgroundlistmodel.cpp rename to plasma/wallpapers/image/backgroundlistmodel.cpp diff --git a/plasma/generic/wallpapers/image/backgroundlistmodel.h b/plasma/wallpapers/image/backgroundlistmodel.h similarity index 100% rename from plasma/generic/wallpapers/image/backgroundlistmodel.h rename to plasma/wallpapers/image/backgroundlistmodel.h diff --git a/plasma/generic/wallpapers/image/image.cpp b/plasma/wallpapers/image/image.cpp similarity index 100% rename from plasma/generic/wallpapers/image/image.cpp rename to plasma/wallpapers/image/image.cpp diff --git a/plasma/generic/wallpapers/image/image.h b/plasma/wallpapers/image/image.h similarity index 100% rename from plasma/generic/wallpapers/image/image.h rename to plasma/wallpapers/image/image.h diff --git a/plasma/generic/wallpapers/image/imageconfig.ui b/plasma/wallpapers/image/imageconfig.ui similarity index 100% rename from plasma/generic/wallpapers/image/imageconfig.ui rename to plasma/wallpapers/image/imageconfig.ui diff --git a/plasma/generic/wallpapers/image/itemsview.cpp b/plasma/wallpapers/image/itemsview.cpp similarity index 100% rename from plasma/generic/wallpapers/image/itemsview.cpp rename to plasma/wallpapers/image/itemsview.cpp diff --git a/plasma/generic/wallpapers/image/itemsview.h b/plasma/wallpapers/image/itemsview.h similarity index 100% rename from plasma/generic/wallpapers/image/itemsview.h rename to plasma/wallpapers/image/itemsview.h diff --git a/plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop b/plasma/wallpapers/image/plasma-wallpaper-image.desktop similarity index 100% rename from plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop rename to plasma/wallpapers/image/plasma-wallpaper-image.desktop diff --git a/plasma/generic/wallpapers/image/removebutton.cpp b/plasma/wallpapers/image/removebutton.cpp similarity index 100% rename from plasma/generic/wallpapers/image/removebutton.cpp rename to plasma/wallpapers/image/removebutton.cpp diff --git a/plasma/generic/wallpapers/image/removebutton.h b/plasma/wallpapers/image/removebutton.h similarity index 100% rename from plasma/generic/wallpapers/image/removebutton.h rename to plasma/wallpapers/image/removebutton.h diff --git a/plasma/generic/wallpapers/image/removebuttonmanager.cpp b/plasma/wallpapers/image/removebuttonmanager.cpp similarity index 100% rename from plasma/generic/wallpapers/image/removebuttonmanager.cpp rename to plasma/wallpapers/image/removebuttonmanager.cpp diff --git a/plasma/generic/wallpapers/image/removebuttonmanager.h b/plasma/wallpapers/image/removebuttonmanager.h similarity index 100% rename from plasma/generic/wallpapers/image/removebuttonmanager.h rename to plasma/wallpapers/image/removebuttonmanager.h diff --git a/plasma/generic/wallpapers/image/slideshowconfig.ui b/plasma/wallpapers/image/slideshowconfig.ui similarity index 100% rename from plasma/generic/wallpapers/image/slideshowconfig.ui rename to plasma/wallpapers/image/slideshowconfig.ui diff --git a/plasma/generic/wallpapers/image/wallpaper.knsrc b/plasma/wallpapers/image/wallpaper.knsrc similarity index 100% rename from plasma/generic/wallpapers/image/wallpaper.knsrc rename to plasma/wallpapers/image/wallpaper.knsrc