diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c6425b..dcfdac5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,7 @@ else()
 endif()
 
 foreach(F ${PIP_FOLDERS})
-	list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src_main/${F}")
+	list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/lib/main/${F}")
 endforeach(F)
 #message(${PIP_INCLUDES})
 if(CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM))
diff --git a/pip b/pip
index 5de62b1..4292512 160000
--- a/pip
+++ b/pip
@@ -1 +1 @@
-Subproject commit 5de62b1c8352e60c3cb4990f7bd283f6b5fb3bc6
+Subproject commit 42925122cb4bb75838c5a25e64e157f3cb2866af
diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt
index fbadc3c..c7c206a 100644
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -23,7 +23,7 @@ list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
 set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
 file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
-pip_code_model(CCM "../pip/src_main/io_devices/piiodevice.h" "../pip/src_main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
+pip_code_model(CCM "../pip/lib/main/io_devices/piiodevice.h" "../pip/lib/main/io_utils/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
 find_qt(${QtVersions} Core Gui)
 qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
 qt_add_library(${PROJECT_NAME} ${LIBTYPE} out_CPP CCM)
diff --git a/piqt_utils/piintrospector/CMakeLists.txt b/piqt_utils/piintrospector/CMakeLists.txt
index 70c6a2e..3e607b0 100644
--- a/piqt_utils/piintrospector/CMakeLists.txt
+++ b/piqt_utils/piintrospector/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(piintrospector)
 file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
-set(PII_ROOT "../../pip/src_main/introspection")
+set(PII_ROOT "../../pip/lib/main/introspection")
 pip_code_model(PII_CCM "${PII_ROOT}/piintrospection_server_p.h" "${PII_ROOT}/piintrospection_threads_p.h" OPTIONS "-DPIP_EXPORT" "-Es")
 find_qt(${QtVersions} Core Gui)
 qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)