diff --git a/cd_utils/clean.bat b/cd_utils/clean.bat
deleted file mode 100644
index 3a657d9..0000000
--- a/cd_utils/clean.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-#make clean
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *.user* *~ *cxx moc_* ui_* qrc_* *.o *.exe *.a *.dll *.lib core *.qrc.depends
diff --git a/cd_utils/make_lib.bat b/cd_utils/make_lib.bat
deleted file mode 100644
index 0148a43..0000000
--- a/cd_utils/make_lib.bat
+++ /dev/null
@@ -1 +0,0 @@
-cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt
index 1450229..075bc89 100644
--- a/piqt/CMakeLists.txt
+++ b/piqt/CMakeLists.txt
@@ -11,8 +11,10 @@ if(NOT LIBPROJECT)
 endif()
 find_package(QAD REQUIRED)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
+qt_project(${PROJECT_NAME} H CPP)
+add_library(${PROJECT_NAME} SHARED ${H} ${CPP})
 set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY})
-qt_project(${PROJECT_NAME} "LIB" "${LIBS}" H CPP)
+target_link_libraries(${PROJECT_NAME} ${LIBS})
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIBPROJECT)
 	include(SDKMacros)
diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt
index 92b6bd2..e1c9e52 100644
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -4,93 +4,61 @@ if(LIBPROJECT)
 	include(PIPMacros)
 	include(SDKMacros)
 else()
+	find_package(PIP REQUIRED)
 	option(LIB "System install" 0)
 	option(DEBUG "Build with -g3" 0)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
 	if(DEBUG)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	endif()
-	find_package(PIP REQUIRED)
 endif()
-find_package(Qt4 REQUIRED)
 find_package(QAD REQUIRED)
-message(STATUS "Building ${PROJECT_NAME}")
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} ${PIP_INCLUDES} ${QAD_INCLUDES})
+include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
+qt_project(${PROJECT_NAME} H CPP)
 pip_code_model(CCM "../pip/src_main/io/piiodevice.h" "../pip/src_main/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
-set(LIBS ${QAD_WIDGETS_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_BLOCKVIEW_LIBRARY} ${PIP_LIBRARY})
-#message(STATUS "pip_code_model for iodevice = ${CCM}")
-#message(STATUS "pip_INCLUDES = ${PIP_INCLUDES}")
-file(GLOB CPPS_UTILS "piqt_*.cpp")
-file(GLOB HDRS_UTILS "piqt_*.h")
-file(GLOB UIS_UTILS "piqt_*.ui")
-qt4_wrap_ui(CUIS_UTILS ${UIS_UTILS})
-qt4_wrap_cpp(CMOCS_UTILS ${HDRS_UTILS} OPTIONS -nw)
 if(DEFINED ENV{QNX_HOST})
-	add_library(${PROJECT_NAME} STATIC ${HDRS_UTILS} ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM})
+	add_library(${PROJECT_NAME} STATIC ${H} ${CPP} ${CCM})
 else()
-	add_library(${PROJECT_NAME} SHARED ${HDRS_UTILS} ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM})
+	add_library(${PROJECT_NAME} SHARED ${H} ${CPP} ${CCM})
 endif()
+set(LIBS ${QAD_WIDGETS_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_BLOCKVIEW_LIBRARY} ${PIP_LIBRARY})
 target_link_libraries(${PROJECT_NAME} ${LIBS})
+message(STATUS "Building ${PROJECT_NAME}")
 
 if (LIBPROJECT)
 	add_dependencies(piqt_utils pip_cmg)
 endif()
 
 if (NOT DEFINED ENV{QNX_HOST})
-	file(GLOB RES "*.qrc")
-	qt4_add_resources(RESS ${RES})
-	
-	set(PIDUMPER_CPPS "pidumper.cpp" "pidumper_main.cpp")
-	set(PIDUMPER_MOCS "pidumper.h")
-	set(PIDUMPER_UIS "pidumper.ui")
-	qt4_wrap_cpp(PIDUMPER_CMOCS ${PIDUMPER_MOCS} OPTIONS -nw)
-	qt4_wrap_ui(PIDUMPER_CUIS ${PIDUMPER_UIS})
-	add_executable(pidumper ${PIDUMPER_CPPS} ${PIDUMPER_CMOCS} ${PIDUMPER_CUIS} ${RESS})
-	target_link_libraries(pidumper ${LIBS} ${PROJECT_NAME})
-
-	set(PIINTROSPECTOR_CPPS "piintrospector.cpp" "piintrospector_main.cpp")
-	set(PIINTROSPECTOR_MOCS "piintrospector.h")
-	set(PIINTROSPECTOR_UIS "piintrospector.ui")
-	qt4_wrap_cpp(PIINTROSPECTOR_CMOCS ${PIINTROSPECTOR_MOCS} OPTIONS -nw)
-	qt4_wrap_ui(PIINTROSPECTOR_CUIS ${PIINTROSPECTOR_UIS})
-	add_executable(piintrospector ${PIINTROSPECTOR_CPPS} ${PIINTROSPECTOR_CMOCS} ${PIINTROSPECTOR_CUIS} ${RESS})
-	target_link_libraries(piintrospector ${LIBS} ${PROJECT_NAME})
-
-	add_executable(piconnectionedit "piconnedit_main.cpp" ${RESS})
-	target_link_libraries(piconnectionedit ${LIBS} ${PROJECT_NAME})
-endif()
-
-if (NOT DEFINED ENV{QNX_HOST})
-	set(_TARGETS pidumper piconnectionedit)
+	add_subdirectory(piconnedit)
+	add_subdirectory(pidumper)
+	add_subdirectory(piintrospector)
 endif()
 
 if (LIBPROJECT)
-	sdk_install("pip" "${PROJECT_NAME}" "${HDRS_UTILS}")
+	sdk_install("pip" "${PROJECT_NAME}" "${H}")
 else()
 	if(LIB)
 		if(WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-			install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE}/pip)
+			install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip)
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-			install(TARGETS ${_TARGETS} DESTINATION ${MINGW_BIN})
 			get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
-				install(TARGETS ${_TARGETS} DESTINATION /usr/local/bin)
 			else()
 				set(CMAKE_INSTALL_PREFIX /usr)
 				install(TARGETS ${_TARGETS} DESTINATION /usr/bin)
 			endif()
-			install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
+			install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
 		message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
 		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-		install(TARGETS ${_TARGETS} DESTINATION bin)
 		message(STATUS "Install to local \"bin\"")
 	endif()
 endif()
diff --git a/piqt_utils/clean b/piqt_utils/clean
deleted file mode 100644
index 8701c3a..0000000
--- a/piqt_utils/clean
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/bash
-VERBOSE=1 make clean
-rm -vf ./lib/*
-#for i in $( ls -1 ); do
-#	if [ "`ls -1 --file-type | grep $i | grep -o /`" = "/" ]; then
-#		cd $i
-#		rm -rvf ./CMakeFiles
-#		rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~
-#		cd ../
-#	fi
-#done
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./ui_*.h ./core
-#cd ./include
-#for i in $( ls -1 ); do
-#	if [ "`ls -1 --file-type $i | grep -v @`" = "" ]; then
-#		rm -v $i
-#	fi
-#done
diff --git a/piqt_utils/clean.bat b/piqt_utils/clean.bat
deleted file mode 100644
index f4b0eb0..0000000
--- a/piqt_utils/clean.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-#make clean
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *.user* *~ *cxx moc_* ui_* qrc_* *.o *.exe *.a *.dll *.lib core *.bak
diff --git a/piqt_utils/icons/Apps-accessories-calculator-icon.png b/piqt_utils/icons/Apps-accessories-calculator-icon.png
deleted file mode 100644
index 37a3035..0000000
Binary files a/piqt_utils/icons/Apps-accessories-calculator-icon.png and /dev/null differ
diff --git a/piqt_utils/icons/DALI-designer.png b/piqt_utils/icons/DALI-designer.png
deleted file mode 100644
index 23b1946..0000000
Binary files a/piqt_utils/icons/DALI-designer.png and /dev/null differ
diff --git a/piqt_utils/icons/alpha.png b/piqt_utils/icons/alpha.png
deleted file mode 100644
index 5435669..0000000
Binary files a/piqt_utils/icons/alpha.png and /dev/null differ
diff --git a/piqt_utils/icons/application-exit.png b/piqt_utils/icons/application-exit.png
deleted file mode 100644
index ed5f8b2..0000000
Binary files a/piqt_utils/icons/application-exit.png and /dev/null differ
diff --git a/piqt_utils/icons/applications-engineering.png b/piqt_utils/icons/applications-engineering.png
deleted file mode 100644
index 4721d8d..0000000
Binary files a/piqt_utils/icons/applications-engineering.png and /dev/null differ
diff --git a/piqt_utils/icons/archive-extract.png b/piqt_utils/icons/archive-extract.png
deleted file mode 100644
index aa7b1fa..0000000
Binary files a/piqt_utils/icons/archive-extract.png and /dev/null differ
diff --git a/piqt_utils/icons/archive-insert-directory.png b/piqt_utils/icons/archive-insert-directory.png
deleted file mode 100644
index 0672205..0000000
Binary files a/piqt_utils/icons/archive-insert-directory.png and /dev/null differ
diff --git a/piqt_utils/icons/archive-insert.png b/piqt_utils/icons/archive-insert.png
deleted file mode 100644
index 193c25c..0000000
Binary files a/piqt_utils/icons/archive-insert.png and /dev/null differ
diff --git a/piqt_utils/icons/arrow-down.png b/piqt_utils/icons/arrow-down.png
deleted file mode 100644
index 03f2014..0000000
Binary files a/piqt_utils/icons/arrow-down.png and /dev/null differ
diff --git a/piqt_utils/icons/arrow-up.png b/piqt_utils/icons/arrow-up.png
deleted file mode 100644
index 5e42321..0000000
Binary files a/piqt_utils/icons/arrow-up.png and /dev/null differ
diff --git a/piqt_utils/icons/axis_x.png b/piqt_utils/icons/axis_x.png
deleted file mode 100644
index 321899c..0000000
Binary files a/piqt_utils/icons/axis_x.png and /dev/null differ
diff --git a/piqt_utils/icons/axis_y.png b/piqt_utils/icons/axis_y.png
deleted file mode 100644
index 7d4d9ec..0000000
Binary files a/piqt_utils/icons/axis_y.png and /dev/null differ
diff --git a/piqt_utils/icons/case-sensitive.png b/piqt_utils/icons/case-sensitive.png
deleted file mode 100644
index 39c5c5a..0000000
Binary files a/piqt_utils/icons/case-sensitive.png and /dev/null differ
diff --git a/piqt_utils/icons/checkbox-unchecked.png b/piqt_utils/icons/checkbox-unchecked.png
deleted file mode 100644
index 01a7307..0000000
Binary files a/piqt_utils/icons/checkbox-unchecked.png and /dev/null differ
diff --git a/piqt_utils/icons/checkbox.png b/piqt_utils/icons/checkbox.png
deleted file mode 100644
index 1c311e2..0000000
Binary files a/piqt_utils/icons/checkbox.png and /dev/null differ
diff --git a/piqt_utils/icons/clients.png b/piqt_utils/icons/clients.png
deleted file mode 100644
index 0ae949a..0000000
Binary files a/piqt_utils/icons/clients.png and /dev/null differ
diff --git a/piqt_utils/icons/close.png b/piqt_utils/icons/close.png
deleted file mode 100644
index 5492295..0000000
Binary files a/piqt_utils/icons/close.png and /dev/null differ
diff --git a/piqt_utils/icons/code-error.png b/piqt_utils/icons/code-error.png
deleted file mode 100644
index 5b4c488..0000000
Binary files a/piqt_utils/icons/code-error.png and /dev/null differ
diff --git a/piqt_utils/icons/code-function.png b/piqt_utils/icons/code-function.png
deleted file mode 100644
index e5cea37..0000000
Binary files a/piqt_utils/icons/code-function.png and /dev/null differ
diff --git a/piqt_utils/icons/code-keyword.png b/piqt_utils/icons/code-keyword.png
deleted file mode 100644
index 70dc5ef..0000000
Binary files a/piqt_utils/icons/code-keyword.png and /dev/null differ
diff --git a/piqt_utils/icons/code-parents.png b/piqt_utils/icons/code-parents.png
deleted file mode 100644
index 7c14d40..0000000
Binary files a/piqt_utils/icons/code-parents.png and /dev/null differ
diff --git a/piqt_utils/icons/code-property.png b/piqt_utils/icons/code-property.png
deleted file mode 100644
index d2af8a6..0000000
Binary files a/piqt_utils/icons/code-property.png and /dev/null differ
diff --git a/piqt_utils/icons/code-signal.png b/piqt_utils/icons/code-signal.png
deleted file mode 100644
index 3415e62..0000000
Binary files a/piqt_utils/icons/code-signal.png and /dev/null differ
diff --git a/piqt_utils/icons/code-struct.png b/piqt_utils/icons/code-struct.png
deleted file mode 100644
index 61544a8..0000000
Binary files a/piqt_utils/icons/code-struct.png and /dev/null differ
diff --git a/piqt_utils/icons/code-union.png b/piqt_utils/icons/code-union.png
deleted file mode 100644
index 2f4567a..0000000
Binary files a/piqt_utils/icons/code-union.png and /dev/null differ
diff --git a/piqt_utils/icons/code-variable.png b/piqt_utils/icons/code-variable.png
deleted file mode 100644
index d0ec29e..0000000
Binary files a/piqt_utils/icons/code-variable.png and /dev/null differ
diff --git a/piqt_utils/icons/code-word.png b/piqt_utils/icons/code-word.png
deleted file mode 100644
index e61f08f..0000000
Binary files a/piqt_utils/icons/code-word.png and /dev/null differ
diff --git a/piqt_utils/icons/configure-.png b/piqt_utils/icons/configure-.png
deleted file mode 100644
index 541c14e..0000000
Binary files a/piqt_utils/icons/configure-.png and /dev/null differ
diff --git a/piqt_utils/icons/configure.png b/piqt_utils/icons/configure.png
deleted file mode 100644
index 5ce478b..0000000
Binary files a/piqt_utils/icons/configure.png and /dev/null differ
diff --git a/piqt_utils/icons/database.png b/piqt_utils/icons/database.png
deleted file mode 100644
index 3041814..0000000
Binary files a/piqt_utils/icons/database.png and /dev/null differ
diff --git a/piqt_utils/icons/debug-run.png b/piqt_utils/icons/debug-run.png
deleted file mode 100644
index 9bebb44..0000000
Binary files a/piqt_utils/icons/debug-run.png and /dev/null differ
diff --git a/piqt_utils/icons/designer-qt4.png b/piqt_utils/icons/designer-qt4.png
deleted file mode 100644
index 8f699be..0000000
Binary files a/piqt_utils/icons/designer-qt4.png and /dev/null differ
diff --git a/piqt_utils/icons/dialog-close.png b/piqt_utils/icons/dialog-close.png
deleted file mode 100644
index 2c2f99e..0000000
Binary files a/piqt_utils/icons/dialog-close.png and /dev/null differ
diff --git a/piqt_utils/icons/dialog-ok-apply.png b/piqt_utils/icons/dialog-ok-apply.png
deleted file mode 100644
index f5feac0..0000000
Binary files a/piqt_utils/icons/dialog-ok-apply.png and /dev/null differ
diff --git a/piqt_utils/icons/dialog-warning.png b/piqt_utils/icons/dialog-warning.png
deleted file mode 100644
index 80bd694..0000000
Binary files a/piqt_utils/icons/dialog-warning.png and /dev/null differ
diff --git a/piqt_utils/icons/disabled.png b/piqt_utils/icons/disabled.png
deleted file mode 100644
index f20b8e0..0000000
Binary files a/piqt_utils/icons/disabled.png and /dev/null differ
diff --git a/piqt_utils/icons/distribute-horizontal-margin.png b/piqt_utils/icons/distribute-horizontal-margin.png
deleted file mode 100644
index 3289190..0000000
Binary files a/piqt_utils/icons/distribute-horizontal-margin.png and /dev/null differ
diff --git a/piqt_utils/icons/document-edit.png b/piqt_utils/icons/document-edit.png
deleted file mode 100644
index 84e345d..0000000
Binary files a/piqt_utils/icons/document-edit.png and /dev/null differ
diff --git a/piqt_utils/icons/document-new.png b/piqt_utils/icons/document-new.png
deleted file mode 100644
index 3092571..0000000
Binary files a/piqt_utils/icons/document-new.png and /dev/null differ
diff --git a/piqt_utils/icons/document-open.png b/piqt_utils/icons/document-open.png
deleted file mode 100644
index 8ba5441..0000000
Binary files a/piqt_utils/icons/document-open.png and /dev/null differ
diff --git a/piqt_utils/icons/document-print.png b/piqt_utils/icons/document-print.png
deleted file mode 100644
index 8eb1c67..0000000
Binary files a/piqt_utils/icons/document-print.png and /dev/null differ
diff --git a/piqt_utils/icons/document-save-.png b/piqt_utils/icons/document-save-.png
deleted file mode 100644
index 7fa489c..0000000
Binary files a/piqt_utils/icons/document-save-.png and /dev/null differ
diff --git a/piqt_utils/icons/document-save-all.png b/piqt_utils/icons/document-save-all.png
deleted file mode 100644
index 159857f..0000000
Binary files a/piqt_utils/icons/document-save-all.png and /dev/null differ
diff --git a/piqt_utils/icons/document-save-as.png b/piqt_utils/icons/document-save-as.png
deleted file mode 100644
index 9695a56..0000000
Binary files a/piqt_utils/icons/document-save-as.png and /dev/null differ
diff --git a/piqt_utils/icons/document-save.png b/piqt_utils/icons/document-save.png
deleted file mode 100644
index 8072aea..0000000
Binary files a/piqt_utils/icons/document-save.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-clear-.png b/piqt_utils/icons/edit-clear-.png
deleted file mode 100644
index cee7af6..0000000
Binary files a/piqt_utils/icons/edit-clear-.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-clear-locationbar-rtl.png b/piqt_utils/icons/edit-clear-locationbar-rtl.png
deleted file mode 100644
index 6c4b83b..0000000
Binary files a/piqt_utils/icons/edit-clear-locationbar-rtl.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-clear.png b/piqt_utils/icons/edit-clear.png
deleted file mode 100644
index 631ed44..0000000
Binary files a/piqt_utils/icons/edit-clear.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-copy.png b/piqt_utils/icons/edit-copy.png
deleted file mode 100644
index 477e83a..0000000
Binary files a/piqt_utils/icons/edit-copy.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-cut.png b/piqt_utils/icons/edit-cut.png
deleted file mode 100644
index 0732328..0000000
Binary files a/piqt_utils/icons/edit-cut.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-delete.png b/piqt_utils/icons/edit-delete.png
deleted file mode 100644
index cc6d2af..0000000
Binary files a/piqt_utils/icons/edit-delete.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-find-.png b/piqt_utils/icons/edit-find-.png
deleted file mode 100644
index 64a1e28..0000000
Binary files a/piqt_utils/icons/edit-find-.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-find.png b/piqt_utils/icons/edit-find.png
deleted file mode 100644
index 9a462c0..0000000
Binary files a/piqt_utils/icons/edit-find.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-guides.png b/piqt_utils/icons/edit-guides.png
deleted file mode 100644
index d264839..0000000
Binary files a/piqt_utils/icons/edit-guides.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-paste.png b/piqt_utils/icons/edit-paste.png
deleted file mode 100644
index 6788b02..0000000
Binary files a/piqt_utils/icons/edit-paste.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-redo.png b/piqt_utils/icons/edit-redo.png
deleted file mode 100644
index 8de333f..0000000
Binary files a/piqt_utils/icons/edit-redo.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-table-insert-row-below.png b/piqt_utils/icons/edit-table-insert-row-below.png
deleted file mode 100644
index a194a68..0000000
Binary files a/piqt_utils/icons/edit-table-insert-row-below.png and /dev/null differ
diff --git a/piqt_utils/icons/edit-undo.png b/piqt_utils/icons/edit-undo.png
deleted file mode 100644
index 5071aa1..0000000
Binary files a/piqt_utils/icons/edit-undo.png and /dev/null differ
diff --git a/piqt_utils/icons/employees.png b/piqt_utils/icons/employees.png
deleted file mode 100644
index 7ae7383..0000000
Binary files a/piqt_utils/icons/employees.png and /dev/null differ
diff --git a/piqt_utils/icons/expand_s_x.png b/piqt_utils/icons/expand_s_x.png
deleted file mode 100644
index b66cb40..0000000
Binary files a/piqt_utils/icons/expand_s_x.png and /dev/null differ
diff --git a/piqt_utils/icons/expand_s_y.png b/piqt_utils/icons/expand_s_y.png
deleted file mode 100644
index c2e8f78..0000000
Binary files a/piqt_utils/icons/expand_s_y.png and /dev/null differ
diff --git a/piqt_utils/icons/expand_x.png b/piqt_utils/icons/expand_x.png
deleted file mode 100644
index 217e3ea..0000000
Binary files a/piqt_utils/icons/expand_x.png and /dev/null differ
diff --git a/piqt_utils/icons/expand_y.png b/piqt_utils/icons/expand_y.png
deleted file mode 100644
index fedf936..0000000
Binary files a/piqt_utils/icons/expand_y.png and /dev/null differ
diff --git a/piqt_utils/icons/format-text-subscript.png b/piqt_utils/icons/format-text-subscript.png
deleted file mode 100644
index 206b147..0000000
Binary files a/piqt_utils/icons/format-text-subscript.png and /dev/null differ
diff --git a/piqt_utils/icons/games-solve.png b/piqt_utils/icons/games-solve.png
deleted file mode 100644
index 47f11f7..0000000
Binary files a/piqt_utils/icons/games-solve.png and /dev/null differ
diff --git a/piqt_utils/icons/go-jump.png b/piqt_utils/icons/go-jump.png
deleted file mode 100644
index 2cd4627..0000000
Binary files a/piqt_utils/icons/go-jump.png and /dev/null differ
diff --git a/piqt_utils/icons/go-next.png b/piqt_utils/icons/go-next.png
deleted file mode 100644
index aa7cbb9..0000000
Binary files a/piqt_utils/icons/go-next.png and /dev/null differ
diff --git a/piqt_utils/icons/go-previous.png b/piqt_utils/icons/go-previous.png
deleted file mode 100644
index 8230340..0000000
Binary files a/piqt_utils/icons/go-previous.png and /dev/null differ
diff --git a/piqt_utils/icons/graphics.png b/piqt_utils/icons/graphics.png
deleted file mode 100644
index 64abcb5..0000000
Binary files a/piqt_utils/icons/graphics.png and /dev/null differ
diff --git a/piqt_utils/icons/groups-edit.png b/piqt_utils/icons/groups-edit.png
deleted file mode 100644
index 278c4d6..0000000
Binary files a/piqt_utils/icons/groups-edit.png and /dev/null differ
diff --git a/piqt_utils/icons/item-add.png b/piqt_utils/icons/item-add.png
deleted file mode 100644
index 8a422c7..0000000
Binary files a/piqt_utils/icons/item-add.png and /dev/null differ
diff --git a/piqt_utils/icons/item.png b/piqt_utils/icons/item.png
deleted file mode 100644
index 50bfddb..0000000
Binary files a/piqt_utils/icons/item.png and /dev/null differ
diff --git a/piqt_utils/icons/lastmoves.png b/piqt_utils/icons/lastmoves.png
deleted file mode 100644
index 4454bca..0000000
Binary files a/piqt_utils/icons/lastmoves.png and /dev/null differ
diff --git a/piqt_utils/icons/led_3.png b/piqt_utils/icons/led_3.png
deleted file mode 100644
index 604c241..0000000
Binary files a/piqt_utils/icons/led_3.png and /dev/null differ
diff --git a/piqt_utils/icons/led_off.png b/piqt_utils/icons/led_off.png
deleted file mode 100644
index fe60f36..0000000
Binary files a/piqt_utils/icons/led_off.png and /dev/null differ
diff --git a/piqt_utils/icons/led_on.png b/piqt_utils/icons/led_on.png
deleted file mode 100644
index 946ba73..0000000
Binary files a/piqt_utils/icons/led_on.png and /dev/null differ
diff --git a/piqt_utils/icons/light-+.png b/piqt_utils/icons/light-+.png
deleted file mode 100644
index e7d8d80..0000000
Binary files a/piqt_utils/icons/light-+.png and /dev/null differ
diff --git a/piqt_utils/icons/light--.png b/piqt_utils/icons/light--.png
deleted file mode 100644
index 9a4942b..0000000
Binary files a/piqt_utils/icons/light--.png and /dev/null differ
diff --git a/piqt_utils/icons/light-254.png b/piqt_utils/icons/light-254.png
deleted file mode 100644
index ff6a171..0000000
Binary files a/piqt_utils/icons/light-254.png and /dev/null differ
diff --git a/piqt_utils/icons/light-disable-all.png b/piqt_utils/icons/light-disable-all.png
deleted file mode 100644
index 68ee45c..0000000
Binary files a/piqt_utils/icons/light-disable-all.png and /dev/null differ
diff --git a/piqt_utils/icons/light-disable.png b/piqt_utils/icons/light-disable.png
deleted file mode 100644
index 4755fd8..0000000
Binary files a/piqt_utils/icons/light-disable.png and /dev/null differ
diff --git a/piqt_utils/icons/light-down.png b/piqt_utils/icons/light-down.png
deleted file mode 100644
index 52a577a..0000000
Binary files a/piqt_utils/icons/light-down.png and /dev/null differ
diff --git a/piqt_utils/icons/light-edit.png b/piqt_utils/icons/light-edit.png
deleted file mode 100644
index 581a696..0000000
Binary files a/piqt_utils/icons/light-edit.png and /dev/null differ
diff --git a/piqt_utils/icons/light-max.png b/piqt_utils/icons/light-max.png
deleted file mode 100644
index 692ce16..0000000
Binary files a/piqt_utils/icons/light-max.png and /dev/null differ
diff --git a/piqt_utils/icons/light-min.png b/piqt_utils/icons/light-min.png
deleted file mode 100644
index 42e76b6..0000000
Binary files a/piqt_utils/icons/light-min.png and /dev/null differ
diff --git a/piqt_utils/icons/light-off.png b/piqt_utils/icons/light-off.png
deleted file mode 100644
index 3763a5d..0000000
Binary files a/piqt_utils/icons/light-off.png and /dev/null differ
diff --git a/piqt_utils/icons/light-on.png b/piqt_utils/icons/light-on.png
deleted file mode 100644
index 8db6a2d..0000000
Binary files a/piqt_utils/icons/light-on.png and /dev/null differ
diff --git a/piqt_utils/icons/light-step-down.png b/piqt_utils/icons/light-step-down.png
deleted file mode 100644
index 64b405d..0000000
Binary files a/piqt_utils/icons/light-step-down.png and /dev/null differ
diff --git a/piqt_utils/icons/light-step-up.png b/piqt_utils/icons/light-step-up.png
deleted file mode 100644
index 4aaf795..0000000
Binary files a/piqt_utils/icons/light-step-up.png and /dev/null differ
diff --git a/piqt_utils/icons/light-up.png b/piqt_utils/icons/light-up.png
deleted file mode 100644
index ddc5eec..0000000
Binary files a/piqt_utils/icons/light-up.png and /dev/null differ
diff --git a/piqt_utils/icons/lights.png b/piqt_utils/icons/lights.png
deleted file mode 100644
index 34d2541..0000000
Binary files a/piqt_utils/icons/lights.png and /dev/null differ
diff --git a/piqt_utils/icons/list-add.png b/piqt_utils/icons/list-add.png
deleted file mode 100644
index 5724694..0000000
Binary files a/piqt_utils/icons/list-add.png and /dev/null differ
diff --git a/piqt_utils/icons/list-remove.png b/piqt_utils/icons/list-remove.png
deleted file mode 100644
index 53506b0..0000000
Binary files a/piqt_utils/icons/list-remove.png and /dev/null differ
diff --git a/piqt_utils/icons/log_parser.png b/piqt_utils/icons/log_parser.png
deleted file mode 100644
index cf0ca98..0000000
Binary files a/piqt_utils/icons/log_parser.png and /dev/null differ
diff --git a/piqt_utils/icons/mail.png b/piqt_utils/icons/mail.png
deleted file mode 100644
index 81adbf9..0000000
Binary files a/piqt_utils/icons/mail.png and /dev/null differ
diff --git a/piqt_utils/icons/media-flash.png b/piqt_utils/icons/media-flash.png
deleted file mode 100644
index d91845b..0000000
Binary files a/piqt_utils/icons/media-flash.png and /dev/null differ
diff --git a/piqt_utils/icons/media-playback-pause.png b/piqt_utils/icons/media-playback-pause.png
deleted file mode 100644
index d133bdc..0000000
Binary files a/piqt_utils/icons/media-playback-pause.png and /dev/null differ
diff --git a/piqt_utils/icons/media-playback-stop.png b/piqt_utils/icons/media-playback-stop.png
deleted file mode 100644
index 4ecbdf6..0000000
Binary files a/piqt_utils/icons/media-playback-stop.png and /dev/null differ
diff --git a/piqt_utils/icons/media-record.png b/piqt_utils/icons/media-record.png
deleted file mode 100644
index 73688e8..0000000
Binary files a/piqt_utils/icons/media-record.png and /dev/null differ
diff --git a/piqt_utils/icons/node-add.png b/piqt_utils/icons/node-add.png
deleted file mode 100644
index 80b5c61..0000000
Binary files a/piqt_utils/icons/node-add.png and /dev/null differ
diff --git a/piqt_utils/icons/node.png b/piqt_utils/icons/node.png
deleted file mode 100644
index fc8194e..0000000
Binary files a/piqt_utils/icons/node.png and /dev/null differ
diff --git a/piqt_utils/icons/object-locked.png b/piqt_utils/icons/object-locked.png
deleted file mode 100644
index 38dff01..0000000
Binary files a/piqt_utils/icons/object-locked.png and /dev/null differ
diff --git a/piqt_utils/icons/piconnection.png b/piqt_utils/icons/piconnection.png
deleted file mode 100644
index 47d41d7..0000000
Binary files a/piqt_utils/icons/piconnection.png and /dev/null differ
diff --git a/piqt_utils/icons/piconnection.xcf b/piqt_utils/icons/piconnection.xcf
deleted file mode 100644
index a5fdbee..0000000
Binary files a/piqt_utils/icons/piconnection.xcf and /dev/null differ
diff --git a/piqt_utils/icons/quickopen.png b/piqt_utils/icons/quickopen.png
deleted file mode 100644
index 60cb838..0000000
Binary files a/piqt_utils/icons/quickopen.png and /dev/null differ
diff --git a/piqt_utils/icons/run-build-install-root.png b/piqt_utils/icons/run-build-install-root.png
deleted file mode 100644
index 6c7a236..0000000
Binary files a/piqt_utils/icons/run-build-install-root.png and /dev/null differ
diff --git a/piqt_utils/icons/run-build.png b/piqt_utils/icons/run-build.png
deleted file mode 100644
index 85a12e8..0000000
Binary files a/piqt_utils/icons/run-build.png and /dev/null differ
diff --git a/piqt_utils/icons/scenes-edit.png b/piqt_utils/icons/scenes-edit.png
deleted file mode 100644
index d60c0f6..0000000
Binary files a/piqt_utils/icons/scenes-edit.png and /dev/null differ
diff --git a/piqt_utils/icons/select-add.png b/piqt_utils/icons/select-add.png
deleted file mode 100644
index 084ab28..0000000
Binary files a/piqt_utils/icons/select-add.png and /dev/null differ
diff --git a/piqt_utils/icons/select-intersect.png b/piqt_utils/icons/select-intersect.png
deleted file mode 100644
index e1b22cc..0000000
Binary files a/piqt_utils/icons/select-intersect.png and /dev/null differ
diff --git a/piqt_utils/icons/select-invert.png b/piqt_utils/icons/select-invert.png
deleted file mode 100644
index 1c82ab4..0000000
Binary files a/piqt_utils/icons/select-invert.png and /dev/null differ
diff --git a/piqt_utils/icons/select-none.png b/piqt_utils/icons/select-none.png
deleted file mode 100644
index 4f9bb5a..0000000
Binary files a/piqt_utils/icons/select-none.png and /dev/null differ
diff --git a/piqt_utils/icons/select-replace.png b/piqt_utils/icons/select-replace.png
deleted file mode 100644
index 80ccde4..0000000
Binary files a/piqt_utils/icons/select-replace.png and /dev/null differ
diff --git a/piqt_utils/icons/select-subtract.png b/piqt_utils/icons/select-subtract.png
deleted file mode 100644
index 26eccee..0000000
Binary files a/piqt_utils/icons/select-subtract.png and /dev/null differ
diff --git a/piqt_utils/icons/splash.png b/piqt_utils/icons/splash.png
deleted file mode 100644
index 38921fc..0000000
Binary files a/piqt_utils/icons/splash.png and /dev/null differ
diff --git a/piqt_utils/icons/status-off.png b/piqt_utils/icons/status-off.png
deleted file mode 100644
index b89267f..0000000
Binary files a/piqt_utils/icons/status-off.png and /dev/null differ
diff --git a/piqt_utils/icons/status-on.png b/piqt_utils/icons/status-on.png
deleted file mode 100644
index bb62ff6..0000000
Binary files a/piqt_utils/icons/status-on.png and /dev/null differ
diff --git a/piqt_utils/icons/status-warn.png b/piqt_utils/icons/status-warn.png
deleted file mode 100644
index 2afcc5e..0000000
Binary files a/piqt_utils/icons/status-warn.png and /dev/null differ
diff --git a/piqt_utils/icons/system-help.png b/piqt_utils/icons/system-help.png
deleted file mode 100644
index 86b6407..0000000
Binary files a/piqt_utils/icons/system-help.png and /dev/null differ
diff --git a/piqt_utils/icons/tool-light-add.png b/piqt_utils/icons/tool-light-add.png
deleted file mode 100644
index a16d5fa..0000000
Binary files a/piqt_utils/icons/tool-light-add.png and /dev/null differ
diff --git a/piqt_utils/icons/tool-selection.png b/piqt_utils/icons/tool-selection.png
deleted file mode 100644
index 8ca8dbd..0000000
Binary files a/piqt_utils/icons/tool-selection.png and /dev/null differ
diff --git a/piqt_utils/icons/tools-wizard.png b/piqt_utils/icons/tools-wizard.png
deleted file mode 100644
index f67fb4c..0000000
Binary files a/piqt_utils/icons/tools-wizard.png and /dev/null differ
diff --git a/piqt_utils/icons/transform-move.png b/piqt_utils/icons/transform-move.png
deleted file mode 100644
index 0bd8d04..0000000
Binary files a/piqt_utils/icons/transform-move.png and /dev/null differ
diff --git a/piqt_utils/icons/variable-add.png b/piqt_utils/icons/variable-add.png
deleted file mode 100644
index 0a551b1..0000000
Binary files a/piqt_utils/icons/variable-add.png and /dev/null differ
diff --git a/piqt_utils/icons/variable-copy.png b/piqt_utils/icons/variable-copy.png
deleted file mode 100644
index 42d91c3..0000000
Binary files a/piqt_utils/icons/variable-copy.png and /dev/null differ
diff --git a/piqt_utils/icons/variable-edit.png b/piqt_utils/icons/variable-edit.png
deleted file mode 100644
index 420ace3..0000000
Binary files a/piqt_utils/icons/variable-edit.png and /dev/null differ
diff --git a/piqt_utils/icons/variable-remove.png b/piqt_utils/icons/variable-remove.png
deleted file mode 100644
index 0686e7c..0000000
Binary files a/piqt_utils/icons/variable-remove.png and /dev/null differ
diff --git a/piqt_utils/icons/view-grid.png b/piqt_utils/icons/view-grid.png
deleted file mode 100644
index 0f1d70c..0000000
Binary files a/piqt_utils/icons/view-grid.png and /dev/null differ
diff --git a/piqt_utils/icons/view-refresh.png b/piqt_utils/icons/view-refresh.png
deleted file mode 100644
index afa2a9d..0000000
Binary files a/piqt_utils/icons/view-refresh.png and /dev/null differ
diff --git a/piqt_utils/icons/warning-a.png b/piqt_utils/icons/warning-a.png
deleted file mode 100644
index 95cb849..0000000
Binary files a/piqt_utils/icons/warning-a.png and /dev/null differ
diff --git a/piqt_utils/icons/warning-id.png b/piqt_utils/icons/warning-id.png
deleted file mode 100644
index a8bc774..0000000
Binary files a/piqt_utils/icons/warning-id.png and /dev/null differ
diff --git a/piqt_utils/icons/window-close.png b/piqt_utils/icons/window-close.png
deleted file mode 100644
index ea6b607..0000000
Binary files a/piqt_utils/icons/window-close.png and /dev/null differ
diff --git a/piqt_utils/icons/zoom-fit-best.png b/piqt_utils/icons/zoom-fit-best.png
deleted file mode 100644
index 07cfc98..0000000
Binary files a/piqt_utils/icons/zoom-fit-best.png and /dev/null differ
diff --git a/piqt_utils/icons/zoom-in.png b/piqt_utils/icons/zoom-in.png
deleted file mode 100644
index 8393e28..0000000
Binary files a/piqt_utils/icons/zoom-in.png and /dev/null differ
diff --git a/piqt_utils/icons/zoom-out.png b/piqt_utils/icons/zoom-out.png
deleted file mode 100644
index f66575e..0000000
Binary files a/piqt_utils/icons/zoom-out.png and /dev/null differ
diff --git a/piqt_utils/icons/zoom-range.png b/piqt_utils/icons/zoom-range.png
deleted file mode 100644
index c052512..0000000
Binary files a/piqt_utils/icons/zoom-range.png and /dev/null differ
diff --git a/piqt_utils/icons/zoom-rect.png b/piqt_utils/icons/zoom-rect.png
deleted file mode 100644
index da44fd5..0000000
Binary files a/piqt_utils/icons/zoom-rect.png and /dev/null differ
diff --git a/piqt_utils/main.cpp b/piqt_utils/main.cpp
deleted file mode 100644
index 9b1488f..0000000
--- a/piqt_utils/main.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <QApplication>
-#include <iostream>
-#include "qpiconsole.h"
-#include "mainwindow.h"
-#include <piqt.h>
-
-
-
-int main(int argc, char * argv[]) {
-	QApplication a(argc, argv);
-	MainWindow w;
-	w.show();
-	return a.exec();
-	/*QFile::remove("./pr.conf");
-	QFile::copy("./protocols.conf", "./pr.conf");
-	QPIConfig c("./pr.conf");
-	c.addEntry("i", "sdf");
-	c.writeAll();*/
-}
diff --git a/piqt_utils/make_lib.bat b/piqt_utils/make_lib.bat
deleted file mode 100644
index 0148a43..0000000
--- a/piqt_utils/make_lib.bat
+++ /dev/null
@@ -1 +0,0 @@
-cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/piqt_utils/piconnedit.qrc b/piqt_utils/piconnedit.qrc
deleted file mode 100644
index 6ea99d5..0000000
--- a/piqt_utils/piconnedit.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-  <qresource prefix="/">
-    <file>icons/edit-clear-.png</file>
-    <file>icons/document-save-.png</file>
-  </qresource>
-</RCC>
diff --git a/piqt_utils/piconnedit_main.cpp b/piqt_utils/piconnedit_main.cpp
deleted file mode 100644
index 7a77c5e..0000000
--- a/piqt_utils/piconnedit_main.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <QApplication>
-#include "piqt_connection_edit.h"
-#include <QFileDialog>
-#include <qpiconfig.h>
-
-
-int main(int argc, char * argv[]) {
-	QApplication a(argc, argv);
-	ConnectionEdit w;
-	if (a.arguments().size() > 1) {
-		QPIConfig cfg(a.arguments()[1]);
-		QByteArray model = cfg.getValue("connectionmodel", QByteArray());
-		if (!model.isEmpty()) w.setModel(model);
-	}
-	if (w.exec() == QDialog::Accepted) {
-		QString c = QFileDialog::getSaveFileName(&w, "Save config to file", a.applicationDirPath(), "*.conf");
-		if (!c.isEmpty()) {
-			QFile f(c);
-			if (f.open(QIODevice::WriteOnly)) {
-				QTextStream ts(&f);
-				ts << w.configuration();
-				ts << "connectionmodel = " << QByteArray2QString(w.model()) << "\n";
-				f.close();
-			}
-		}
-	}
-	return 0;
-}
diff --git a/piqt_utils/pidumper.cpp b/piqt_utils/pidumper.cpp
deleted file mode 100644
index 0948acb..0000000
--- a/piqt_utils/pidumper.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include "pidumper.h"
-#include "pifile.h"
-#include "pitime.h"
-#include "pidir.h"
-//#include "ccm.h"
-#include <QClipboard>
-#ifdef CC_GCC
-#  include <unistd.h>
-#endif
-
-PIDumper::PIDumper(QWidget * parent): QMainWindow(parent) {
-	setupUi(this);
-	treeDump->header()->setResizeMode(QHeaderView::ResizeToContents);
-}
-
-
-void PIDumper::changeEvent(QEvent * e) {
-	QMainWindow::changeEvent(e);
-	switch (e->type()) {
-	case QEvent::LanguageChange:
-		retranslateUi(this);
-		break;
-	default:
-		break;
-	}
-}
-
-
-void PIDumper::buildDump() {
-	treeDump->clear();
-	if (!dump.contains('{')) return;
-	PIString app = dump.takeWord();
-	if (app != "application") return;
-	dump.takeLine();
-	QTreeWidgetItem * ti;
-	while (!dump.isEmpty()) {
-		PIString line = dump.takeLine();
-		if (line.contains('{')) {
-			ti = new QTreeWidgetItem();
-			dump.prepend(line + "\n");
-			buildDumpSection(ti, dump);
-			treeDump->addTopLevelItem(ti);
-			continue;
-		}
-		int colon = line.find(":");
-		if (colon < 0) continue;
-		PIString name = line.takeLeft(colon).trim();
-		PIString value = line.cutLeft(1).trim();
-		if (value.startsWith("\"")) value.cutLeft(1);
-		if (value.endsWith("\"")) value.cutRight(1);
-		ti = new QTreeWidgetItem(QStringList() << PI2QString(name) << PI2QString(value));
-		treeDump->addTopLevelItem(ti);
-	}
-	on_checkDumpHideService_toggled(checkDumpHideService->isChecked());
-}
-
-
-void PIDumper::buildDumpSection(QTreeWidgetItem * pi, PIString & str) {
-	PIString section = str.takeLeft(str.find("{")).trim();
-	PIString value;
-	if (section.contains('(')) {
-		value = section;
-		section = value.takeLeft(value.find('('));
-		value = value.takeRange("(", ")");
-	}
-	pi->setText(0, piqt(section));
-	pi->setText(1, piqt(value));
-	//if (section == "PIObjects")
-	PIString range = str.takeRange("{", "}");
-	QTreeWidgetItem * ti;
-	PIString fs;
-	if (section == "PIObjects" || section == "properties") fs = ":";
-	if (section == "methodsEH") fs = " ";
-	if (section == "connections") fs = "->";
-	while (!range.isEmpty()) {
-		PIString line = range.takeLine().trim();
-		if (line.contains('{')) {
-			ti = new QTreeWidgetItem(pi);
-			range.prepend(line + "\n");
-			buildDumpSection(ti, range);
-			//treeDump->addTopLevelItem(ti);
-			continue;
-		}
-		if (line.left(line.find(":")).trim() == "count") {
-			pi->setText(1, "[" + PI2QString(line.right(line.length() - line.find(":") - 1).trim()) + "]");
-			continue;
-		}
-		int colon = line.find(fs);
-		if (colon < 0) continue;
-		PIString name = line.takeLeft(colon).trim();
-		PIString value = line.cutLeft(fs.size_s()).trim();
-		if (value.startsWith("\"")) value.cutLeft(1);
-		if (value.endsWith("\"")) value.cutRight(1);
-		if (name.endsWith(":")) name.cutRight(1);
-		if (name.isEmpty() && value.isEmpty()) continue;
-		ti = new QTreeWidgetItem(pi, QStringList() << PI2QString(name) << PI2QString(value));
-		//treeDump->addTopLevelItem(ti);
-	}
-}
-
-
-void PIDumper::on_buttonDumpMake_clicked() {
-	if (radioDumpCurrent->isChecked()) {
-		PICout::setBufferActive(true, true);
-		dumpApplication();
-		dump = PICout::buffer();
-		PICout::setBufferActive(false);
-	} else {
-		int pid = lineDumpCustom->text().toInt();
-		if (pid == 0) return;
-		if (system(QString("kill -USR1 %1").arg(pid).toLatin1().constData()) < 0) return;
-		PIString dp = PIDir::home().path() + "/_PIP_DUMP_" + PIString::fromNumber(pid);
-		PITimeMeasurer tm;
-		while (tm.elapsed_s() < 5. && !PIFile::isExists(dp)) {
-			piMSleep(10);
-		}
-		//piSleep(2.);
-		PIFile f(dp, PIIODevice::ReadOnly);
-		if (!f.isOpened()) return;
-		dump = PIString(f.readAll());
-		f.remove();
-	}
-	buildDump();
-}
-
-
-void PIDumper::on_buttonDumpClipboard_clicked() {
-	dump = Q2PIString(QApplication::clipboard()->text());
-	buildDump();
-}
-
-
-void PIDumper::on_checkDumpHideService_toggled(bool on) {
-	QList<QTreeWidgetItem * > il = treeDump->findItems("", Qt::MatchContains | Qt::MatchRecursive);
-	foreach (QTreeWidgetItem * i, il) {
-		if (on) {
-			if (i->text(0).startsWith("class"))
-				i->setHidden(i->text(1).contains("__S__"));
-		} else
-			i->setHidden(false);
-	}
-}
diff --git a/piqt_utils/pidumper.h b/piqt_utils/pidumper.h
deleted file mode 100644
index 677fe1f..0000000
--- a/piqt_utils/pidumper.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef PIDUMPER_H
-#define PIDUMPER_H
-
-#include "ui_pidumper.h"
-#include <QImage>
-#include <QTime>
-#include <QDesktopWidget>
-#include <qmath.h>
-#include <QDebug>
-#include "piqt.h"
-#include "piconnection.h"
-
-class PIDumper: public QMainWindow, private Ui::PIDumper
-{
-	Q_OBJECT
-public:
-	PIDumper(QWidget * parent = 0);
-
-protected:
-	void changeEvent(QEvent * e);
-	
-	void buildDump();
-	void buildDumpSection(QTreeWidgetItem * pi, PIString & str);
-	
-	PIString dump;
-	
-private slots:
-	void on_buttonDumpMake_clicked();
-	void on_buttonDumpClipboard_clicked();
-	void on_checkDumpHideService_toggled(bool on);
-	
-public slots:
-	
-};
-
-#endif // PIDUMPER_H
diff --git a/piqt_utils/pidumper.ui b/piqt_utils/pidumper.ui
deleted file mode 100644
index fdce675..0000000
--- a/piqt_utils/pidumper.ui
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>PIDumper</class>
- <widget class="QMainWindow" name="PIDumper">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1134</width>
-    <height>854</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>PIP dump viewer</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <item>
-     <widget class="QCheckBox" name="checkDumpHideService">
-      <property name="text">
-       <string>Hide service objects</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <layout class="QVBoxLayout" name="verticalLayout_7">
-        <item>
-         <widget class="QPushButton" name="buttonDumpMake">
-          <property name="text">
-           <string>Make PIP dump</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="buttonDumpClipboard">
-          <property name="text">
-           <string>Take PIP dump from clipboard</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="groupBox_6">
-        <property name="title">
-         <string>Process</string>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="QRadioButton" name="radioDumpCurrent">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Current</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Preferred</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="radioDumpCustom">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Custom:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="lineDumpCustom">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>1</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </item>
-    <item>
-     <widget class="QTreeWidget" name="treeDump">
-      <property name="editTriggers">
-       <set>QAbstractItemView::NoEditTriggers</set>
-      </property>
-      <property name="alternatingRowColors">
-       <bool>true</bool>
-      </property>
-      <property name="verticalScrollMode">
-       <enum>QAbstractItemView::ScrollPerPixel</enum>
-      </property>
-      <property name="horizontalScrollMode">
-       <enum>QAbstractItemView::ScrollPerPixel</enum>
-      </property>
-      <property name="headerHidden">
-       <bool>true</bool>
-      </property>
-      <property name="columnCount">
-       <number>2</number>
-      </property>
-      <attribute name="headerVisible">
-       <bool>false</bool>
-      </attribute>
-      <attribute name="headerMinimumSectionSize">
-       <number>20</number>
-      </attribute>
-      <column>
-       <property name="text">
-        <string notr="true">1</string>
-       </property>
-      </column>
-      <column>
-       <property name="text">
-        <string notr="true">2</string>
-       </property>
-      </column>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>radioDumpCustom</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>lineDumpCustom</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>439</x>
-     <y>91</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>480</x>
-     <y>90</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>radioDumpCustom</sender>
-   <signal>clicked()</signal>
-   <receiver>lineDumpCustom</receiver>
-   <slot>setFocus()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>453</x>
-     <y>91</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>480</x>
-     <y>86</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
- <slots>
-  <slot>configChanged()</slot>
-  <slot>updateMap()</slot>
- </slots>
-</ui>
diff --git a/piqt_utils/pidumper_main.cpp b/piqt_utils/pidumper_main.cpp
deleted file mode 100644
index f7ad863..0000000
--- a/piqt_utils/pidumper_main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <QApplication>
-#include "pidumper.h"
-
-
-int main(int argc, char * argv[]) {
-	QApplication a(argc, argv);
-	PIDumper w;
-	w.show();
-	return a.exec();
-}
diff --git a/piqt_utils/piintrospector.cpp b/piqt_utils/piintrospector.cpp
deleted file mode 100644
index baf31f4..0000000
--- a/piqt_utils/piintrospector.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "piintrospector.h"
-#include "pifile.h"
-#include "pitime.h"
-#include "pidir.h"
-#include <QClipboard>
-
-
-QPIIntrospector::QPIIntrospector(QWidget * parent): QMainWindow(parent), peer("__introspection_client__") {
-	setupUi(this);
-	tree->header()->setResizeMode(QHeaderView::ResizeToContents);
-	CONNECTU(&peer, dataReceivedEvent, this, peerReceived)
-	startTimer(100);
-}
-
-
-void QPIIntrospector::changeEvent(QEvent * e) {
-	QMainWindow::changeEvent(e);
-	switch (e->type()) {
-	case QEvent::LanguageChange:
-		retranslateUi(this);
-		break;
-	default:
-		break;
-	}
-}
-
-
-void QPIIntrospector::timerEvent(QTimerEvent * ) {
-	listApp->blockSignals(true);
-	QString cs = listApp->currentItem() ? listApp->currentItem()->text() : "";
-	listApp->clear();
-	peer.lock();
-	piForeachC (PIPeer::PeerInfo & p, peer.allPeers()) {
-		QString pn = PI2QString(p.name);
-		listApp->addItem(pn);
-		if (pn == cs)
-			listApp->setCurrentRow(listApp->count() - 1);
-	}
-	peer.unlock();
-	listApp->blockSignals(false);
-}
-
-
-void QPIIntrospector::buildTree(QByteArray d) {
-	PIVector<PIIntrospectionThreads::ThreadInfo> threads;
-	PIByteArray pd = Q2PIByteArray(d);
-	pd >> threads;
-	tree->clear();
-	piForeachC (PIIntrospectionThreads::ThreadInfo & t, threads) {
-		QTreeWidgetItem * ti = new QTreeWidgetItem();
-		ti->setText(0, QString(PI2QString(t.name) + " (%1)").arg(t.id));
-		tree->addTopLevelItem(ti);
-	}
-}
-
-
-void QPIIntrospector::buildDumpSection(QTreeWidgetItem * pi, PIString & str) {
-}
-
-
-void QPIIntrospector::on_listApp_currentRowChanged(int r) {
-	if (r < 0) cur_server.clear();
-	else cur_server = Q2PIString(listApp->item(r)->text());
-}
-
-
-void QPIIntrospector::peerReceived(const PIString & from, const PIByteArray & data) {
-	if (from != cur_server) return;
-	PIString appname;
-	PIIntrospectionContainers cont;
-	PIByteArray ba(data);
-	ba >> appname >> cont;// >> threads.threads;
-	QMetaObject::invokeMethod(labelAppname, "setText", Qt::QueuedConnection, Q_ARG(QString, PI2QString(appname)));
-	QMetaObject::invokeMethod(labelCount, "setText", Qt::QueuedConnection, Q_ARG(QString, QString::number(cont.count)));
-	QMetaObject::invokeMethod(labelAlloc, "setText", Qt::QueuedConnection, Q_ARG(QString, PI2QString(PIString::readableSize(cont.bytes_allocated))));
-	QMetaObject::invokeMethod(labelUsed, "setText", Qt::QueuedConnection, Q_ARG(QString, PI2QString(PIString::readableSize(cont.bytes_used))));
-	QMetaObject::invokeMethod(this, "buildTree", Qt::QueuedConnection, Q_ARG(QByteArray, PI2QByteArray(ba)));
-	//piCout << appname;
-}
diff --git a/piqt_utils/piintrospector.h b/piqt_utils/piintrospector.h
deleted file mode 100644
index c920273..0000000
--- a/piqt_utils/piintrospector.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef PIINTROSPECTOR_H
-#define PIINTROSPECTOR_H
-
-#include "ui_piintrospector.h"
-#include <QImage>
-#include <QTime>
-#include <QDesktopWidget>
-#include <QDebug>
-#include "piqt.h"
-#include "piintrospection.h"
-
-class QPIIntrospector: public QMainWindow, private Ui::QPIIntrospector, public PIObject
-{
-	Q_OBJECT
-	PIOBJECT(QPIIntrospector)
-public:
-	QPIIntrospector(QWidget * parent = 0);
-
-protected:
-	void changeEvent(QEvent * e);
-	void timerEvent(QTimerEvent * );
-	
-	void buildDumpSection(QTreeWidgetItem * pi, PIString & str);
-
-	EVENT_HANDLER2(void, peerReceived, const PIString &, from, const PIByteArray &, data);
-
-	PIString cur_server;
-	PIPeer peer;
-	
-private slots:
-	void buildTree(QByteArray d);
-	void on_listApp_currentRowChanged(int r);
-
-public slots:
-	
-};
-
-#endif // PIINTROSPECTOR_H
diff --git a/piqt_utils/piintrospector.ui b/piqt_utils/piintrospector.ui
deleted file mode 100644
index 48a7a83..0000000
--- a/piqt_utils/piintrospector.ui
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QPIIntrospector</class>
- <widget class="QMainWindow" name="QPIIntrospector">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>923</width>
-    <height>661</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>PIP introspector</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <item>
-     <widget class="QSplitter" name="splitter">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <widget class="QGroupBox" name="groupBox">
-       <property name="title">
-        <string>Select application</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QListWidget" name="listApp">
-          <property name="editTriggers">
-           <set>QAbstractItemView::NoEditTriggers</set>
-          </property>
-          <property name="verticalScrollMode">
-           <enum>QAbstractItemView::ScrollPerPixel</enum>
-          </property>
-          <property name="horizontalScrollMode">
-           <enum>QAbstractItemView::ScrollPerPixel</enum>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="">
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QLabel" name="labelAppname">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="groupBox_2">
-          <property name="title">
-           <string>Containers</string>
-          </property>
-          <layout class="QFormLayout" name="formLayout">
-           <property name="fieldGrowthPolicy">
-            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-           </property>
-           <property name="rowWrapPolicy">
-            <enum>QFormLayout::DontWrapRows</enum>
-           </property>
-           <property name="labelAlignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <item row="0" column="0">
-            <widget class="QLabel" name="label">
-             <property name="text">
-              <string>count:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QLabel" name="labelCount">
-             <property name="text">
-              <string>0</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="label_2">
-             <property name="text">
-              <string>allocated:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QLabel" name="labelAlloc">
-             <property name="text">
-              <string>0</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_3">
-             <property name="text">
-              <string>used:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="1">
-            <widget class="QLabel" name="labelUsed">
-             <property name="text">
-              <string>0</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QTreeWidget" name="tree">
-          <property name="editTriggers">
-           <set>QAbstractItemView::NoEditTriggers</set>
-          </property>
-          <property name="verticalScrollMode">
-           <enum>QAbstractItemView::ScrollPerPixel</enum>
-          </property>
-          <column>
-           <property name="text">
-            <string/>
-           </property>
-          </column>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections/>
- <slots>
-  <slot>configChanged()</slot>
-  <slot>updateMap()</slot>
- </slots>
-</ui>
diff --git a/piqt_utils/piintrospector_main.cpp b/piqt_utils/piintrospector_main.cpp
deleted file mode 100644
index b94783d..0000000
--- a/piqt_utils/piintrospector_main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <QApplication>
-#include "piintrospector.h"
-
-
-int main(int argc, char * argv[]) {
-	QApplication a(argc, argv);
-	QPIIntrospector w;
-	w.show();
-	return a.exec();
-}
diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index daf2942..5c38995 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -82,6 +82,8 @@ endmacro()
 
 macro(qad_project NAME _LIBS)
 	qt_project(qad_${NAME} "LIB" "${_LIBS}" _H _CPP)
+	add_library(qad_${NAME} SHARED ${_H} ${_CPP})
+	target_link_libraries(qad_${NAME} ${_LIBS})
 	message(STATUS "Building ${PROJECT_NAME}")
 	qad_install(${PROJECT_NAME} "${_H}")
 	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/plugin")
diff --git a/qad/QtProject.cmake b/qad/QtProject.cmake
index dd3c5c1..cf6311c 100644
--- a/qad/QtProject.cmake
+++ b/qad/QtProject.cmake
@@ -1,4 +1,4 @@
-macro(qt_project NAME _TYPE _LIBS _H_OUT _CPP_OUT)
+macro(qt_project NAME _H_OUT _CPP_OUT)
 	project(${NAME})
 	find_package(Qt4 REQUIRED)
 	include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
@@ -13,14 +13,4 @@ macro(qt_project NAME _TYPE _LIBS _H_OUT _CPP_OUT)
 	list(APPEND ${_CPP_OUT} ${CUIS_${NAME}})
 	list(APPEND ${_CPP_OUT} ${CMOCS_${NAME}})
 	list(APPEND ${_CPP_OUT} ${CRES_${NAME}})
-	if ("_${_TYPE}" STREQUAL "_EXE")
-		add_executable(${PROJECT_NAME} ${${_H_OUT}} ${${_CPP_OUT}})
-	else()
-		if ("_${_TYPE}" STREQUAL "_LIB")
-			add_library(${PROJECT_NAME} SHARED ${${_H_OUT}} ${${_CPP_OUT}})
-		else()
-			message(FATAL_ERROR "You must specify \"EXE\" ot \"LIB\" by second argument of \"qt_project()\"!")
-		endif()
-	endif()
-	target_link_libraries(${PROJECT_NAME} ${_LIBS})
 endmacro()
diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt
index 1020dcf..2f7b374 100644
--- a/qcd_utils/CMakeLists.txt
+++ b/qcd_utils/CMakeLists.txt
@@ -11,8 +11,10 @@ if (NOT LIBPROJECT)
 endif()
 find_package(QAD REQUIRED)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
+qt_project(${PROJECT_NAME} H CPP)
+add_library(${PROJECT_NAME} SHARED ${H} ${CPP})
 set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} cd_utils piqt)
-qt_project(${PROJECT_NAME} "LIB" "${LIBS}" H CPP)
+target_link_libraries(${PROJECT_NAME} ${LIBS})
 message(STATUS "Building ${PROJECT_NAME}")
 if (LIBPROJECT)
 	sdk_install("" ${PROJECT_NAME} "${H}")
diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt
index 91e64b9..0b81552 100644
--- a/qcd_utils/pult/CMakeLists.txt
+++ b/qcd_utils/pult/CMakeLists.txt
@@ -1,5 +1,7 @@
+qt_project(cd_pult PULT_H PULT_CPP)
+add_executable(${PROJECT_NAME} WIN32 ${PULT_H} ${PULT_CPP})
 set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_GRAPHIC_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} qcd_utils)
-qt_project(cd_pult "EXE" "${LIBS}" PULT_H PULT_CPP)
+target_link_libraries(${PROJECT_NAME} ${LIBS})
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt
index d84e44a..22f2612 100644
--- a/qglview/CMakeLists.txt
+++ b/qglview/CMakeLists.txt
@@ -16,8 +16,10 @@ endif()
 find_package(QAD REQUIRED)
 find_package(OpenGL REQUIRED)
 include_directories(${QAD_INCLUDES})
+qt_project(${PROJECT_NAME} H CPP)
+add_library(${PROJECT_NAME} SHARED ${H} ${CPP})
 set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} ${OPENGL_LIBRARIES} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY})
-qt_project(${PROJECT_NAME} "LIB" "${LIBS}" H CPP)
+target_link_libraries(${PROJECT_NAME} ${LIBS})
 message(STATUS "Building ${PROJECT_NAME}")
 if (LIBPROJECT)
 	sdk_install("qad" "${PROJECT_NAME}" "${H}")