diff --git a/kde/plasma/CMakeLists.txt b/kde/plasma/CMakeLists.txt
index a671e1337faf25196de17f2aa45689c860d7090a..f1eba1ab0f0017cc2c809b71822b40bf461bce54 100644
--- a/kde/plasma/CMakeLists.txt
+++ b/kde/plasma/CMakeLists.txt
@@ -1,4 +1,3 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-add_subdirectory(dataengine)
 add_subdirectory(plasmoid)
diff --git a/kde/src/klib/CMakeLists.txt b/kde/src/klib/CMakeLists.txt
index e476e0f444985b845faccbf90cfc25706d5d56f0..84e63ee843222be901bec721d2430346e7088a8a 100644
--- a/kde/src/klib/CMakeLists.txt
+++ b/kde/src/klib/CMakeLists.txt
@@ -11,6 +11,8 @@ PROJECT(ksflphone)
 
 SET ( KDE4_KABC_LIBS  -lkabc )
 
+add_subdirectory(dataengine)
+
 SET(LOCAL_CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
 SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
 
diff --git a/kde/plasma/dataengine/CMakeLists.txt b/kde/src/klib/dataengine/CMakeLists.txt
similarity index 100%
rename from kde/plasma/dataengine/CMakeLists.txt
rename to kde/src/klib/dataengine/CMakeLists.txt
diff --git a/kde/plasma/dataengine/plasma-engine-sflphone.desktop b/kde/src/klib/dataengine/plasma-engine-sflphone.desktop
similarity index 100%
rename from kde/plasma/dataengine/plasma-engine-sflphone.desktop
rename to kde/src/klib/dataengine/plasma-engine-sflphone.desktop
diff --git a/kde/plasma/dataengine/plasma-engine-testtime.desktop b/kde/src/klib/dataengine/plasma-engine-testtime.desktop
similarity index 100%
rename from kde/plasma/dataengine/plasma-engine-testtime.desktop
rename to kde/src/klib/dataengine/plasma-engine-testtime.desktop
diff --git a/kde/plasma/dataengine/sflphonEngine.cpp b/kde/src/klib/dataengine/sflphonEngine.cpp
similarity index 93%
rename from kde/plasma/dataengine/sflphonEngine.cpp
rename to kde/src/klib/dataengine/sflphonEngine.cpp
index a335f0fb6ed39e201f3a873bd1711d4b608c4b02..4837ef82d05c14230a705cdb1a32f66b825322a1 100644
--- a/kde/plasma/dataengine/sflphonEngine.cpp
+++ b/kde/src/klib/dataengine/sflphonEngine.cpp
@@ -2,14 +2,14 @@
 
 #include <Plasma/DataContainer>
 
-#include "../../src/lib/Call.h"
-#include "../../src/lib/Account.h"
-#include "../../src/lib/AccountList.h"
-#include "../../src/lib/dbus/metatypes.h"
-#include "../../src/lib/instance_interface_singleton.h"
-#include "../../src/lib/configurationmanager_interface_singleton.h"
-#include "../../src/lib/callmanager_interface_singleton.h"
-#include "../../src/lib/sflphone_const.h"
+#include "../../lib/Call.h"
+#include "../../lib/Account.h"
+#include "../../lib/AccountList.h"
+#include "../../lib/dbus/metatypes.h"
+#include "../../lib/instance_interface_singleton.h"
+#include "../../lib/configurationmanager_interface_singleton.h"
+#include "../../lib/callmanager_interface_singleton.h"
+#include "../../lib/sflphone_const.h"
 #include "sflphoneService.h"
 
 CallModel<>* SFLPhoneEngine::m_pModel = NULL;
diff --git a/kde/plasma/dataengine/sflphonEngine.h b/kde/src/klib/dataengine/sflphonEngine.h
similarity index 98%
rename from kde/plasma/dataengine/sflphonEngine.h
rename to kde/src/klib/dataengine/sflphonEngine.h
index cc3e764324c7399a30f9ae4eb53282358eb19907..3ef48b5ffbd1236277437a362186a742051fa71e 100644
--- a/kde/plasma/dataengine/sflphonEngine.h
+++ b/kde/src/klib/dataengine/sflphonEngine.h
@@ -25,7 +25,7 @@
 #include <Plasma/Service>
 #include <QHash>
 
-#include "../../src/lib/CallModel.h"
+#include "../../lib/CallModel.h"
 
 typedef QHash<QString,QVariant> HashStringString;
 class Call;
diff --git a/kde/plasma/dataengine/sflphone.operations b/kde/src/klib/dataengine/sflphone.operations
similarity index 100%
rename from kde/plasma/dataengine/sflphone.operations
rename to kde/src/klib/dataengine/sflphone.operations
diff --git a/kde/plasma/dataengine/sflphoneService.cpp b/kde/src/klib/dataengine/sflphoneService.cpp
similarity index 94%
rename from kde/plasma/dataengine/sflphoneService.cpp
rename to kde/src/klib/dataengine/sflphoneService.cpp
index 6e3e1d3a15983f4c9a3c0c579007796aded224cb..3f37f36ccaa6bf3ee6c29d9a39de3d6449a2b36a 100644
--- a/kde/plasma/dataengine/sflphoneService.cpp
+++ b/kde/src/klib/dataengine/sflphoneService.cpp
@@ -1,6 +1,6 @@
 #include "sflphoneService.h"
 
-#include "../../src/lib/Call.h"
+#include "../../lib/Call.h"
 
 SFLPhoneService::SFLPhoneService(SFLPhoneEngine *engine)
 
diff --git a/kde/plasma/dataengine/sflphoneService.h b/kde/src/klib/dataengine/sflphoneService.h
similarity index 94%
rename from kde/plasma/dataengine/sflphoneService.h
rename to kde/src/klib/dataengine/sflphoneService.h
index 11b87d1bb0372a7674ac447545d7167e531e2282..a71dfa675aa7c90a11d267248ca9b663eeaf3f61 100644
--- a/kde/plasma/dataengine/sflphoneService.h
+++ b/kde/src/klib/dataengine/sflphoneService.h
@@ -6,8 +6,8 @@
 #include <Plasma/Service>
 #include <Plasma/ServiceJob>
 
-#include "../../src/lib/Call.h"
-#include "../../src/lib/CallModel.h"
+#include "../../lib/Call.h"
+#include "../../lib/CallModel.h"
 
 using namespace Plasma;