diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8d1dc07a..c43011abc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,11 +167,5 @@ endmacro()
 ################# list the subdirectories #################
 add_subdirectory(src)
 add_subdirectory( desktoptheme )
-# add_subdirectory( plasma )
-# add_subdirectory( declarativeimports )
-# add_subdirectory( scriptengines )
-# add_subdirectory( shell )
-#FIXME: port tools
-add_subdirectory( tools )
 
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4496da9a5..9e87656a5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(plasma)
 add_subdirectory(declarativeimports)
 #add_subdirectory(kpart)
+add_subdirectory(plasmapkg)
 add_subdirectory(scriptengines)
 add_subdirectory(shell)
diff --git a/tools/plasmapkg/CMakeLists.txt b/src/plasmapkg/CMakeLists.txt
similarity index 100%
rename from tools/plasmapkg/CMakeLists.txt
rename to src/plasmapkg/CMakeLists.txt
diff --git a/tools/plasmapkg/Messages.sh b/src/plasmapkg/Messages.sh
similarity index 100%
rename from tools/plasmapkg/Messages.sh
rename to src/plasmapkg/Messages.sh
diff --git a/tools/plasmapkg/main.cpp b/src/plasmapkg/main.cpp
similarity index 100%
rename from tools/plasmapkg/main.cpp
rename to src/plasmapkg/main.cpp
diff --git a/tools/plasmapkg/plasmapkg.cpp b/src/plasmapkg/plasmapkg.cpp
similarity index 100%
rename from tools/plasmapkg/plasmapkg.cpp
rename to src/plasmapkg/plasmapkg.cpp
diff --git a/tools/plasmapkg/plasmapkg.h b/src/plasmapkg/plasmapkg.h
similarity index 100%
rename from tools/plasmapkg/plasmapkg.h
rename to src/plasmapkg/plasmapkg.h
diff --git a/tools/plasmapkg/plasmoids.knsrc b/src/plasmapkg/plasmoids.knsrc
similarity index 100%
rename from tools/plasmapkg/plasmoids.knsrc
rename to src/plasmapkg/plasmoids.knsrc
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
deleted file mode 100644
index 575dea7b8..000000000
--- a/tools/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(plasmapkg)