diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5097178..880eec2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,19 +44,6 @@ tde_setup_install_path( INCLUDE_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/include/$
 tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" )
 
 
-##### install headers ###########################
-
-install( FILES
-    tqdbuserror.h tqdbusmessage.h tqdbusconnection.h
-    tqdbusvariant.h tqdbusobject.h tqdbusproxy.h
-    tqdbusmacros.h tqdbusdata.h tqdbusdatalist.h
-    tqdbusdatamap.h tqdbusobjectpath.h tqdbusunixfd.h
-    tqdbusdataconverter.h
-  DESTINATION ${INCLUDE_INSTALL_DIR} )
-
-
-##### install other data ########################
-
 ##### write pkgconfig file ######################
 
 string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
@@ -68,8 +55,9 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dbus-1-tqt.pc DESTINATION ${PKGCONFIG
 
 ##### build setup ###############################
 
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
 set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
 
 add_definitions(
   -DDBUS_COMPILATION
@@ -77,57 +65,16 @@ add_definitions(
   ${TQT_CFLAGS_OTHER}
 )
 
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${TQT_INCLUDE_DIRS}
-  ${DBUS_INCLUDE_DIRS}
-)
-
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
-
-##### dbus-1-tqt (shared) #########################
+set( APIDOX_HTML_DIRECTORY "usr/share/doc/libdbus-1-tqt/HTML" )
+set( APIDOX_DIRECTORY "${CMAKE_BINARY_DIR}/${APIDOX_HTML_DIRECTORY}/en" )
 
-tde_add_library( dbus-1-tqt SHARED AUTOMOC
-  SOURCES ${dbus_tqt_MOCS}
-    tqdbusconnection.cpp tqdbuserror.cpp tqdbusintegrator.cpp
-    tqdbusmarshall.cpp tqdbusmessage.cpp tqdbusserver.cpp
-    tqdbusproxy.cpp tqdbusdata.cpp tqdbusdatalist.cpp
-    tqdbusobjectpath.cpp tqdbusunixfd.cpp
-    tqdbusdataconverter.cpp
-  VERSION 0.0.0
-  LINK ${TQT_LIBRARIES} ${DBUS_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}
-)
 
+##### source directories ########################
 
-##### dbusxml2qt3 (executable) ##################
+add_subdirectory( src )
 
-tde_add_executable( dbusxml2qt3
-  SOURCES
-    tools/dbusxml2qt3/classgen.cpp
-    tools/dbusxml2qt3/main.cpp
-    tools/dbusxml2qt3/methodgen.cpp
-  LINK ${TQT_LIBRARIES}
-  DESTINATION ${BIN_INSTALL_DIR}
-)
 
+##### write configure files #####################
 
-##### add apidox targets ############
-set( APIDOX_HTML_DIRECTORY "usr/share/doc/libdbus-1-tqt/HTML" )
-set( APIDOX_DIRECTORY "${CMAKE_BINARY_DIR}/${APIDOX_HTML_DIRECTORY}/en" )
 configure_file( ${CMAKE_SOURCE_DIR}/dbus-1-tqt.Doxyfile.in ${CMAKE_BINARY_DIR}/dbus-1-tqt.Doxyfile )
 
-add_custom_target( apidox
-  COMMAND test -d ${APIDOX_DIRECTORY} || mkdir -p ${APIDOX_DIRECTORY}
-  COMMAND doxygen ${CMAKE_BINARY_DIR}/dbus-1-tqt.Doxyfile
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  )
-
-add_custom_target( install-apidox
-	COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${APIDOX_HTML_DIRECTORY}"
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/"
-  )
diff --git a/dbus-1-tqt.Doxyfile.in b/dbus-1-tqt.Doxyfile.in
index bdb4455..396e8f2 100644
--- a/dbus-1-tqt.Doxyfile.in
+++ b/dbus-1-tqt.Doxyfile.in
@@ -582,7 +582,7 @@ WARN_LOGFILE           =
 #                         ./include \
 #                         ./scripts
 
-INPUT                  = ${CMAKE_SOURCE_DIR}
+INPUT                  = ${CMAKE_SOURCE_DIR}/src
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -651,7 +651,7 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = tools doc admin cmake obj-x86_64-linux-gnu dbus-apidocs debian
+EXCLUDE                = 
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix filesystem feature) are excluded
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..fa3fa5c
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,73 @@
+	#################################################
+#
+#  (C) 2010-2011 Serghei Amelian
+#  serghei (DOT) amelian (AT) gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${DBUS_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### install headers ###########################
+
+install( FILES
+    tqdbuserror.h tqdbusmessage.h tqdbusconnection.h
+    tqdbusvariant.h tqdbusobject.h tqdbusproxy.h
+    tqdbusmacros.h tqdbusdata.h tqdbusdatalist.h
+    tqdbusdatamap.h tqdbusobjectpath.h tqdbusunixfd.h
+    tqdbusdataconverter.h
+  DESTINATION ${INCLUDE_INSTALL_DIR} )
+
+
+##### dbus-1-tqt (shared) #########################
+
+tde_add_library( dbus-1-tqt SHARED AUTOMOC
+  SOURCES ${dbus_tqt_MOCS}
+    tqdbusconnection.cpp tqdbuserror.cpp tqdbusintegrator.cpp
+    tqdbusmarshall.cpp tqdbusmessage.cpp tqdbusserver.cpp
+    tqdbusproxy.cpp tqdbusdata.cpp tqdbusdatalist.cpp
+    tqdbusobjectpath.cpp tqdbusunixfd.cpp
+    tqdbusdataconverter.cpp
+  VERSION 0.0.0
+  LINK ${TQT_LIBRARIES} ${DBUS_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### dbusxml2qt3 (executable) ##################
+
+tde_add_executable( dbusxml2qt3
+  SOURCES
+    tools/dbusxml2qt3/classgen.cpp
+    tools/dbusxml2qt3/main.cpp
+    tools/dbusxml2qt3/methodgen.cpp
+  LINK ${TQT_LIBRARIES}
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### add apidox targets ############
+
+add_custom_target( apidox
+  COMMAND test -d ${APIDOX_DIRECTORY} || mkdir -p ${APIDOX_DIRECTORY}
+  COMMAND doxygen ${CMAKE_BINARY_DIR}/dbus-1-tqt.Doxyfile
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  )
+
+add_custom_target( install-apidox
+	COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${APIDOX_HTML_DIRECTORY}"
+  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/"
+  )
diff --git a/tools/dbusxml2qt3/LICENSE b/src/tools/dbusxml2qt3/LICENSE
similarity index 100%
rename from tools/dbusxml2qt3/LICENSE
rename to src/tools/dbusxml2qt3/LICENSE
diff --git a/tools/dbusxml2qt3/classgen.cpp b/src/tools/dbusxml2qt3/classgen.cpp
similarity index 100%
rename from tools/dbusxml2qt3/classgen.cpp
rename to src/tools/dbusxml2qt3/classgen.cpp
diff --git a/tools/dbusxml2qt3/classgen.h b/src/tools/dbusxml2qt3/classgen.h
similarity index 100%
rename from tools/dbusxml2qt3/classgen.h
rename to src/tools/dbusxml2qt3/classgen.h
diff --git a/tools/dbusxml2qt3/main.cpp b/src/tools/dbusxml2qt3/main.cpp
similarity index 100%
rename from tools/dbusxml2qt3/main.cpp
rename to src/tools/dbusxml2qt3/main.cpp
diff --git a/tools/dbusxml2qt3/methodgen.cpp b/src/tools/dbusxml2qt3/methodgen.cpp
similarity index 100%
rename from tools/dbusxml2qt3/methodgen.cpp
rename to src/tools/dbusxml2qt3/methodgen.cpp
diff --git a/tools/dbusxml2qt3/methodgen.h b/src/tools/dbusxml2qt3/methodgen.h
similarity index 100%
rename from tools/dbusxml2qt3/methodgen.h
rename to src/tools/dbusxml2qt3/methodgen.h
diff --git a/tqdbusatomic.h b/src/tqdbusatomic.h
similarity index 100%
rename from tqdbusatomic.h
rename to src/tqdbusatomic.h
diff --git a/tqdbusconnection.cpp b/src/tqdbusconnection.cpp
similarity index 100%
rename from tqdbusconnection.cpp
rename to src/tqdbusconnection.cpp
diff --git a/tqdbusconnection.h b/src/tqdbusconnection.h
similarity index 100%
rename from tqdbusconnection.h
rename to src/tqdbusconnection.h
diff --git a/tqdbusconnection_p.h b/src/tqdbusconnection_p.h
similarity index 100%
rename from tqdbusconnection_p.h
rename to src/tqdbusconnection_p.h
diff --git a/tqdbusdata.cpp b/src/tqdbusdata.cpp
similarity index 100%
rename from tqdbusdata.cpp
rename to src/tqdbusdata.cpp
diff --git a/tqdbusdata.h b/src/tqdbusdata.h
similarity index 100%
rename from tqdbusdata.h
rename to src/tqdbusdata.h
diff --git a/tqdbusdataconverter.cpp b/src/tqdbusdataconverter.cpp
similarity index 100%
rename from tqdbusdataconverter.cpp
rename to src/tqdbusdataconverter.cpp
diff --git a/tqdbusdataconverter.h b/src/tqdbusdataconverter.h
similarity index 100%
rename from tqdbusdataconverter.h
rename to src/tqdbusdataconverter.h
diff --git a/tqdbusdatalist.cpp b/src/tqdbusdatalist.cpp
similarity index 100%
rename from tqdbusdatalist.cpp
rename to src/tqdbusdatalist.cpp
diff --git a/tqdbusdatalist.h b/src/tqdbusdatalist.h
similarity index 100%
rename from tqdbusdatalist.h
rename to src/tqdbusdatalist.h
diff --git a/tqdbusdatamap.h b/src/tqdbusdatamap.h
similarity index 100%
rename from tqdbusdatamap.h
rename to src/tqdbusdatamap.h
diff --git a/tqdbuserror.cpp b/src/tqdbuserror.cpp
similarity index 100%
rename from tqdbuserror.cpp
rename to src/tqdbuserror.cpp
diff --git a/tqdbuserror.h b/src/tqdbuserror.h
similarity index 100%
rename from tqdbuserror.h
rename to src/tqdbuserror.h
diff --git a/tqdbusintegrator.cpp b/src/tqdbusintegrator.cpp
similarity index 100%
rename from tqdbusintegrator.cpp
rename to src/tqdbusintegrator.cpp
diff --git a/tqdbusmacros.h b/src/tqdbusmacros.h
similarity index 100%
rename from tqdbusmacros.h
rename to src/tqdbusmacros.h
diff --git a/tqdbusmarshall.cpp b/src/tqdbusmarshall.cpp
similarity index 100%
rename from tqdbusmarshall.cpp
rename to src/tqdbusmarshall.cpp
diff --git a/tqdbusmarshall.h b/src/tqdbusmarshall.h
similarity index 100%
rename from tqdbusmarshall.h
rename to src/tqdbusmarshall.h
diff --git a/tqdbusmessage.cpp b/src/tqdbusmessage.cpp
similarity index 100%
rename from tqdbusmessage.cpp
rename to src/tqdbusmessage.cpp
diff --git a/tqdbusmessage.h b/src/tqdbusmessage.h
similarity index 100%
rename from tqdbusmessage.h
rename to src/tqdbusmessage.h
diff --git a/tqdbusmessage_p.h b/src/tqdbusmessage_p.h
similarity index 100%
rename from tqdbusmessage_p.h
rename to src/tqdbusmessage_p.h
diff --git a/tqdbusobject.h b/src/tqdbusobject.h
similarity index 100%
rename from tqdbusobject.h
rename to src/tqdbusobject.h
diff --git a/tqdbusobjectpath.cpp b/src/tqdbusobjectpath.cpp
similarity index 100%
rename from tqdbusobjectpath.cpp
rename to src/tqdbusobjectpath.cpp
diff --git a/tqdbusobjectpath.h b/src/tqdbusobjectpath.h
similarity index 100%
rename from tqdbusobjectpath.h
rename to src/tqdbusobjectpath.h
diff --git a/tqdbusproxy.cpp b/src/tqdbusproxy.cpp
similarity index 100%
rename from tqdbusproxy.cpp
rename to src/tqdbusproxy.cpp
diff --git a/tqdbusproxy.h b/src/tqdbusproxy.h
similarity index 100%
rename from tqdbusproxy.h
rename to src/tqdbusproxy.h
diff --git a/tqdbusserver.cpp b/src/tqdbusserver.cpp
similarity index 100%
rename from tqdbusserver.cpp
rename to src/tqdbusserver.cpp
diff --git a/tqdbusserver.h b/src/tqdbusserver.h
similarity index 100%
rename from tqdbusserver.h
rename to src/tqdbusserver.h
diff --git a/tqdbusunixfd.cpp b/src/tqdbusunixfd.cpp
similarity index 100%
rename from tqdbusunixfd.cpp
rename to src/tqdbusunixfd.cpp
diff --git a/tqdbusunixfd.h b/src/tqdbusunixfd.h
similarity index 100%
rename from tqdbusunixfd.h
rename to src/tqdbusunixfd.h
diff --git a/tqdbusvariant.h b/src/tqdbusvariant.h
similarity index 100%
rename from tqdbusvariant.h
rename to src/tqdbusvariant.h