diff --git a/desktop/kde/kde5-base/kde5-baseapps/actions.py b/desktop/kde/kde5-base/kde5-baseapps/actions.py
deleted file mode 100755
index 2d59cef51c..0000000000
--- a/desktop/kde/kde5-base/kde5-baseapps/actions.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-#
-# Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
-
-from pisi.actionsapi import pisitools
-from pisi.actionsapi import cmaketools
-from pisi.actionsapi import shelltools
-from pisi.actionsapi import get
-
-def setup():
-     #pisitools.ldflags.add("-Wl,-rpath")
-    
-    #shelltools.system("sed -i -e 's|add_subdirectory(dolphin)|#add_subdirectory(dolphin)|' CMakeLists.txt")
-    cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \
-                          -DKDE4_BUILD_TESTS=OFF \
-                          -DCMAKE_SKIP_RPATH=ON \
-                          -DCMAKE_INSTALL_PREFIX=/usr")
-
-def build():
-    cmaketools.make()
-
-def install():
-    cmaketools.install()
-    
-    pisitools.dodoc("README", "COPYING.LIB")
diff --git a/desktop/kde/kde5-base/kde5-baseapps/pspec.xml b/desktop/kde/kde5-base/kde5-baseapps/pspec.xml
deleted file mode 100755
index d7a924e448..0000000000
--- a/desktop/kde/kde5-base/kde5-baseapps/pspec.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
-<PISI>
-    <Source>
-        <Name>kde5-kdebaseapps</Name>
-        <Homepage>http://www.kde.org</Homepage>
-        <Packager>
-            <Name>Pisi Linux Admins</Name>
-            <Email>admin@pisilinux.org</Email>
-        </Packager>
-        <License>LGPLv2</License>
-        <IsA>library</IsA>
-        <Summary>KDE-Baseapps: base applications from the official KDE release</Summary>
-        <Description>Base application for KDE5 such as Dolphin, kfind, plasma-widget-folderview, konqueror etc.</Description>
-        <Archive sha1sum="ec076c97bee93d50fd85ca8c85d6bdd218869607" type="tarxz">http://download.kde.org/stable/applications/15.04.2/src/kde-baseapps-15.04.2.tar.xz</Archive>
-        <BuildDependencies>
-        <Dependency>kdelibs-devel</Dependency>
-        <Dependency>kfilemetadata-devel</Dependency>	    
-	    <Dependency>automoc4</Dependency>
-	    <Dependency>tidy-devel</Dependency>
-        <Dependency>baloo-widgets-devel</Dependency>
-        <Dependency>baloo-devel</Dependency>
-        <Dependency>phonon-devel</Dependency>
-        <Dependency>kactivities-devel</Dependency>
-        <Dependency>libXrender-devel</Dependency>
-        <Dependency>libXt-devel</Dependency>
-        <Dependency>libraw1394-devel</Dependency>
-        <Dependency>shared-desktop-ontologies</Dependency>
-        <Dependency>kdepimlibs-devel</Dependency>
-        <Dependency>mesa-devel</Dependency>        
-	    </BuildDependencies>
-    </Source>
-
-    <Package>
-        <Name>kde5-kdebaseapps</Name>
-        <RuntimeDependencies>
-        <Dependency>kfilemetadata</Dependency>
-        <Dependency>libXt</Dependency>
-        <Dependency>libXrender</Dependency>
-        <Dependency>phonon</Dependency>
-        <Dependency>qt</Dependency>
-        <Dependency>libXt</Dependency>
-        <Dependency>tidy</Dependency>
-        <Dependency>baloo-widgets</Dependency>
-        <Dependency>baloo</Dependency>	    
-	    <Dependency>kdelibs</Dependency>
-	    <Dependency>kactivities</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="data">/usr/bin</Path>
-            <Path fileType="data">/usr/share</Path>
-        <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="library">/usr/lib</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
-        </Files>
-    </Package>
-    
-    <Package>
-        <Name>kde5-kdebaseapps-devel</Name>
-	<Summary>Development files for kde5-kdebaseapps</Summary>
-        <RuntimeDependencies>	    
-            <Dependency release="current">kde5-kdebaseapps</Dependency>	    
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="header">/usr/include</Path>
-            <Path fileType="data">/usr/lib/cmake</Path>
-        </Files>
-    </Package>
-
-    <History>
-        <Update release="2">
-            <Date>2015-06-03</Date>
-            <Version>15.04.2</Version>
-            <Comment>Version bump.</Comment>
-            <Name>Stefan Gronewold(groni)</Name>
-            <Email>groni@pisilinux.org</Email>
-        </Update>        
-    </History>
-</PISI>
diff --git a/desktop/kde/plasma/component.xml b/desktop/kde/plasma/component.xml
new file mode 100644
index 0000000000..33bdc24962
--- /dev/null
+++ b/desktop/kde/plasma/component.xml
@@ -0,0 +1,3 @@
+<PISI>
+    <Name>desktop.kde.plasma</Name>
+</PISI>
diff --git a/desktop/kde/porting-aids/component.xml b/desktop/kde/porting-aids/component.xml
new file mode 100644
index 0000000000..9791372ab0
--- /dev/null
+++ b/desktop/kde/porting-aids/component.xml
@@ -0,0 +1,3 @@
+<PISI>
+    <Name>desktop.kde.porting-aids</Name>
+</PISI>