diff --git a/rfcmd/CMakeLists.txt b/rfcmd/CMakeLists.txt
index c9b2d9af..bed9007f 100644
--- a/rfcmd/CMakeLists.txt
+++ b/rfcmd/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 2.4)
+
 PROJECT(rfcmd)
 
 SET(rfcmd_SRCS
@@ -16,4 +18,4 @@ ADD_EXECUTABLE(rfcmd
   ${rfcmd_SRCS}
 )
 
-INSTALL(TARGETS rfcmd RUNTIME DESTINATION bin)
\ No newline at end of file
+INSTALL(TARGETS rfcmd RUNTIME DESTINATION bin)
diff --git a/telldus-core/CMakeLists.txt b/telldus-core/CMakeLists.txt
new file mode 100644
index 00000000..b8b15e37
--- /dev/null
+++ b/telldus-core/CMakeLists.txt
@@ -0,0 +1,7 @@
+PROJECT( telldus-core )
+
+CMAKE_MINIMUM_REQUIRED( VERSION 2.4.0 )
+
+ADD_SUBDIRECTORY(driver)
+ADD_SUBDIRECTORY(tdtool)
+
diff --git a/driver/CMakeLists.txt b/telldus-core/driver/CMakeLists.txt
similarity index 100%
rename from driver/CMakeLists.txt
rename to telldus-core/driver/CMakeLists.txt
diff --git a/driver/TellUsbD101.sln b/telldus-core/driver/TellUsbD101.sln
similarity index 100%
rename from driver/TellUsbD101.sln
rename to telldus-core/driver/TellUsbD101.sln
diff --git a/driver/TellUsbD101/CMakeLists.txt b/telldus-core/driver/TellUsbD101/CMakeLists.txt
similarity index 100%
rename from driver/TellUsbD101/CMakeLists.txt
rename to telldus-core/driver/TellUsbD101/CMakeLists.txt
diff --git a/driver/TellUsbD101/Device.cpp b/telldus-core/driver/TellUsbD101/Device.cpp
similarity index 100%
rename from driver/TellUsbD101/Device.cpp
rename to telldus-core/driver/TellUsbD101/Device.cpp
diff --git a/driver/TellUsbD101/Device.h b/telldus-core/driver/TellUsbD101/Device.h
similarity index 100%
rename from driver/TellUsbD101/Device.h
rename to telldus-core/driver/TellUsbD101/Device.h
diff --git a/driver/TellUsbD101/DeviceIkea.cpp b/telldus-core/driver/TellUsbD101/DeviceIkea.cpp
similarity index 100%
rename from driver/TellUsbD101/DeviceIkea.cpp
rename to telldus-core/driver/TellUsbD101/DeviceIkea.cpp
diff --git a/driver/TellUsbD101/DeviceIkea.h b/telldus-core/driver/TellUsbD101/DeviceIkea.h
similarity index 100%
rename from driver/TellUsbD101/DeviceIkea.h
rename to telldus-core/driver/TellUsbD101/DeviceIkea.h
diff --git a/driver/TellUsbD101/DeviceNexa.cpp b/telldus-core/driver/TellUsbD101/DeviceNexa.cpp
similarity index 100%
rename from driver/TellUsbD101/DeviceNexa.cpp
rename to telldus-core/driver/TellUsbD101/DeviceNexa.cpp
diff --git a/driver/TellUsbD101/DeviceNexa.h b/telldus-core/driver/TellUsbD101/DeviceNexa.h
similarity index 100%
rename from driver/TellUsbD101/DeviceNexa.h
rename to telldus-core/driver/TellUsbD101/DeviceNexa.h
diff --git a/driver/TellUsbD101/DeviceSartano.cpp b/telldus-core/driver/TellUsbD101/DeviceSartano.cpp
similarity index 100%
rename from driver/TellUsbD101/DeviceSartano.cpp
rename to telldus-core/driver/TellUsbD101/DeviceSartano.cpp
diff --git a/driver/TellUsbD101/DeviceSartano.h b/telldus-core/driver/TellUsbD101/DeviceSartano.h
similarity index 100%
rename from driver/TellUsbD101/DeviceSartano.h
rename to telldus-core/driver/TellUsbD101/DeviceSartano.h
diff --git a/driver/TellUsbD101/DeviceWaveman.cpp b/telldus-core/driver/TellUsbD101/DeviceWaveman.cpp
similarity index 100%
rename from driver/TellUsbD101/DeviceWaveman.cpp
rename to telldus-core/driver/TellUsbD101/DeviceWaveman.cpp
diff --git a/driver/TellUsbD101/DeviceWaveman.h b/telldus-core/driver/TellUsbD101/DeviceWaveman.h
similarity index 100%
rename from driver/TellUsbD101/DeviceWaveman.h
rename to telldus-core/driver/TellUsbD101/DeviceWaveman.h
diff --git a/driver/TellUsbD101/Resource.h b/telldus-core/driver/TellUsbD101/Resource.h
similarity index 100%
rename from driver/TellUsbD101/Resource.h
rename to telldus-core/driver/TellUsbD101/Resource.h
diff --git a/driver/TellUsbD101/TellUsbD101.cpp b/telldus-core/driver/TellUsbD101/TellUsbD101.cpp
similarity index 100%
rename from driver/TellUsbD101/TellUsbD101.cpp
rename to telldus-core/driver/TellUsbD101/TellUsbD101.cpp
diff --git a/driver/TellUsbD101/TellUsbD101.def b/telldus-core/driver/TellUsbD101/TellUsbD101.def
similarity index 100%
rename from driver/TellUsbD101/TellUsbD101.def
rename to telldus-core/driver/TellUsbD101/TellUsbD101.def
diff --git a/driver/TellUsbD101/TellUsbD101.h b/telldus-core/driver/TellUsbD101/TellUsbD101.h
similarity index 100%
rename from driver/TellUsbD101/TellUsbD101.h
rename to telldus-core/driver/TellUsbD101/TellUsbD101.h
diff --git a/driver/TellUsbD101/TellUsbD101.vcproj b/telldus-core/driver/TellUsbD101/TellUsbD101.vcproj
similarity index 100%
rename from driver/TellUsbD101/TellUsbD101.vcproj
rename to telldus-core/driver/TellUsbD101/TellUsbD101.vcproj
diff --git a/driver/TellUsbD101/linux/Device.cpp b/telldus-core/driver/TellUsbD101/linux/Device.cpp
similarity index 100%
rename from driver/TellUsbD101/linux/Device.cpp
rename to telldus-core/driver/TellUsbD101/linux/Device.cpp
diff --git a/driver/TellUsbD101/settings/TelldusSettings.cpp b/telldus-core/driver/TellUsbD101/settings/TelldusSettings.cpp
similarity index 100%
rename from driver/TellUsbD101/settings/TelldusSettings.cpp
rename to telldus-core/driver/TellUsbD101/settings/TelldusSettings.cpp
diff --git a/driver/TellUsbD101/settings/TelldusSettings.h b/telldus-core/driver/TellUsbD101/settings/TelldusSettings.h
similarity index 100%
rename from driver/TellUsbD101/settings/TelldusSettings.h
rename to telldus-core/driver/TellUsbD101/settings/TelldusSettings.h
diff --git a/driver/TellUsbD101/settings/TelldusSettingsConfuse.cpp b/telldus-core/driver/TellUsbD101/settings/TelldusSettingsConfuse.cpp
similarity index 100%
rename from driver/TellUsbD101/settings/TelldusSettingsConfuse.cpp
rename to telldus-core/driver/TellUsbD101/settings/TelldusSettingsConfuse.cpp
diff --git a/driver/TellUsbD101/settings/TelldusSettingsWinRegistry.cpp b/telldus-core/driver/TellUsbD101/settings/TelldusSettingsWinRegistry.cpp
similarity index 100%
rename from driver/TellUsbD101/settings/TelldusSettingsWinRegistry.cpp
rename to telldus-core/driver/TellUsbD101/settings/TelldusSettingsWinRegistry.cpp
diff --git a/driver/TellUsbD101/stdafx.cpp b/telldus-core/driver/TellUsbD101/stdafx.cpp
similarity index 100%
rename from driver/TellUsbD101/stdafx.cpp
rename to telldus-core/driver/TellUsbD101/stdafx.cpp
diff --git a/driver/TellUsbD101/stdafx.h b/telldus-core/driver/TellUsbD101/stdafx.h
similarity index 100%
rename from driver/TellUsbD101/stdafx.h
rename to telldus-core/driver/TellUsbD101/stdafx.h
diff --git a/driver/TellUsbD101/win/Device.cpp b/telldus-core/driver/TellUsbD101/win/Device.cpp
similarity index 100%
rename from driver/TellUsbD101/win/Device.cpp
rename to telldus-core/driver/TellUsbD101/win/Device.cpp
diff --git a/driver/TellUsbD101/win/FTD2XX.H b/telldus-core/driver/TellUsbD101/win/FTD2XX.H
similarity index 100%
rename from driver/TellUsbD101/win/FTD2XX.H
rename to telldus-core/driver/TellUsbD101/win/FTD2XX.H
diff --git a/tdtool/CMakeLists.txt b/telldus-core/tdtool/CMakeLists.txt
similarity index 100%
rename from tdtool/CMakeLists.txt
rename to telldus-core/tdtool/CMakeLists.txt
diff --git a/tdtool/main.cpp b/telldus-core/tdtool/main.cpp
similarity index 100%
rename from tdtool/main.cpp
rename to telldus-core/tdtool/main.cpp