diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1b6e962f3..74ba8ff1df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1174,7 +1174,6 @@ if (INSTALL_SAMPLES)
   OCCT_INSTALL_FILE_OR_DIR ("samples/java" "${INSTALL_DIR_SAMPLES}")
   OCCT_INSTALL_FILE_OR_DIR ("samples/ocafsamples" "${INSTALL_DIR_SAMPLES}")
   OCCT_INSTALL_FILE_OR_DIR ("samples/qt" "${INSTALL_DIR_SAMPLES}")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code" "${INSTALL_DIR_SAMPLES}/OCCTOverview")
 
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/FuncDemo" RENAME "env.${SCRIPT_EXT}")
   install (FILES "${CMAKE_BINARY_DIR}/env.samples.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SAMPLES}/qt/IESample" RENAME "env.${SCRIPT_EXT}")
@@ -1403,13 +1402,13 @@ if (BUILD_SAMPLES_QT)
   endforeach()
 
   ## Copy sources of OCCTOverview for using in the sample
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/DataExchangeSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/OcafSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/GeometrySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TopologySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/TriangulationSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer2dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
-  OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/DataExchangeSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/OcafSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/GeometrySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/TopologySamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/TriangulationSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/Viewer2dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
+  OCCT_INSTALL_FILE_OR_DIR ("samples/qt/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
 endif()
 
 
@@ -1488,6 +1487,18 @@ endif()
 
 OCCT_MODULES_AND_TOOLKITS (SAMPLES "SAMPLES_TOOLKITS" OCCT_SAMPLES)
 
+# Load sample configuration files  
+foreach (OCCT_SAMPLE ${OCCT_SAMPLES})
+  foreach (BUILD_SAMPLE_TOOLKIT ${${OCCT_SAMPLE}_SAMPLES_TOOLKITS})
+    OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}/PACKAGES)
+    OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}/EXTERNLIB)
+    OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${BUILD_SAMPLE_TOOLKIT}/FILES)
+    foreach (PACKAGE ${OCCT_${BUILD_SAMPLE_TOOLKIT}_LIST_OF_PACKAGES})
+      OCCT_INCLUDE_CMAKE_FILE (samples/${OCCT_SAMPLE}/${PACKAGE}/FILES)
+    endforeach()
+  endforeach()
+endforeach()
+
 if (BUILD_SAMPLES_QT)
   if (BUILD_SAMPLES_QT)
     if (NOT Qt5_FOUND OR "${Qt5Gui_EGL_INCLUDE_DIRS}" STREQUAL "" OR NOT WIN32)
diff --git a/adm/cmake/qt_macro.cmake b/adm/cmake/qt_macro.cmake
index 36aec9086f..5c1824b0a0 100644
--- a/adm/cmake/qt_macro.cmake
+++ b/adm/cmake/qt_macro.cmake
@@ -79,8 +79,24 @@ macro (FIND_AND_WRAP_TS_FILE RESOURCE_FILE_NAME TARGET_FOLDER QM_FILES)
 endmacro()
 
 macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
-  file (STRINGS "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   TS_FILES   REGEX ".+[.]ts")
-  file (STRINGS "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/FILES"   QRC_FILES  REGEX ".+[.]qrc")
+  # Package name is now the sample name (e.g., "Tutorial")
+  set(PACKAGE_NAME ${OCCT_PACKAGE})
+  
+  # Get files from CMAKE variables with proper location
+  set(ALL_FILES ${OCCT_${PACKAGE_NAME}_FILES})
+  set(FILES_LOCATION ${OCCT_${PACKAGE_NAME}_FILES_LOCATION})
+  
+  # Filter for .ts and .qrc files with full paths
+  set(TS_FILES)
+  set(QRC_FILES)
+  foreach(FILE ${ALL_FILES})
+    if(FILE MATCHES ".+[.]ts$")
+      list(APPEND TS_FILES "${FILES_LOCATION}/${FILE}")
+    endif()
+    if(FILE MATCHES ".+[.]qrc$")
+      list(APPEND QRC_FILES "${FILES_LOCATION}/${FILE}")
+    endif()
+  endforeach()
 
   string (FIND "${OCCT_PACKAGE}" "/" _index)
   if (_index GREATER -1)
@@ -92,19 +108,17 @@ macro (FIND_AND_INSTALL_QT_RESOURCES OCCT_PACKAGE RESOURCE_FILES)
 
   #message("QRC files are: ${QRC_FILES} in ${OCCT_PACKAGE}")
   foreach (QRC_FILE ${QRC_FILES})
-    set (QRC_FILE_RELATIVE "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${QRC_FILE}")
-    if (EXISTS ${QRC_FILE_RELATIVE})
-      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE_RELATIVE} RCC_FILES)
+    if (EXISTS ${QRC_FILE})
+      FIND_AND_WRAP_RESOURCE_FILE(${QRC_FILE} RCC_FILES)
       list (APPEND ${RESOURCE_FILES} "${RCC_FILES}")
     endif()
   endforeach()
 
   #message("TS files are: ${TS_FILES} in ${OCCT_PACKAGE}")
   foreach (TS_FILE ${TS_FILES})
-    set (TS_FILE_RELATIVE "${OCCT_ROOT_DIR}/${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}/${TS_FILE}")
-    FIND_AND_WRAP_TS_FILE(${TS_FILE_RELATIVE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
-    if (EXISTS ${TS_FILE_RELATIVE})
-      list (APPEND ${RESOURCE_FILES} "${TS_FILE_RELATIVE}")
+    FIND_AND_WRAP_TS_FILE(${TS_FILE} "${TARGET_FOLDER}/${CURRENT_MODULE}" QM_FILES)
+    if (EXISTS ${TS_FILE})
+      list (APPEND ${RESOURCE_FILES} "${TS_FILE}")
       list (APPEND ${RESOURCE_FILES} "${QM_FILES}")
     endif()
   endforeach()
diff --git a/adm/templates/env.samples.sh.in b/adm/templates/env.samples.sh.in
index dddd137f21..08db608092 100644
--- a/adm/templates/env.samples.sh.in
+++ b/adm/templates/env.samples.sh.in
@@ -21,4 +21,4 @@ export RES_DIR=${aSamplePath}/${STATION}/res
 
 export PATH=${QTDIR}/bin:${PATH}
 
-export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../OCCTOverview/code"
+export "CSF_OCCTOverviewSampleCodePath=${aSamplePath}/../../qt/OCCTOverview/code"
diff --git a/adm/templates/sample.sh b/adm/templates/sample.sh
index 5ed26b9418..65647576a7 100644
--- a/adm/templates/sample.sh
+++ b/adm/templates/sample.sh
@@ -32,7 +32,7 @@ if [ ! -f "$EXE_PATH" ]; then
   exit 1
 fi
 
-export CSF_OCCTOverviewSampleCodePath="${CSF_OCCTSamplesPath}/OCCTOverview/code"
+export CSF_OCCTOverviewSampleCodePath="${CSF_OCCTSamplesPath}/qt/OCCTOverview/code"
 
 cd ${aCurrentPath}
 "$EXE_PATH"
diff --git a/dox/samples/novice_guide.md b/dox/samples/novice_guide.md
index 9818c843a6..fc4c90b8b7 100644
--- a/dox/samples/novice_guide.md
+++ b/dox/samples/novice_guide.md
@@ -95,7 +95,7 @@ In addition to these two samples, there are much more that might be of use to a
 Check Readme files in the sample directories to learn more about samples compilation.
 
 **Note:** source code for OCCTOverview is stored at 'samples/qt/OCCTOverview/src' folder in your OCCT root,
-and the source code files for examples presented in subsections are stored at 'samples/OCCTOverview/code folder'.
+and the source code files for examples presented in subsections are stored at 'samples/qt/OCCTOverview/code folder'.
 Several utility classes that are not presented in the example window may be found in example source code files.
 
 The overall classes introduction may be found in the @ref occt_user_guides__foundation_classes "Foundation Classes" section of the documentation.
diff --git a/samples/OCCTOverview/code/FILES b/samples/OCCTOverview/code/FILES
deleted file mode 100644
index 342bae1275..0000000000
--- a/samples/OCCTOverview/code/FILES
+++ /dev/null
@@ -1,48 +0,0 @@
-AdaptorCurve2d_AIS.cxx
-AdaptorCurve2d_AIS.h
-AdaptorCurve_AIS.cxx
-AdaptorCurve_AIS.h
-AdaptorPnt2d_AIS.cxx
-AdaptorPnt2d_AIS.h
-AdaptorVec_AIS.cxx
-AdaptorVec_AIS.h
-BaseSample.cxx
-BaseSample.h
-DataExchange.xml
-DataExchangeSamples.cxx
-DataExchangeSamples.h
-Geometry.xml
-GeometrySamples.cxx
-GeometrySamples.h
-MakeBottle.cxx
-MakeBottle.h
-Ocaf.xml
-OcafSamples.cxx
-OcafSamples.h
-Sample2D_Face.cxx
-Sample2D_Face.h
-Sample2D_Image.cxx
-Sample2D_Image.h
-Sample2D_Markers.cxx
-Sample2D_Markers.h
-Samples.qrc
-TOcafFunction_BoxDriver.cxx
-TOcafFunction_BoxDriver.h
-TOcafFunction_CutDriver.cxx
-TOcafFunction_CutDriver.h
-TOcafFunction_CylDriver.cxx
-TOcafFunction_CylDriver.h
-TOcaf_Application.cxx
-TOcaf_Application.h
-Topology.xml
-TopologySamples.cxx
-TopologySamples.h
-Triangulation.xml
-TriangulationSamples.cxx
-TriangulationSamples.h
-Viewer2d.xml
-Viewer2dSamples.cxx
-Viewer2dSamples.h
-Viewer3d.xml
-Viewer3dSamples.cxx
-Viewer3dSamples.h
diff --git a/samples/qt/AndroidQt/CMakeLists.txt b/samples/qt/AndroidQt/CMakeLists.txt
index 126582e8e2..ba43a22a39 100644
--- a/samples/qt/AndroidQt/CMakeLists.txt
+++ b/samples/qt/AndroidQt/CMakeLists.txt
@@ -1,9 +1,16 @@
 project(AndroidQt)
 
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
+# Sample configuration
+set (EXECUTABLE_PROJECT ON)
+set (USE_QT ON)
+set (RELATIVE_DIR "samples/qt")
+set (TARGET_FOLDER "Samples")
+
+include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
+
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
 
-ADD_DEFINITIONS(-DNO_Common_EXPORTS)
+# Target-specific definitions
+target_compile_definitions(AndroidQt PRIVATE -DNO_Common_EXPORTS)
 
 
diff --git a/samples/qt/AndroidQt/EXTERNLIB b/samples/qt/AndroidQt/EXTERNLIB
deleted file mode 100644
index fb5edc8d1d..0000000000
--- a/samples/qt/AndroidQt/EXTERNLIB
+++ /dev/null
@@ -1,17 +0,0 @@
-TKernel
-TKMath
-TKG2d
-TKG3d
-TKGeomBase
-TKBRep
-TKGeomAlgo
-TKTopAlgo
-TKShHealing
-TKService
-TKMesh
-TKHLR
-TKV3d
-TKOpenGl
-CSF_FreeImagePlus
-CSF_FREETYPE
-CSF_OpenGlLibs
diff --git a/samples/qt/AndroidQt/EXTERNLIB.cmake b/samples/qt/AndroidQt/EXTERNLIB.cmake
new file mode 100644
index 0000000000..e69a75f041
--- /dev/null
+++ b/samples/qt/AndroidQt/EXTERNLIB.cmake
@@ -0,0 +1,20 @@
+# External dependencies for AndroidQt sample
+set(OCCT_AndroidQt_EXTERNAL_LIBS
+  TKernel
+  TKMath
+  TKG2d
+  TKG3d
+  TKGeomBase
+  TKBRep
+  TKGeomAlgo
+  TKTopAlgo
+  TKShHealing
+  TKService
+  TKMesh
+  TKHLR
+  TKV3d
+  TKOpenGl
+  CSF_FreeImagePlus
+  CSF_FREETYPE
+  CSF_OpenGlLibs
+)
\ No newline at end of file
diff --git a/samples/qt/AndroidQt/FILES b/samples/qt/AndroidQt/FILES
deleted file mode 100644
index ca4f0e567b..0000000000
--- a/samples/qt/AndroidQt/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/samples/qt/AndroidQt/FILES.cmake b/samples/qt/AndroidQt/FILES.cmake
new file mode 100644
index 0000000000..71d1823196
--- /dev/null
+++ b/samples/qt/AndroidQt/FILES.cmake
@@ -0,0 +1,14 @@
+# Source files for AndroidQt sample
+set(OCCT_AndroidQt_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}")
+
+set(OCCT_AndroidQt_FILES
+  src/AndroidQt.cxx
+  src/AndroidQt.h
+  src/AndroidQt.qrc
+  src/AndroidQt_TouchParameters.cxx
+  src/AndroidQt_TouchParameters.h
+  src/AndroidQt_UserInteractionParameters.h
+  src/AndroidQt_Window.cxx
+  src/AndroidQt_Window.h
+  src/Main.cxx
+)
\ No newline at end of file
diff --git a/samples/qt/AndroidQt/PACKAGES b/samples/qt/AndroidQt/PACKAGES
deleted file mode 100644
index 089247b96e..0000000000
--- a/samples/qt/AndroidQt/PACKAGES
+++ /dev/null
@@ -1 +0,0 @@
-AndroidQt/src
diff --git a/samples/qt/AndroidQt/PACKAGES.cmake b/samples/qt/AndroidQt/PACKAGES.cmake
new file mode 100644
index 0000000000..68a4cffcbe
--- /dev/null
+++ b/samples/qt/AndroidQt/PACKAGES.cmake
@@ -0,0 +1,4 @@
+# Packages for AndroidQt sample
+set(OCCT_AndroidQt_LIST_OF_PACKAGES
+  AndroidQt
+)
\ No newline at end of file
diff --git a/samples/qt/AndroidQt/src/FILES b/samples/qt/AndroidQt/src/FILES
deleted file mode 100644
index 0bb880c9b3..0000000000
--- a/samples/qt/AndroidQt/src/FILES
+++ /dev/null
@@ -1,9 +0,0 @@
-AndroidQt.cxx
-AndroidQt.h
-AndroidQt.qrc
-AndroidQt_TouchParameters.cxx
-AndroidQt_TouchParameters.h
-AndroidQt_UserInteractionParameters.h
-AndroidQt_Window.cxx
-AndroidQt_Window.h
-Main.cxx
diff --git a/samples/qt/Common/src/FILES b/samples/qt/Common/src/FILES
deleted file mode 100644
index 12ba2818f3..0000000000
--- a/samples/qt/Common/src/FILES
+++ /dev/null
@@ -1,17 +0,0 @@
-ApplicationCommon.cxx
-ApplicationCommon.h
-Common-icon.ts
-Common-string.ts
-CommonSample.h
-DocumentCommon.cxx
-DocumentCommon.h
-Material.cxx
-Material.h
-MDIWindow.cxx
-MDIWindow.h
-OcctWindow.cxx
-OcctWindow.h
-Transparency.cxx
-Transparency.h
-View.cxx
-View.h
diff --git a/samples/qt/FuncDemo/CMakeLists.txt b/samples/qt/FuncDemo/CMakeLists.txt
index 1ea39b5fe2..afa0ec7fea 100644
--- a/samples/qt/FuncDemo/CMakeLists.txt
+++ b/samples/qt/FuncDemo/CMakeLists.txt
@@ -1,8 +1,14 @@
 project(FuncDemo)
 
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
+# Sample configuration
+set (EXECUTABLE_PROJECT ON)
+set (USE_QT ON)
+set (RELATIVE_DIR "samples/qt")
+set (TARGET_FOLDER "Samples")
+
+include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
+
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
 
 if (BUILD_Inspector)
   target_link_libraries (FuncDemo TKTInspector)
diff --git a/samples/qt/FuncDemo/EXTERNLIB b/samples/qt/FuncDemo/EXTERNLIB
deleted file mode 100644
index 7ced3fdd54..0000000000
--- a/samples/qt/FuncDemo/EXTERNLIB
+++ /dev/null
@@ -1,14 +0,0 @@
-TKBO
-TKBRep
-TKCAF
-TKCDF
-TKG2d
-TKG3d
-TKGeomAlgo
-TKGeomBase
-TKernel
-TKLCAF
-TKMath
-TKMesh
-TKPrim
-TKTopAlgo
diff --git a/samples/qt/FuncDemo/EXTERNLIB.cmake b/samples/qt/FuncDemo/EXTERNLIB.cmake
new file mode 100644
index 0000000000..d34ba941be
--- /dev/null
+++ b/samples/qt/FuncDemo/EXTERNLIB.cmake
@@ -0,0 +1,17 @@
+# External dependencies for FuncDemo sample
+set(OCCT_FuncDemo_EXTERNAL_LIBS
+  TKBO
+  TKBRep
+  TKCAF
+  TKCDF
+  TKG2d
+  TKG3d
+  TKGeomAlgo
+  TKGeomBase
+  TKernel
+  TKLCAF
+  TKMath
+  TKMesh
+  TKPrim
+  TKTopAlgo
+)
\ No newline at end of file
diff --git a/samples/qt/FuncDemo/FILES b/samples/qt/FuncDemo/FILES
deleted file mode 100644
index ca4f0e567b..0000000000
--- a/samples/qt/FuncDemo/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/samples/qt/FuncDemo/FILES.cmake b/samples/qt/FuncDemo/FILES.cmake
new file mode 100644
index 0000000000..ed56eb76c0
--- /dev/null
+++ b/samples/qt/FuncDemo/FILES.cmake
@@ -0,0 +1,33 @@
+# Source files for FuncDemo sample
+set(OCCT_FuncDemo_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}")
+
+set(OCCT_FuncDemo_FILES
+  src/BaseDriver.cpp
+  src/BaseDriver.h
+  src/CircleDriver.cpp
+  src/CircleDriver.h
+  src/ConeDriver.cpp
+  src/ConeDriver.h
+  src/CylinderDriver.cpp
+  src/CylinderDriver.h
+  src/edge.cpp
+  src/edge.h
+  src/FThread.cpp
+  src/FThread.h
+  src/FuncDemo.qrc
+  src/graphwidget.cpp
+  src/graphwidget.h
+  src/main.cpp
+  src/mainwindow.cpp
+  src/mainwindow.h
+  src/node.cpp
+  src/node.h
+  src/PointDriver.cpp
+  src/PointDriver.h
+  src/PrismDriver.cpp
+  src/PrismDriver.h
+  src/ShapeSaverDriver.cpp
+  src/ShapeSaverDriver.h
+  src/SimpleDriver.cpp
+  src/SimpleDriver.h
+)
\ No newline at end of file
diff --git a/samples/qt/FuncDemo/PACKAGES b/samples/qt/FuncDemo/PACKAGES
deleted file mode 100644
index 6417933607..0000000000
--- a/samples/qt/FuncDemo/PACKAGES
+++ /dev/null
@@ -1 +0,0 @@
-FuncDemo/src
\ No newline at end of file
diff --git a/samples/qt/FuncDemo/PACKAGES.cmake b/samples/qt/FuncDemo/PACKAGES.cmake
new file mode 100644
index 0000000000..310092e7a4
--- /dev/null
+++ b/samples/qt/FuncDemo/PACKAGES.cmake
@@ -0,0 +1,4 @@
+# Packages for FuncDemo sample
+set(OCCT_FuncDemo_LIST_OF_PACKAGES
+  FuncDemo
+)
\ No newline at end of file
diff --git a/samples/qt/FuncDemo/src/FILES b/samples/qt/FuncDemo/src/FILES
deleted file mode 100644
index 07ace65e6e..0000000000
--- a/samples/qt/FuncDemo/src/FILES
+++ /dev/null
@@ -1,28 +0,0 @@
-BaseDriver.cpp
-BaseDriver.h
-CircleDriver.cpp
-CircleDriver.h
-ConeDriver.cpp
-ConeDriver.h
-CylinderDriver.cpp
-CylinderDriver.h
-edge.cpp
-edge.h
-FILES
-FThread.cpp
-FThread.h
-graphwidget.cpp
-graphwidget.h
-main.cpp
-mainwindow.cpp
-mainwindow.h
-node.cpp
-node.h
-PointDriver.cpp
-PointDriver.h
-PrismDriver.cpp
-PrismDriver.h
-ShapeSaverDriver.cpp
-ShapeSaverDriver.h
-SimpleDriver.cpp
-SimpleDriver.h
diff --git a/samples/qt/IESample/CMakeLists.txt b/samples/qt/IESample/CMakeLists.txt
index a8dffeedcb..395352abcd 100644
--- a/samples/qt/IESample/CMakeLists.txt
+++ b/samples/qt/IESample/CMakeLists.txt
@@ -1,11 +1,18 @@
 project(IESample)
 
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
+# Sample configuration
+set (EXECUTABLE_PROJECT ON)
+set (USE_QT ON)
+set (RELATIVE_DIR "samples/qt")
+set (TARGET_FOLDER "Samples")
+
+include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
 include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Interface/src")
 include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Common/src")
+
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
 
-ADD_DEFINITIONS(-DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS)
+# Target-specific definitions
+target_compile_definitions(IESample PRIVATE -DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS)
 
 
diff --git a/samples/qt/IESample/EXTERNLIB b/samples/qt/IESample/EXTERNLIB
deleted file mode 100644
index 77612e08d9..0000000000
--- a/samples/qt/IESample/EXTERNLIB
+++ /dev/null
@@ -1,26 +0,0 @@
-TKBRep
-TKBool
-TKBO
-TKCDF
-TKFillet
-TKG2d
-TKG3d
-TKGeomAlgo
-TKGeomBase
-TKHLR
-TKDEIGES
-TKernel
-TKMath
-TKMesh
-TKOffset
-TKOpenGl
-TKPrim
-TKShHealing
-TKService
-TKDESTEP
-TKDESTL
-TKTopAlgo
-TKV3d
-TKDEVRML
-TKXSBase
-
diff --git a/samples/qt/IESample/EXTERNLIB.cmake b/samples/qt/IESample/EXTERNLIB.cmake
new file mode 100644
index 0000000000..6751415686
--- /dev/null
+++ b/samples/qt/IESample/EXTERNLIB.cmake
@@ -0,0 +1,28 @@
+# External dependencies for IESample sample
+set(OCCT_IESample_EXTERNAL_LIBS
+  TKBRep
+  TKBool
+  TKBO
+  TKCDF
+  TKFillet
+  TKG2d
+  TKG3d
+  TKGeomAlgo
+  TKGeomBase
+  TKHLR
+  TKDEIGES
+  TKernel
+  TKMath
+  TKMesh
+  TKOffset
+  TKOpenGl
+  TKPrim
+  TKShHealing
+  TKService
+  TKDESTEP
+  TKDESTL
+  TKTopAlgo
+  TKV3d
+  TKDEVRML
+  TKXSBase
+)
\ No newline at end of file
diff --git a/samples/qt/IESample/FILES b/samples/qt/IESample/FILES
deleted file mode 100644
index ca4f0e567b..0000000000
--- a/samples/qt/IESample/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/samples/qt/IESample/FILES.cmake b/samples/qt/IESample/FILES.cmake
new file mode 100644
index 0000000000..fb6b460229
--- /dev/null
+++ b/samples/qt/IESample/FILES.cmake
@@ -0,0 +1,29 @@
+# Source files for IESample sample
+set(OCCT_IESample_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}")
+
+set(OCCT_IESample_FILES
+  src/Main.cxx
+  ../Common/src/ApplicationCommon.cxx
+  ../Common/src/ApplicationCommon.h
+  ../Common/src/Common-icon.ts
+  ../Common/src/Common-string.ts
+  ../Common/src/CommonSample.h
+  ../Common/src/DocumentCommon.cxx
+  ../Common/src/DocumentCommon.h
+  ../Common/src/Material.cxx
+  ../Common/src/Material.h
+  ../Common/src/MDIWindow.cxx
+  ../Common/src/MDIWindow.h
+  ../Common/src/OcctWindow.cxx
+  ../Common/src/OcctWindow.h
+  ../Common/src/Transparency.cxx
+  ../Common/src/Transparency.h
+  ../Common/src/View.cxx
+  ../Common/src/View.h
+  ../Interface/src/Application.cxx
+  ../Interface/src/Application.h
+  ../Interface/src/IESample.h
+  ../Interface/src/Interface-string.ts
+  ../Interface/src/Translate.cxx
+  ../Interface/src/Translate.h
+)
\ No newline at end of file
diff --git a/samples/qt/IESample/PACKAGES b/samples/qt/IESample/PACKAGES
deleted file mode 100644
index aa9aa1a3ca..0000000000
--- a/samples/qt/IESample/PACKAGES
+++ /dev/null
@@ -1,3 +0,0 @@
-IESample/src
-Common/src
-Interface/src
\ No newline at end of file
diff --git a/samples/qt/IESample/PACKAGES.cmake b/samples/qt/IESample/PACKAGES.cmake
new file mode 100644
index 0000000000..812f8bb892
--- /dev/null
+++ b/samples/qt/IESample/PACKAGES.cmake
@@ -0,0 +1,4 @@
+# Packages for IESample sample
+set(OCCT_IESample_LIST_OF_PACKAGES
+  IESample
+)
\ No newline at end of file
diff --git a/samples/qt/IESample/src/FILES b/samples/qt/IESample/src/FILES
deleted file mode 100644
index f9dea79a18..0000000000
--- a/samples/qt/IESample/src/FILES
+++ /dev/null
@@ -1 +0,0 @@
-Main.cxx
\ No newline at end of file
diff --git a/samples/qt/Interface/src/FILES b/samples/qt/Interface/src/FILES
deleted file mode 100644
index c338ab41f5..0000000000
--- a/samples/qt/Interface/src/FILES
+++ /dev/null
@@ -1,6 +0,0 @@
-Application.cxx
-Application.h
-IESample.h
-Interface-string.ts
-Translate.cxx
-Translate.h
diff --git a/samples/qt/OCCTOverview/.DS_Store b/samples/qt/OCCTOverview/.DS_Store
new file mode 100644
index 0000000000..0d4b91b9ba
Binary files /dev/null and b/samples/qt/OCCTOverview/.DS_Store differ
diff --git a/samples/qt/OCCTOverview/CMakeLists.txt b/samples/qt/OCCTOverview/CMakeLists.txt
index 27a029d8d1..684d14eba7 100644
--- a/samples/qt/OCCTOverview/CMakeLists.txt
+++ b/samples/qt/OCCTOverview/CMakeLists.txt
@@ -1,8 +1,18 @@
 project(OCCTOverview)
 
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
-include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/../OCCTOverview/code")
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
+# Sample configuration
+set (EXECUTABLE_PROJECT ON)
+set (USE_QT ON)
+set (RELATIVE_DIR "samples/qt")
+set (TARGET_FOLDER "Samples")
 
-ADD_DEFINITIONS(-DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS)
+include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
+include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Common/src")
+include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Interface/src")
+include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/OCCTOverview/src")
+include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/OCCTOverview/code")
+
+OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
+
+# Target-specific definitions
+target_compile_definitions(OCCTOverview PRIVATE -DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS)
diff --git a/samples/qt/OCCTOverview/EXTERNLIB b/samples/qt/OCCTOverview/EXTERNLIB
deleted file mode 100644
index 8c5944480a..0000000000
--- a/samples/qt/OCCTOverview/EXTERNLIB
+++ /dev/null
@@ -1,30 +0,0 @@
-TKBRep
-TKBin
-TKBool
-TKBO
-TKCDF
-TKFillet
-TKG2d
-TKG3d
-TKGeomAlgo
-TKGeomBase
-TKernel
-TKHLR
-TKDEIGES
-TKMath
-TKMesh
-TKOffset
-TKOpenGl
-TKPrim
-TKService
-TKShHealing
-TKDESTEP
-TKDESTL
-TKTopAlgo
-TKV3d
-TKDEVRML
-TKXSBase
-TKLCAF
-TKCAF
-TKVCAF
-TKXml
diff --git a/samples/qt/OCCTOverview/EXTERNLIB.cmake b/samples/qt/OCCTOverview/EXTERNLIB.cmake
new file mode 100644
index 0000000000..abc4786b0a
--- /dev/null
+++ b/samples/qt/OCCTOverview/EXTERNLIB.cmake
@@ -0,0 +1,33 @@
+# External dependencies for OCCTOverview sample
+set(OCCT_OCCTOverview_EXTERNAL_LIBS
+  TKBRep
+  TKBin
+  TKBool
+  TKBO
+  TKCDF
+  TKFillet
+  TKG2d
+  TKG3d
+  TKGeomAlgo
+  TKGeomBase
+  TKernel
+  TKHLR
+  TKDEIGES
+  TKMath
+  TKMesh
+  TKOffset
+  TKOpenGl
+  TKPrim
+  TKService
+  TKShHealing
+  TKDESTEP
+  TKDESTL
+  TKTopAlgo
+  TKV3d
+  TKDEVRML
+  TKXSBase
+  TKLCAF
+  TKCAF
+  TKVCAF
+  TKXml
+)
\ No newline at end of file
diff --git a/samples/qt/OCCTOverview/FILES b/samples/qt/OCCTOverview/FILES
deleted file mode 100644
index ca4f0e567b..0000000000
--- a/samples/qt/OCCTOverview/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/samples/qt/OCCTOverview/FILES.cmake b/samples/qt/OCCTOverview/FILES.cmake
new file mode 100644
index 0000000000..b705149010
--- /dev/null
+++ b/samples/qt/OCCTOverview/FILES.cmake
@@ -0,0 +1,72 @@
+# Source files for OCCTOverview sample
+set(OCCT_OCCTOverview_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}")
+
+set(OCCT_OCCTOverview_FILES
+  src/ApplicationCommon.cxx
+  src/ApplicationCommon.h
+  src/CommonSample.h
+  src/DocumentCommon.cxx
+  src/DocumentCommon.h
+  src/GeomWidget.cxx
+  src/GeomWidget.h
+  src/Main.cxx
+  src/OcctHighlighter.cxx
+  src/OcctHighlighter.h
+  src/OcctWindow.cxx
+  src/OcctWindow.h
+  src/OCCTOverview.qrc
+  src/TranslateDialog.h
+  src/TranslateDialog.cxx
+  src/Transparency.cxx
+  src/Transparency.h
+  src/View.cxx
+  src/View.h
+  code/AdaptorCurve2d_AIS.cxx
+  code/AdaptorCurve2d_AIS.h
+  code/AdaptorCurve_AIS.cxx
+  code/AdaptorCurve_AIS.h
+  code/AdaptorPnt2d_AIS.cxx
+  code/AdaptorPnt2d_AIS.h
+  code/AdaptorVec_AIS.cxx
+  code/AdaptorVec_AIS.h
+  code/BaseSample.cxx
+  code/BaseSample.h
+  code/DataExchange.xml
+  code/DataExchangeSamples.cxx
+  code/DataExchangeSamples.h
+  code/Geometry.xml
+  code/GeometrySamples.cxx
+  code/GeometrySamples.h
+  code/MakeBottle.cxx
+  code/MakeBottle.h
+  code/Ocaf.xml
+  code/OcafSamples.cxx
+  code/OcafSamples.h
+  code/Sample2D_Face.cxx
+  code/Sample2D_Face.h
+  code/Sample2D_Image.cxx
+  code/Sample2D_Image.h
+  code/Sample2D_Markers.cxx
+  code/Sample2D_Markers.h
+  code/Samples.qrc
+  code/TOcafFunction_BoxDriver.cxx
+  code/TOcafFunction_BoxDriver.h
+  code/TOcafFunction_CutDriver.cxx
+  code/TOcafFunction_CutDriver.h
+  code/TOcafFunction_CylDriver.cxx
+  code/TOcafFunction_CylDriver.h
+  code/TOcaf_Application.cxx
+  code/TOcaf_Application.h
+  code/Topology.xml
+  code/TopologySamples.cxx
+  code/TopologySamples.h
+  code/Triangulation.xml
+  code/TriangulationSamples.cxx
+  code/TriangulationSamples.h
+  code/Viewer2d.xml
+  code/Viewer2dSamples.cxx
+  code/Viewer2dSamples.h
+  code/Viewer3d.xml
+  code/Viewer3dSamples.cxx
+  code/Viewer3dSamples.h
+)
diff --git a/samples/qt/OCCTOverview/OCCTOverview.pro b/samples/qt/OCCTOverview/OCCTOverview.pro
index b75bab5f91..c3587324a6 100644
--- a/samples/qt/OCCTOverview/OCCTOverview.pro
+++ b/samples/qt/OCCTOverview/OCCTOverview.pro
@@ -17,19 +17,19 @@ isEmpty(CSF_OCCTSamplesPath) {
 
 
 HEADERS   = ./src/*.h \
-            $${SAMPLESROOT}/../OCCTOverview/code/*.h
+            ./code/*.h
 
 SOURCES   = ./src/*.cxx \
-            $${SAMPLESROOT}/../OCCTOverview/code/*.cxx
+            ./code/*.cxx
 
-RESOURCES += $${SAMPLESROOT}/../OCCTOverview/code/Samples.qrc
+RESOURCES += ./code/Samples.qrc
 RESOURCES += ./src/OCCTOverview.qrc
 
 RES_DIR   = $$quote($$(RES_DIR))
 
 INCLUDEPATH += $$quote($$(CSF_SampleSources))
 INCLUDEPATH += $$quote($$(CSF_OCCTIncludePath)) \
-               $${SAMPLESROOT}/../OCCTOverview/code
+               $${SAMPLESROOT}/qt/OCCTOverview/code
 
 
 OCCT_DEFINES = $$(CSF_DEFINES)
diff --git a/samples/qt/OCCTOverview/PACKAGES b/samples/qt/OCCTOverview/PACKAGES
deleted file mode 100644
index 0d40a31f87..0000000000
--- a/samples/qt/OCCTOverview/PACKAGES
+++ /dev/null
@@ -1,2 +0,0 @@
-OCCTOverview/src
-/../OCCTOverview/code
diff --git a/samples/qt/OCCTOverview/PACKAGES.cmake b/samples/qt/OCCTOverview/PACKAGES.cmake
new file mode 100644
index 0000000000..9771c42ac5
--- /dev/null
+++ b/samples/qt/OCCTOverview/PACKAGES.cmake
@@ -0,0 +1,4 @@
+# Packages for OCCTOverview sample
+set(OCCT_OCCTOverview_LIST_OF_PACKAGES
+  OCCTOverview
+)
\ No newline at end of file
diff --git a/samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx b/samples/qt/OCCTOverview/code/AdaptorCurve2d_AIS.cxx
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorCurve2d_AIS.cxx
rename to samples/qt/OCCTOverview/code/AdaptorCurve2d_AIS.cxx
diff --git a/samples/OCCTOverview/code/AdaptorCurve2d_AIS.h b/samples/qt/OCCTOverview/code/AdaptorCurve2d_AIS.h
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorCurve2d_AIS.h
rename to samples/qt/OCCTOverview/code/AdaptorCurve2d_AIS.h
diff --git a/samples/OCCTOverview/code/AdaptorCurve_AIS.cxx b/samples/qt/OCCTOverview/code/AdaptorCurve_AIS.cxx
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorCurve_AIS.cxx
rename to samples/qt/OCCTOverview/code/AdaptorCurve_AIS.cxx
diff --git a/samples/OCCTOverview/code/AdaptorCurve_AIS.h b/samples/qt/OCCTOverview/code/AdaptorCurve_AIS.h
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorCurve_AIS.h
rename to samples/qt/OCCTOverview/code/AdaptorCurve_AIS.h
diff --git a/samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx b/samples/qt/OCCTOverview/code/AdaptorPnt2d_AIS.cxx
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorPnt2d_AIS.cxx
rename to samples/qt/OCCTOverview/code/AdaptorPnt2d_AIS.cxx
diff --git a/samples/OCCTOverview/code/AdaptorPnt2d_AIS.h b/samples/qt/OCCTOverview/code/AdaptorPnt2d_AIS.h
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorPnt2d_AIS.h
rename to samples/qt/OCCTOverview/code/AdaptorPnt2d_AIS.h
diff --git a/samples/OCCTOverview/code/AdaptorVec_AIS.cxx b/samples/qt/OCCTOverview/code/AdaptorVec_AIS.cxx
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorVec_AIS.cxx
rename to samples/qt/OCCTOverview/code/AdaptorVec_AIS.cxx
diff --git a/samples/OCCTOverview/code/AdaptorVec_AIS.h b/samples/qt/OCCTOverview/code/AdaptorVec_AIS.h
similarity index 100%
rename from samples/OCCTOverview/code/AdaptorVec_AIS.h
rename to samples/qt/OCCTOverview/code/AdaptorVec_AIS.h
diff --git a/samples/OCCTOverview/code/BaseSample.cxx b/samples/qt/OCCTOverview/code/BaseSample.cxx
similarity index 100%
rename from samples/OCCTOverview/code/BaseSample.cxx
rename to samples/qt/OCCTOverview/code/BaseSample.cxx
diff --git a/samples/OCCTOverview/code/BaseSample.h b/samples/qt/OCCTOverview/code/BaseSample.h
similarity index 100%
rename from samples/OCCTOverview/code/BaseSample.h
rename to samples/qt/OCCTOverview/code/BaseSample.h
diff --git a/samples/OCCTOverview/code/DataExchange.xml b/samples/qt/OCCTOverview/code/DataExchange.xml
similarity index 100%
rename from samples/OCCTOverview/code/DataExchange.xml
rename to samples/qt/OCCTOverview/code/DataExchange.xml
diff --git a/samples/OCCTOverview/code/DataExchangeSamples.cxx b/samples/qt/OCCTOverview/code/DataExchangeSamples.cxx
similarity index 100%
rename from samples/OCCTOverview/code/DataExchangeSamples.cxx
rename to samples/qt/OCCTOverview/code/DataExchangeSamples.cxx
diff --git a/samples/OCCTOverview/code/DataExchangeSamples.h b/samples/qt/OCCTOverview/code/DataExchangeSamples.h
similarity index 100%
rename from samples/OCCTOverview/code/DataExchangeSamples.h
rename to samples/qt/OCCTOverview/code/DataExchangeSamples.h
diff --git a/samples/OCCTOverview/code/Geometry.xml b/samples/qt/OCCTOverview/code/Geometry.xml
similarity index 100%
rename from samples/OCCTOverview/code/Geometry.xml
rename to samples/qt/OCCTOverview/code/Geometry.xml
diff --git a/samples/OCCTOverview/code/GeometrySamples.cxx b/samples/qt/OCCTOverview/code/GeometrySamples.cxx
similarity index 100%
rename from samples/OCCTOverview/code/GeometrySamples.cxx
rename to samples/qt/OCCTOverview/code/GeometrySamples.cxx
diff --git a/samples/OCCTOverview/code/GeometrySamples.h b/samples/qt/OCCTOverview/code/GeometrySamples.h
similarity index 100%
rename from samples/OCCTOverview/code/GeometrySamples.h
rename to samples/qt/OCCTOverview/code/GeometrySamples.h
diff --git a/samples/OCCTOverview/code/MakeBottle.cxx b/samples/qt/OCCTOverview/code/MakeBottle.cxx
similarity index 100%
rename from samples/OCCTOverview/code/MakeBottle.cxx
rename to samples/qt/OCCTOverview/code/MakeBottle.cxx
diff --git a/samples/OCCTOverview/code/MakeBottle.h b/samples/qt/OCCTOverview/code/MakeBottle.h
similarity index 100%
rename from samples/OCCTOverview/code/MakeBottle.h
rename to samples/qt/OCCTOverview/code/MakeBottle.h
diff --git a/samples/OCCTOverview/code/Ocaf.xml b/samples/qt/OCCTOverview/code/Ocaf.xml
similarity index 100%
rename from samples/OCCTOverview/code/Ocaf.xml
rename to samples/qt/OCCTOverview/code/Ocaf.xml
diff --git a/samples/OCCTOverview/code/OcafSamples.cxx b/samples/qt/OCCTOverview/code/OcafSamples.cxx
similarity index 100%
rename from samples/OCCTOverview/code/OcafSamples.cxx
rename to samples/qt/OCCTOverview/code/OcafSamples.cxx
diff --git a/samples/OCCTOverview/code/OcafSamples.h b/samples/qt/OCCTOverview/code/OcafSamples.h
similarity index 100%
rename from samples/OCCTOverview/code/OcafSamples.h
rename to samples/qt/OCCTOverview/code/OcafSamples.h
diff --git a/samples/OCCTOverview/code/Sample2D_Face.cxx b/samples/qt/OCCTOverview/code/Sample2D_Face.cxx
similarity index 100%
rename from samples/OCCTOverview/code/Sample2D_Face.cxx
rename to samples/qt/OCCTOverview/code/Sample2D_Face.cxx
diff --git a/samples/OCCTOverview/code/Sample2D_Face.h b/samples/qt/OCCTOverview/code/Sample2D_Face.h
similarity index 100%
rename from samples/OCCTOverview/code/Sample2D_Face.h
rename to samples/qt/OCCTOverview/code/Sample2D_Face.h
diff --git a/samples/OCCTOverview/code/Sample2D_Image.cxx b/samples/qt/OCCTOverview/code/Sample2D_Image.cxx
similarity index 100%
rename from samples/OCCTOverview/code/Sample2D_Image.cxx
rename to samples/qt/OCCTOverview/code/Sample2D_Image.cxx
diff --git a/samples/OCCTOverview/code/Sample2D_Image.h b/samples/qt/OCCTOverview/code/Sample2D_Image.h
similarity index 100%
rename from samples/OCCTOverview/code/Sample2D_Image.h
rename to samples/qt/OCCTOverview/code/Sample2D_Image.h
diff --git a/samples/OCCTOverview/code/Sample2D_Markers.cxx b/samples/qt/OCCTOverview/code/Sample2D_Markers.cxx
similarity index 100%
rename from samples/OCCTOverview/code/Sample2D_Markers.cxx
rename to samples/qt/OCCTOverview/code/Sample2D_Markers.cxx
diff --git a/samples/OCCTOverview/code/Sample2D_Markers.h b/samples/qt/OCCTOverview/code/Sample2D_Markers.h
similarity index 100%
rename from samples/OCCTOverview/code/Sample2D_Markers.h
rename to samples/qt/OCCTOverview/code/Sample2D_Markers.h
diff --git a/samples/OCCTOverview/code/Samples.qrc b/samples/qt/OCCTOverview/code/Samples.qrc
similarity index 100%
rename from samples/OCCTOverview/code/Samples.qrc
rename to samples/qt/OCCTOverview/code/Samples.qrc
diff --git a/samples/OCCTOverview/code/TOcafFunction_BoxDriver.cxx b/samples/qt/OCCTOverview/code/TOcafFunction_BoxDriver.cxx
similarity index 100%
rename from samples/OCCTOverview/code/TOcafFunction_BoxDriver.cxx
rename to samples/qt/OCCTOverview/code/TOcafFunction_BoxDriver.cxx
diff --git a/samples/OCCTOverview/code/TOcafFunction_BoxDriver.h b/samples/qt/OCCTOverview/code/TOcafFunction_BoxDriver.h
similarity index 100%
rename from samples/OCCTOverview/code/TOcafFunction_BoxDriver.h
rename to samples/qt/OCCTOverview/code/TOcafFunction_BoxDriver.h
diff --git a/samples/OCCTOverview/code/TOcafFunction_CutDriver.cxx b/samples/qt/OCCTOverview/code/TOcafFunction_CutDriver.cxx
similarity index 100%
rename from samples/OCCTOverview/code/TOcafFunction_CutDriver.cxx
rename to samples/qt/OCCTOverview/code/TOcafFunction_CutDriver.cxx
diff --git a/samples/OCCTOverview/code/TOcafFunction_CutDriver.h b/samples/qt/OCCTOverview/code/TOcafFunction_CutDriver.h
similarity index 100%
rename from samples/OCCTOverview/code/TOcafFunction_CutDriver.h
rename to samples/qt/OCCTOverview/code/TOcafFunction_CutDriver.h
diff --git a/samples/OCCTOverview/code/TOcafFunction_CylDriver.cxx b/samples/qt/OCCTOverview/code/TOcafFunction_CylDriver.cxx
similarity index 100%
rename from samples/OCCTOverview/code/TOcafFunction_CylDriver.cxx
rename to samples/qt/OCCTOverview/code/TOcafFunction_CylDriver.cxx
diff --git a/samples/OCCTOverview/code/TOcafFunction_CylDriver.h b/samples/qt/OCCTOverview/code/TOcafFunction_CylDriver.h
similarity index 100%
rename from samples/OCCTOverview/code/TOcafFunction_CylDriver.h
rename to samples/qt/OCCTOverview/code/TOcafFunction_CylDriver.h
diff --git a/samples/OCCTOverview/code/TOcaf_Application.cxx b/samples/qt/OCCTOverview/code/TOcaf_Application.cxx
similarity index 100%
rename from samples/OCCTOverview/code/TOcaf_Application.cxx
rename to samples/qt/OCCTOverview/code/TOcaf_Application.cxx
diff --git a/samples/OCCTOverview/code/TOcaf_Application.h b/samples/qt/OCCTOverview/code/TOcaf_Application.h
similarity index 100%
rename from samples/OCCTOverview/code/TOcaf_Application.h
rename to samples/qt/OCCTOverview/code/TOcaf_Application.h
diff --git a/samples/OCCTOverview/code/Topology.xml b/samples/qt/OCCTOverview/code/Topology.xml
similarity index 100%
rename from samples/OCCTOverview/code/Topology.xml
rename to samples/qt/OCCTOverview/code/Topology.xml
diff --git a/samples/OCCTOverview/code/TopologySamples.cxx b/samples/qt/OCCTOverview/code/TopologySamples.cxx
similarity index 100%
rename from samples/OCCTOverview/code/TopologySamples.cxx
rename to samples/qt/OCCTOverview/code/TopologySamples.cxx
diff --git a/samples/OCCTOverview/code/TopologySamples.h b/samples/qt/OCCTOverview/code/TopologySamples.h
similarity index 100%
rename from samples/OCCTOverview/code/TopologySamples.h
rename to samples/qt/OCCTOverview/code/TopologySamples.h
diff --git a/samples/OCCTOverview/code/Triangulation.xml b/samples/qt/OCCTOverview/code/Triangulation.xml
similarity index 100%
rename from samples/OCCTOverview/code/Triangulation.xml
rename to samples/qt/OCCTOverview/code/Triangulation.xml
diff --git a/samples/OCCTOverview/code/TriangulationSamples.cxx b/samples/qt/OCCTOverview/code/TriangulationSamples.cxx
similarity index 100%
rename from samples/OCCTOverview/code/TriangulationSamples.cxx
rename to samples/qt/OCCTOverview/code/TriangulationSamples.cxx
diff --git a/samples/OCCTOverview/code/TriangulationSamples.h b/samples/qt/OCCTOverview/code/TriangulationSamples.h
similarity index 100%
rename from samples/OCCTOverview/code/TriangulationSamples.h
rename to samples/qt/OCCTOverview/code/TriangulationSamples.h
diff --git a/samples/OCCTOverview/code/Viewer2d.xml b/samples/qt/OCCTOverview/code/Viewer2d.xml
similarity index 100%
rename from samples/OCCTOverview/code/Viewer2d.xml
rename to samples/qt/OCCTOverview/code/Viewer2d.xml
diff --git a/samples/OCCTOverview/code/Viewer2dSamples.cxx b/samples/qt/OCCTOverview/code/Viewer2dSamples.cxx
similarity index 100%
rename from samples/OCCTOverview/code/Viewer2dSamples.cxx
rename to samples/qt/OCCTOverview/code/Viewer2dSamples.cxx
diff --git a/samples/OCCTOverview/code/Viewer2dSamples.h b/samples/qt/OCCTOverview/code/Viewer2dSamples.h
similarity index 100%
rename from samples/OCCTOverview/code/Viewer2dSamples.h
rename to samples/qt/OCCTOverview/code/Viewer2dSamples.h
diff --git a/samples/OCCTOverview/code/Viewer3d.xml b/samples/qt/OCCTOverview/code/Viewer3d.xml
similarity index 100%
rename from samples/OCCTOverview/code/Viewer3d.xml
rename to samples/qt/OCCTOverview/code/Viewer3d.xml
diff --git a/samples/OCCTOverview/code/Viewer3dSamples.cxx b/samples/qt/OCCTOverview/code/Viewer3dSamples.cxx
similarity index 100%
rename from samples/OCCTOverview/code/Viewer3dSamples.cxx
rename to samples/qt/OCCTOverview/code/Viewer3dSamples.cxx
diff --git a/samples/OCCTOverview/code/Viewer3dSamples.h b/samples/qt/OCCTOverview/code/Viewer3dSamples.h
similarity index 100%
rename from samples/OCCTOverview/code/Viewer3dSamples.h
rename to samples/qt/OCCTOverview/code/Viewer3dSamples.h
diff --git a/samples/qt/OCCTOverview/src/ApplicationCommon.cxx b/samples/qt/OCCTOverview/src/ApplicationCommon.cxx
index 49d9e894d4..5754c96e96 100644
--- a/samples/qt/OCCTOverview/src/ApplicationCommon.cxx
+++ b/samples/qt/OCCTOverview/src/ApplicationCommon.cxx
@@ -329,7 +329,7 @@ TCollection_AsciiString ApplicationCommonWindow::getSampleSourceDir()
     TCollection_AsciiString aCasRoot = OSD_Environment("CASROOT").Value();
     if (!aCasRoot.IsEmpty())
     {
-      aSampleSourceDir = aCasRoot + "/samples/OCCTOverview/code";
+      aSampleSourceDir = aCasRoot + "/samples/qt/OCCTOverview/code";
     }
   }
   return aSampleSourceDir;
diff --git a/samples/qt/OCCTOverview/src/FILES b/samples/qt/OCCTOverview/src/FILES
deleted file mode 100644
index 64a1f81afc..0000000000
--- a/samples/qt/OCCTOverview/src/FILES
+++ /dev/null
@@ -1,19 +0,0 @@
-ApplicationCommon.cxx
-ApplicationCommon.h
-CommonSample.h
-DocumentCommon.cxx
-DocumentCommon.h
-GeomWidget.cxx
-GeomWidget.h
-Main.cxx
-OcctHighlighter.cxx
-OcctHighlighter.h
-OcctWindow.cxx
-OcctWindow.h
-OCCTOverview.qrc
-TranslateDialog.h
-TranslateDialog.cxx
-Transparency.cxx
-Transparency.h
-View.cxx
-View.h
diff --git a/samples/qt/Tutorial/CMakeLists.txt b/samples/qt/Tutorial/CMakeLists.txt
index e9f30e2de6..e9f458b364 100644
--- a/samples/qt/Tutorial/CMakeLists.txt
+++ b/samples/qt/Tutorial/CMakeLists.txt
@@ -1,11 +1,18 @@
 project(Tutorial)
 
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
+# Sample configuration
+set (EXECUTABLE_PROJECT ON)
+set (USE_QT ON)
+set (RELATIVE_DIR "samples/qt")
+set (TARGET_FOLDER "Samples")
+
+include_directories("${CMAKE_BINARY_DIR}/${INSTALL_DIR_INCLUDE}/${RELATIVE_DIR}")
 include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Interface/src")
 include_directories("${OCCT_ROOT_DIR}/${RELATIVE_DIR}/Common/src")
+
 OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit)
-OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit_prepare_sample)
 
-ADD_DEFINITIONS(-DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS)
+# Target-specific definitions
+target_compile_definitions(Tutorial PRIVATE -DNO_COMMONSAMPLE_EXPORTS -DNO_IESAMPLE_EXPORTS)
 
 
diff --git a/samples/qt/Tutorial/EXTERNLIB b/samples/qt/Tutorial/EXTERNLIB
deleted file mode 100644
index ec996652e0..0000000000
--- a/samples/qt/Tutorial/EXTERNLIB
+++ /dev/null
@@ -1,26 +0,0 @@
-TKBRep
-TKBool
-TKBO
-TKCDF
-TKFillet
-TKG2d
-TKG3d
-TKGeomAlgo
-TKGeomBase
-TKernel
-TKHLR
-TKDEIGES
-TKMath
-TKMesh
-TKOffset
-TKOpenGl
-TKPrim
-TKService
-TKShHealing
-TKDESTEP
-TKDESTL
-TKTopAlgo
-TKV3d
-TKDEVRML
-TKXSBase
-
diff --git a/samples/qt/Tutorial/EXTERNLIB.cmake b/samples/qt/Tutorial/EXTERNLIB.cmake
new file mode 100644
index 0000000000..0390483836
--- /dev/null
+++ b/samples/qt/Tutorial/EXTERNLIB.cmake
@@ -0,0 +1,28 @@
+# External dependencies for Tutorial sample
+set(OCCT_Tutorial_EXTERNAL_LIBS
+  TKBRep
+  TKBool
+  TKBO
+  TKCDF
+  TKFillet
+  TKG2d
+  TKG3d
+  TKGeomAlgo
+  TKGeomBase
+  TKernel
+  TKHLR
+  TKDEIGES
+  TKMath
+  TKMesh
+  TKOffset
+  TKOpenGl
+  TKPrim
+  TKService
+  TKShHealing
+  TKDESTEP
+  TKDESTL
+  TKTopAlgo
+  TKV3d
+  TKDEVRML
+  TKXSBase
+)
\ No newline at end of file
diff --git a/samples/qt/Tutorial/FILES b/samples/qt/Tutorial/FILES
deleted file mode 100644
index ca4f0e567b..0000000000
--- a/samples/qt/Tutorial/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTERNLIB
-PACKAGES
diff --git a/samples/qt/Tutorial/FILES.cmake b/samples/qt/Tutorial/FILES.cmake
new file mode 100644
index 0000000000..582da6d718
--- /dev/null
+++ b/samples/qt/Tutorial/FILES.cmake
@@ -0,0 +1,36 @@
+# Source files for Tutorial sample
+set(OCCT_Tutorial_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}")
+
+set(OCCT_Tutorial_FILES
+  src/ApplicationTut.cxx
+  src/ApplicationTut.h
+  src/DocumentTut.cxx
+  src/DocumentTut.h
+  src/Main.cxx
+  src/MakeBottle.cxx
+  src/Tutorial-icon.ts
+  src/Tutorial-string.ts
+  ../Common/src/ApplicationCommon.cxx
+  ../Common/src/ApplicationCommon.h
+  ../Common/src/Common-icon.ts
+  ../Common/src/Common-string.ts
+  ../Common/src/CommonSample.h
+  ../Common/src/DocumentCommon.cxx
+  ../Common/src/DocumentCommon.h
+  ../Common/src/Material.cxx
+  ../Common/src/Material.h
+  ../Common/src/MDIWindow.cxx
+  ../Common/src/MDIWindow.h
+  ../Common/src/OcctWindow.cxx
+  ../Common/src/OcctWindow.h
+  ../Common/src/Transparency.cxx
+  ../Common/src/Transparency.h
+  ../Common/src/View.cxx
+  ../Common/src/View.h
+  ../Interface/src/Application.cxx
+  ../Interface/src/Application.h
+  ../Interface/src/IESample.h
+  ../Interface/src/Interface-string.ts
+  ../Interface/src/Translate.cxx
+  ../Interface/src/Translate.h
+)
\ No newline at end of file
diff --git a/samples/qt/Tutorial/PACKAGES b/samples/qt/Tutorial/PACKAGES
deleted file mode 100644
index bd31a4fb0b..0000000000
--- a/samples/qt/Tutorial/PACKAGES
+++ /dev/null
@@ -1,2 +0,0 @@
-Tutorial/src
-Common/src
\ No newline at end of file
diff --git a/samples/qt/Tutorial/PACKAGES.cmake b/samples/qt/Tutorial/PACKAGES.cmake
new file mode 100644
index 0000000000..7ce8db3957
--- /dev/null
+++ b/samples/qt/Tutorial/PACKAGES.cmake
@@ -0,0 +1,4 @@
+# Packages for Tutorial sample
+set(OCCT_Tutorial_LIST_OF_PACKAGES
+  Tutorial
+)
\ No newline at end of file
diff --git a/samples/qt/Tutorial/src/FILES b/samples/qt/Tutorial/src/FILES
deleted file mode 100644
index 54bd00b648..0000000000
--- a/samples/qt/Tutorial/src/FILES
+++ /dev/null
@@ -1,8 +0,0 @@
-ApplicationTut.cxx
-ApplicationTut.h
-DocumentTut.cxx
-DocumentTut.h
-Main.cxx
-MakeBottle.cxx
-Tutorial-icon.ts
-Tutorial-string.ts