diff --git a/.gitmodules b/.gitmodules
index 313d993..e7b4341 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,7 +13,8 @@
 [submodule "pip"]
 	path = pip
 	url = https://git.shs.tools/SHS/pip.git
-[submodule "cd_utils"]
-	path = cd_utils
-	url = https://git.shs.tools/SHS/cd_utils.git
+	branch = master
+[submodule "cd"]
+	path = cd
+	url = https://git.shs.tools/SHS/cd.git
 	branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0776d3c..b445f81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,128 +5,25 @@ cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain targ
 if (POLICY CMP0053)
 	cmake_policy(SET CMP0053 NEW) # simpler variable expansion and escape sequence evaluation rules
 endif()
-project(libs)
-set(PIP_CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/pip/cmake")
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${PIP_CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/qad/cmake")
-set(LIBPROJECT 1)
-set(_qt_libs )
-set(_qt_apps )
-set(_qt_plugs)
-include(GenerateExportHeader)
-include(SDKMacros)
-include(QADMacros)
-include(DeployMacros)
+project(shstk)
+set(CMAKE_MODULE_PATH
+	"${CMAKE_CURRENT_SOURCE_DIR}"
+	"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
+	"${CMAKE_CURRENT_SOURCE_DIR}/pip/cmake"
+	"${CMAKE_CURRENT_SOURCE_DIR}/qad/cmake"
+	"${CMAKE_CURRENT_SOURCE_DIR}/cd_utils/cmake"
+	)
 
-if(NOT DEFINED BUILD_NUMBER)
-	set(BUILD_NUMBER 9999)
-endif()
-if("x${BUILD_NUMBER}" STREQUAL "x")
-	set(BUILD_NUMBER 0)
-endif()
+include(QtWraps)
+include(SHSTKMacros)
 
+shstk_begin_project("" "")
 
-if(STATIC_LIB)
-	set(QAD_LIB_TYPE STATIC)
-	add_definitions(-DQAD_STATIC_DEFINE)
-	set(QAD_LIB_TYPE_MSG "Static")
-else()
-	set(QAD_LIB_TYPE SHARED)
-	set(QAD_LIB_TYPE_MSG "Shared")
-endif()
-
-set(_QAD_MAJOR    1)
-set(_QAD_MINOR    7)
-set(_QAD_REVISION 0)
-set(_QAD_SUFFIX   )
-set(_QAD_COMPANY  SHS)
-set(_QAD_DOMAIN   org.SHS)
-set(QAD_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/qad/qad_version.h")
-set_version(QAD
-	MAJOR    "${_QAD_MAJOR}"
-	MINOR    "${_QAD_MINOR}"
-	REVISION "${_QAD_REVISION}"
-	BUILD    "${BUILD_NUMBER}"
-	SUFFIX   "${_QAD_SUFFIX}"
-	OUTPUT   "${QAD_VERSION_FILE}")
-set_deploy_property(QAD ${QAD_LIB_TYPE}
-	FULLNAME "${_QAD_DOMAIN}.*"
-	COMPANY  "${_QAD_COMPANY}")
-
-
-if(STATIC_LIB)
-	set(PIQt_LIB_TYPE STATIC)
-	add_definitions(-DPIQt_STATIC_DEFINE)
-	set(PIQt_LIB_TYPE_MSG "Static")
-else()
-	set(PIQt_LIB_TYPE SHARED)
-	set(PIQt_LIB_TYPE_MSG "Shared")
-endif()
-
-set(_PIQt_MAJOR    1)
-set(_PIQt_MINOR    0)
-set(_PIQt_REVISION 0)
-set(_PIQt_SUFFIX   )
-set(_PIQt_COMPANY  SHS)
-set(_PIQt_DOMAIN   org.SHS)
-if(NOT DEFINED BUILD_NUMBER)
-	set(BUILD_NUMBER 9999)
-endif()
-set(PIQt_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/piqt/piqt_version.h")
-set_version(PIQt
-	MAJOR    "${_PIQt_MAJOR}"
-	MINOR    "${_PIQt_MINOR}"
-	REVISION "${_PIQt_REVISION}"
-	BUILD    "${BUILD_NUMBER}"
-	SUFFIX   "${_PIQt_SUFFIX}"
-	OUTPUT   "${PIQt_VERSION_FILE}")
-set_deploy_property(PIQt ${_PIQt_LIB_TYPE}
-	FULLNAME "${_PIQt_DOMAIN}.*"
-	COMPANY  "${_PIQt_COMPANY}")
-
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/qad)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/piqt)
-if(MINGW)
-	find_package(MinGW REQUIRED)
-else()
-	if(APPLE)
-		set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks;@executable_path/lib;@loader_path/../lib")
-		set(CMAKE_MACOSX_RPATH TRUE)
-		if(CMAKE_CROSSCOMPILING)
-			set(CMAKE_INSTALL_NAME_DIR "@rpath")
-		else()
-			include_directories(/usr/local/include)
-			link_directories(/usr/local/lib)
-		endif()
-	else()
-		set(CMAKE_INSTALL_RPATH "\$ORIGIN;\$ORIGIN/lib")
-	endif()
-endif()
-if (DEFINED ANDROID_PLATFORM)
-	include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include)
-	#set(TARGET_INSTALL_PATH "${ANDROID_SYSTEM_LIBRARY_PATH}/usr/")
-	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${ANDROID_NDK}/sysroot/usr/include")
-	#message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
-	#message("${ANDROID_NDK}/sysroot/usr/include")
-endif()
-set(INSTALL_PREFIX "")
-set(_plugins_default_ ON)
-if(CMAKE_CROSSCOMPILING)
-	if (DEFINED ANDROID_PLATFORM)
-		set(_plugins_default_ OFF)
-		set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
-	else()
-		set(INSTALL_PREFIX "${CMAKE_STAGING_PREFIX}")
-	endif()
-endif()
 option(CROSSTOOLS "Crosstools minimal build" OFF)
-option(LIB "System install" ON)
-option(QGLVIEW "Build QGLview library and utils" OFF)
-option(QGLENGINE "Build QGLENGINE library and utils" OFF)
+option(QGLVIEW "Build QGLView library and utils" OFF)
+option(QGLENGINE "Build QGLEngine library and utils" OFF)
 option(UTILS "Build various utils" ${_plugins_default_})
-option(DESIGNER_PLUGINS "Build qt designer plugins" ${_plugins_default_})
-option(STATIC_LIB OFF)
+option(DESIGNER_PLUGINS "Build Qt designer plugins" ${_plugins_default_})
 if (CROSSTOOLS)
 	set(LIB 1)
 	set(QGLVIEW 0)
@@ -134,55 +31,32 @@ if (CROSSTOOLS)
 	set(UTILS 0)
 	set(DESIGNER_PLUGINS 0)
 endif()
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -Wall")
-else()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall")
-endif()
 set(CMAKE_CXX_STANDARD 11)
 
-set(PIP_LIBRARY pip)
-set(PIP_INCLUDES)
+add_subdirectory(pip)
+find_package(PIP REQUIRED)
+
+find_qt(Core QUIET)
+if (SOME_QT_FOUND)
+
+	add_subdirectory(qad)
+	find_package(QAD REQUIRED)
 
-if(LIB)
-	if(WIN32)
-		if(MINGW)
-			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-		endif()
-	else()
-		if (DEFINED ANDROID_PLATFORM)
-			set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
-		else()
-			if(CMAKE_CROSSCOMPILING)
-				set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
-			else()
-				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
-			endif()
-		endif()
-	endif()
-	message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
-else()
-	message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 endif()
 
-#message(${PIP_INCLUDES})
-if(CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM))
-	set(PIP_CMG "pip_cmg")
-	set(PIP_RC "pip_rc")
-	set(PIP_DEPLOY_TOOL "deploy_tool")
-else()
-	set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg")
-	set(PIP_RC "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/resources_compiler/pip_rc")
-	set(PIP_DEPLOY_TOOL "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/deploy_tool/deploy_tool")
-endif()
-if(WIN32)
-	set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip")
-endif()
+#message("cmg = \"${PIP_CMG}\"")
+#if (PIP_FOUND)
+#	message("found pip = \"${PIP_FOUND}\"")
+#endif()
+#message("inc = \"${PIP_INCLUDES}\"")
 
-set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad)
-set(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+qt_add_executable(aaa ${CMAKE_CURRENT_SOURCE_DIR}/pip/main.cpp)
+qt_target_link_libraries(aaa QAD::PIQtUtils)
+#deploy_target(aaa DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
+return()
+
+add_subdirectory(cmake)
 
 if (CROSSTOOLS)
 
diff --git a/cd b/cd
new file mode 160000
index 0000000..5a49104
--- /dev/null
+++ b/cd
@@ -0,0 +1 @@
+Subproject commit 5a49104273734148f7f9c1aedeb91cf8ad70ee3c
diff --git a/cd_utils b/cd_utils
deleted file mode 160000
index 05ed432..0000000
--- a/cd_utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05ed4322adba9f23605e9b85ca9519518133d0f3
diff --git a/cmake b/cmake
index 93caa5c..c350c61 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 93caa5cc5d0a892967848bc0cfb1bf17912f3516
+Subproject commit c350c61e36f555054b275edbe513cd0838e0597b
diff --git a/qad b/qad
index bd421ff..c576a14 160000
--- a/qad
+++ b/qad
@@ -1 +1 @@
-Subproject commit bd421ff5afa84c91abb808f1b4df0de7ff1ac7e8
+Subproject commit c576a14debce10270cf4ecca9fe7dc439475d5dd