diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd7e03c..83236ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,40 +70,37 @@ include(cmake/Dependencies.cmake)
 
 # ── Subprojects (ordered by dependency) ─────────────────────────
 
-# Licensing SDK (built from source — cross-platform)
-add_subdirectory(anslicensing)
+# Core — licensing & infrastructure
+add_subdirectory(core/anslicensing)
+add_subdirectory(core/ANSLicensingSystem)
+add_subdirectory(core/ANSLibsLoader)
 
-# Infrastructure (depend on anslicensing)
-add_subdirectory(ANSLicensingSystem)
-add_subdirectory(ANSLibsLoader)
-
-# Core modules (minimal deps — most are cross-platform)
-add_subdirectory(ANSMOT)
-add_subdirectory(ANSUtilities)
-add_subdirectory(ANSODTrainingEngine)
+# Modules — feature DLLs (cross-platform)
+add_subdirectory(modules/ANSMOT)
+add_subdirectory(modules/ANSUtilities)
+add_subdirectory(modules/ANSTrainingEngine)
+add_subdirectory(modules/ANSLLM)
 
+# Integrations — hardware & protocol DLLs
 if(WIN32)
-    # Windows-only modules (LabVIEW, DirectX, ONVIF, etc.)
-    add_subdirectory(ANNHUB)
-    add_subdirectory(ANSIO)
-    add_subdirectory(ANSONVIF)
+    add_subdirectory(integrations/ANNHUB)
+    add_subdirectory(integrations/ANSIO)
+    add_subdirectory(integrations/ANSONVIF)
 endif()
+add_subdirectory(integrations/ANSPulsar)
+add_subdirectory(integrations/ANSRabbitMQ)
 
-add_subdirectory(ANSLLM)
-
-# Messaging — cross-platform if libs are available
-add_subdirectory(ANSPulsar)
-add_subdirectory(ANSRabbitMQ)
-
-# Engine layer (CUDA + inference frameworks)
+# Modules — engine layer (CUDA + inference frameworks)
 if(ANSCORE_HAS_CUDA)
-    add_subdirectory(ANSODEngine)
-    add_subdirectory(ANSOCR)
-    add_subdirectory(ANSFR)
-    add_subdirectory(ANSLPR)
+    add_subdirectory(modules/ANSODEngine)
+    add_subdirectory(modules/ANSOCR)
+    add_subdirectory(modules/ANSFR)
+    add_subdirectory(modules/ANSLPR)
 endif()
-
-add_subdirectory(ANSCV)
+add_subdirectory(modules/ANSCV)
 
 # Facade
 add_subdirectory(ANSLIB)
+
+# Tests
+add_subdirectory(tests)
diff --git a/build_all.bat b/build_all.bat
new file mode 100644
index 0000000..cdbcb2f
--- /dev/null
+++ b/build_all.bat
@@ -0,0 +1,12 @@
+@echo off
+call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+set CUDAHOSTCXX=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.44.35207\bin\Hostx64\x64\cl.exe
+cd /d C:\Projects\CLionProjects\ANSCORE\cmake-build-release
+rd /s /q CMakeFiles CMakeCache.txt 2>nul
+cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_COMPILER="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.1/bin/nvcc.exe" -DCUDAToolkit_ROOT="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v13.1"
+if %ERRORLEVEL% neq 0 (
+    echo CMAKE_CONFIGURE_FAILED
+    exit /b 1
+)
+ninja ANSLIB -j 20
+echo BUILD_EXIT_CODE=%ERRORLEVEL%
diff --git a/ANSLibsLoader/ANSLibsLoader.cpp b/core/ANSLibsLoader/ANSLibsLoader.cpp
similarity index 100%
rename from ANSLibsLoader/ANSLibsLoader.cpp
rename to core/ANSLibsLoader/ANSLibsLoader.cpp
diff --git a/ANSLibsLoader/ANSLibsLoader.def b/core/ANSLibsLoader/ANSLibsLoader.def
similarity index 100%
rename from ANSLibsLoader/ANSLibsLoader.def
rename to core/ANSLibsLoader/ANSLibsLoader.def
diff --git a/ANSLibsLoader/CMakeLists.txt b/core/ANSLibsLoader/CMakeLists.txt
similarity index 100%
rename from ANSLibsLoader/CMakeLists.txt
rename to core/ANSLibsLoader/CMakeLists.txt
diff --git a/ANSLibsLoader/CvLoader.cpp b/core/ANSLibsLoader/CvLoader.cpp
similarity index 100%
rename from ANSLibsLoader/CvLoader.cpp
rename to core/ANSLibsLoader/CvLoader.cpp
diff --git a/ANSLibsLoader/DynLibUtils.cpp b/core/ANSLibsLoader/DynLibUtils.cpp
similarity index 100%
rename from ANSLibsLoader/DynLibUtils.cpp
rename to core/ANSLibsLoader/DynLibUtils.cpp
diff --git a/ANSLibsLoader/EPLoader.cpp b/core/ANSLibsLoader/EPLoader.cpp
similarity index 100%
rename from ANSLibsLoader/EPLoader.cpp
rename to core/ANSLibsLoader/EPLoader.cpp
diff --git a/ANSLibsLoader/NvDynLoader.cpp b/core/ANSLibsLoader/NvDynLoader.cpp
similarity index 100%
rename from ANSLibsLoader/NvDynLoader.cpp
rename to core/ANSLibsLoader/NvDynLoader.cpp
diff --git a/ANSLibsLoader/OvLoader.cpp b/core/ANSLibsLoader/OvLoader.cpp
similarity index 100%
rename from ANSLibsLoader/OvLoader.cpp
rename to core/ANSLibsLoader/OvLoader.cpp
diff --git a/ANSLibsLoader/dllmain.cpp b/core/ANSLibsLoader/dllmain.cpp
similarity index 100%
rename from ANSLibsLoader/dllmain.cpp
rename to core/ANSLibsLoader/dllmain.cpp
diff --git a/ANSLibsLoader/framework.h b/core/ANSLibsLoader/framework.h
similarity index 100%
rename from ANSLibsLoader/framework.h
rename to core/ANSLibsLoader/framework.h
diff --git a/ANSLibsLoader/include/ANSLibsLoader.h b/core/ANSLibsLoader/include/ANSLibsLoader.h
similarity index 100%
rename from ANSLibsLoader/include/ANSLibsLoader.h
rename to core/ANSLibsLoader/include/ANSLibsLoader.h
diff --git a/ANSLibsLoader/include/CvLoader.h b/core/ANSLibsLoader/include/CvLoader.h
similarity index 100%
rename from ANSLibsLoader/include/CvLoader.h
rename to core/ANSLibsLoader/include/CvLoader.h
diff --git a/ANSLibsLoader/include/DynLibUtils.h b/core/ANSLibsLoader/include/DynLibUtils.h
similarity index 100%
rename from ANSLibsLoader/include/DynLibUtils.h
rename to core/ANSLibsLoader/include/DynLibUtils.h
diff --git a/ANSLibsLoader/include/EPLoader.h b/core/ANSLibsLoader/include/EPLoader.h
similarity index 100%
rename from ANSLibsLoader/include/EPLoader.h
rename to core/ANSLibsLoader/include/EPLoader.h
diff --git a/ANSLibsLoader/include/NvDynLoader.h b/core/ANSLibsLoader/include/NvDynLoader.h
similarity index 100%
rename from ANSLibsLoader/include/NvDynLoader.h
rename to core/ANSLibsLoader/include/NvDynLoader.h
diff --git a/ANSLibsLoader/include/OvLoader.h b/core/ANSLibsLoader/include/OvLoader.h
similarity index 100%
rename from ANSLibsLoader/include/OvLoader.h
rename to core/ANSLibsLoader/include/OvLoader.h
diff --git a/ANNHUB/pch.cpp b/core/ANSLibsLoader/pch.cpp
similarity index 100%
rename from ANNHUB/pch.cpp
rename to core/ANSLibsLoader/pch.cpp
diff --git a/ANSLPR/pch.h b/core/ANSLibsLoader/pch.h
similarity index 100%
rename from ANSLPR/pch.h
rename to core/ANSLibsLoader/pch.h
diff --git a/ANSLicensingSystem/ANSLicense.cpp b/core/ANSLicensingSystem/ANSLicense.cpp
similarity index 100%
rename from ANSLicensingSystem/ANSLicense.cpp
rename to core/ANSLicensingSystem/ANSLicense.cpp
diff --git a/ANSLicensingSystem/ANSLicense.h b/core/ANSLicensingSystem/ANSLicense.h
similarity index 100%
rename from ANSLicensingSystem/ANSLicense.h
rename to core/ANSLicensingSystem/ANSLicense.h
diff --git a/ANSLicensingSystem/CMakeLists.txt b/core/ANSLicensingSystem/CMakeLists.txt
similarity index 94%
rename from ANSLicensingSystem/CMakeLists.txt
rename to core/ANSLicensingSystem/CMakeLists.txt
index b21c925..73f2d5b 100644
--- a/ANSLicensingSystem/CMakeLists.txt
+++ b/core/ANSLicensingSystem/CMakeLists.txt
@@ -43,10 +43,10 @@ target_link_directories(ANSLicensingSystem PRIVATE
 
 # BASE64 class — not exported from anslicensing.dll, compile directly
 target_include_directories(ANSLicensingSystem PRIVATE
-    ${CMAKE_SOURCE_DIR}/anslicensing
+    ${CMAKE_SOURCE_DIR}/core/anslicensing
 )
 target_sources(ANSLicensingSystem PRIVATE
-    ${CMAKE_SOURCE_DIR}/anslicensing/base64.cpp
+    ${CMAKE_SOURCE_DIR}/core/anslicensing/base64.cpp
 )
 
 target_link_libraries(ANSLicensingSystem PRIVATE
diff --git a/ANSLicensingSystem/Utility.cpp b/core/ANSLicensingSystem/Utility.cpp
similarity index 100%
rename from ANSLicensingSystem/Utility.cpp
rename to core/ANSLicensingSystem/Utility.cpp
diff --git a/ANSLicensingSystem/Utility.h b/core/ANSLicensingSystem/Utility.h
similarity index 100%
rename from ANSLicensingSystem/Utility.h
rename to core/ANSLicensingSystem/Utility.h
diff --git a/ANSLicensingSystem/dllmain.cpp b/core/ANSLicensingSystem/dllmain.cpp
similarity index 100%
rename from ANSLicensingSystem/dllmain.cpp
rename to core/ANSLicensingSystem/dllmain.cpp
diff --git a/ANNHUB/framework.h b/core/ANSLicensingSystem/framework.h
similarity index 100%
rename from ANNHUB/framework.h
rename to core/ANSLicensingSystem/framework.h
diff --git a/ANSCV/pch.cpp b/core/ANSLicensingSystem/pch.cpp
similarity index 100%
rename from ANSCV/pch.cpp
rename to core/ANSLicensingSystem/pch.cpp
diff --git a/ANSLibsLoader/pch.h b/core/ANSLicensingSystem/pch.h
similarity index 100%
rename from ANSLibsLoader/pch.h
rename to core/ANSLicensingSystem/pch.h
diff --git a/anslicensing/CMakeLists.txt b/core/anslicensing/CMakeLists.txt
similarity index 100%
rename from anslicensing/CMakeLists.txt
rename to core/anslicensing/CMakeLists.txt
diff --git a/anslicensing/base32.cpp b/core/anslicensing/base32.cpp
similarity index 100%
rename from anslicensing/base32.cpp
rename to core/anslicensing/base32.cpp
diff --git a/anslicensing/base32.h b/core/anslicensing/base32.h
similarity index 100%
rename from anslicensing/base32.h
rename to core/anslicensing/base32.h
diff --git a/anslicensing/base64.cpp b/core/anslicensing/base64.cpp
similarity index 100%
rename from anslicensing/base64.cpp
rename to core/anslicensing/base64.cpp
diff --git a/anslicensing/base64.h b/core/anslicensing/base64.h
similarity index 100%
rename from anslicensing/base64.h
rename to core/anslicensing/base64.h
diff --git a/anslicensing/bigint.cpp b/core/anslicensing/bigint.cpp
similarity index 100%
rename from anslicensing/bigint.cpp
rename to core/anslicensing/bigint.cpp
diff --git a/anslicensing/bigint.h b/core/anslicensing/bigint.h
similarity index 100%
rename from anslicensing/bigint.h
rename to core/anslicensing/bigint.h
diff --git a/anslicensing/bitstream.cpp b/core/anslicensing/bitstream.cpp
similarity index 100%
rename from anslicensing/bitstream.cpp
rename to core/anslicensing/bitstream.cpp
diff --git a/anslicensing/bitstream.h b/core/anslicensing/bitstream.h
similarity index 100%
rename from anslicensing/bitstream.h
rename to core/anslicensing/bitstream.h
diff --git a/anslicensing/bitstream2.cpp b/core/anslicensing/bitstream2.cpp
similarity index 100%
rename from anslicensing/bitstream2.cpp
rename to core/anslicensing/bitstream2.cpp
diff --git a/anslicensing/bitstream2.h b/core/anslicensing/bitstream2.h
similarity index 100%
rename from anslicensing/bitstream2.h
rename to core/anslicensing/bitstream2.h
diff --git a/anslicensing/bitstream3.cpp b/core/anslicensing/bitstream3.cpp
similarity index 100%
rename from anslicensing/bitstream3.cpp
rename to core/anslicensing/bitstream3.cpp
diff --git a/anslicensing/bitstream3.h b/core/anslicensing/bitstream3.h
similarity index 100%
rename from anslicensing/bitstream3.h
rename to core/anslicensing/bitstream3.h
diff --git a/anslicensing/bitstruct.cpp b/core/anslicensing/bitstruct.cpp
similarity index 100%
rename from anslicensing/bitstruct.cpp
rename to core/anslicensing/bitstruct.cpp
diff --git a/anslicensing/bitstruct.h b/core/anslicensing/bitstruct.h
similarity index 100%
rename from anslicensing/bitstruct.h
rename to core/anslicensing/bitstruct.h
diff --git a/anslicensing/certificate.cpp b/core/anslicensing/certificate.cpp
similarity index 100%
rename from anslicensing/certificate.cpp
rename to core/anslicensing/certificate.cpp
diff --git a/anslicensing/certificate.h b/core/anslicensing/certificate.h
similarity index 100%
rename from anslicensing/certificate.h
rename to core/anslicensing/certificate.h
diff --git a/anslicensing/crc32.cpp b/core/anslicensing/crc32.cpp
similarity index 100%
rename from anslicensing/crc32.cpp
rename to core/anslicensing/crc32.cpp
diff --git a/anslicensing/crc32.h b/core/anslicensing/crc32.h
similarity index 100%
rename from anslicensing/crc32.h
rename to core/anslicensing/crc32.h
diff --git a/anslicensing/cwrap.cpp b/core/anslicensing/cwrap.cpp
similarity index 100%
rename from anslicensing/cwrap.cpp
rename to core/anslicensing/cwrap.cpp
diff --git a/anslicensing/download.cpp b/core/anslicensing/download.cpp
similarity index 100%
rename from anslicensing/download.cpp
rename to core/anslicensing/download.cpp
diff --git a/anslicensing/download.h b/core/anslicensing/download.h
similarity index 100%
rename from anslicensing/download.h
rename to core/anslicensing/download.h
diff --git a/anslicensing/ec2m.cpp b/core/anslicensing/ec2m.cpp
similarity index 100%
rename from anslicensing/ec2m.cpp
rename to core/anslicensing/ec2m.cpp
diff --git a/anslicensing/ec2m.h b/core/anslicensing/ec2m.h
similarity index 100%
rename from anslicensing/ec2m.h
rename to core/anslicensing/ec2m.h
diff --git a/anslicensing/ecc.cpp b/core/anslicensing/ecc.cpp
similarity index 100%
rename from anslicensing/ecc.cpp
rename to core/anslicensing/ecc.cpp
diff --git a/anslicensing/ecc.h b/core/anslicensing/ecc.h
similarity index 100%
rename from anslicensing/ecc.h
rename to core/anslicensing/ecc.h
diff --git a/anslicensing/except.cpp b/core/anslicensing/except.cpp
similarity index 100%
rename from anslicensing/except.cpp
rename to core/anslicensing/except.cpp
diff --git a/anslicensing/except.h b/core/anslicensing/except.h
similarity index 100%
rename from anslicensing/except.h
rename to core/anslicensing/except.h
diff --git a/anslicensing/generator.cpp b/core/anslicensing/generator.cpp
similarity index 100%
rename from anslicensing/generator.cpp
rename to core/anslicensing/generator.cpp
diff --git a/anslicensing/generator.h b/core/anslicensing/generator.h
similarity index 100%
rename from anslicensing/generator.h
rename to core/anslicensing/generator.h
diff --git a/anslicensing/helper.cpp b/core/anslicensing/helper.cpp
similarity index 100%
rename from anslicensing/helper.cpp
rename to core/anslicensing/helper.cpp
diff --git a/anslicensing/hwid.cpp b/core/anslicensing/hwid.cpp
similarity index 100%
rename from anslicensing/hwid.cpp
rename to core/anslicensing/hwid.cpp
diff --git a/anslicensing/hwid.h b/core/anslicensing/hwid.h
similarity index 100%
rename from anslicensing/hwid.h
rename to core/anslicensing/hwid.h
diff --git a/anslicensing/license.cpp b/core/anslicensing/license.cpp
similarity index 100%
rename from anslicensing/license.cpp
rename to core/anslicensing/license.cpp
diff --git a/anslicensing/license.h b/core/anslicensing/license.h
similarity index 100%
rename from anslicensing/license.h
rename to core/anslicensing/license.h
diff --git a/anslicensing/licensevalidationargs.cpp b/core/anslicensing/licensevalidationargs.cpp
similarity index 100%
rename from anslicensing/licensevalidationargs.cpp
rename to core/anslicensing/licensevalidationargs.cpp
diff --git a/anslicensing/licensevalidationargs.h b/core/anslicensing/licensevalidationargs.h
similarity index 100%
rename from anslicensing/licensevalidationargs.h
rename to core/anslicensing/licensevalidationargs.h
diff --git a/anslicensing/licensevalidationresult.cpp b/core/anslicensing/licensevalidationresult.cpp
similarity index 100%
rename from anslicensing/licensevalidationresult.cpp
rename to core/anslicensing/licensevalidationresult.cpp
diff --git a/anslicensing/licensevalidationresult.h b/core/anslicensing/licensevalidationresult.h
similarity index 100%
rename from anslicensing/licensevalidationresult.h
rename to core/anslicensing/licensevalidationresult.h
diff --git a/anslicensing/licensingclient.cpp b/core/anslicensing/licensingclient.cpp
similarity index 100%
rename from anslicensing/licensingclient.cpp
rename to core/anslicensing/licensingclient.cpp
diff --git a/anslicensing/licensingclient.h b/core/anslicensing/licensingclient.h
similarity index 100%
rename from anslicensing/licensingclient.h
rename to core/anslicensing/licensingclient.h
diff --git a/anslicensing/ntpclient.cpp b/core/anslicensing/ntpclient.cpp
similarity index 100%
rename from anslicensing/ntpclient.cpp
rename to core/anslicensing/ntpclient.cpp
diff --git a/anslicensing/ntpclient.h b/core/anslicensing/ntpclient.h
similarity index 100%
rename from anslicensing/ntpclient.h
rename to core/anslicensing/ntpclient.h
diff --git a/anslicensing/picojson.h b/core/anslicensing/picojson.h
similarity index 100%
rename from anslicensing/picojson.h
rename to core/anslicensing/picojson.h
diff --git a/anslicensing/precomp.cpp b/core/anslicensing/precomp.cpp
similarity index 100%
rename from anslicensing/precomp.cpp
rename to core/anslicensing/precomp.cpp
diff --git a/anslicensing/precomp.h b/core/anslicensing/precomp.h
similarity index 100%
rename from anslicensing/precomp.h
rename to core/anslicensing/precomp.h
diff --git a/anslicensing/prime.cpp b/core/anslicensing/prime.cpp
similarity index 100%
rename from anslicensing/prime.cpp
rename to core/anslicensing/prime.cpp
diff --git a/anslicensing/prime.h b/core/anslicensing/prime.h
similarity index 100%
rename from anslicensing/prime.h
rename to core/anslicensing/prime.h
diff --git a/anslicensing/propertycollection.h b/core/anslicensing/propertycollection.h
similarity index 100%
rename from anslicensing/propertycollection.h
rename to core/anslicensing/propertycollection.h
diff --git a/anslicensing/rand.cpp b/core/anslicensing/rand.cpp
similarity index 100%
rename from anslicensing/rand.cpp
rename to core/anslicensing/rand.cpp
diff --git a/anslicensing/rand.h b/core/anslicensing/rand.h
similarity index 100%
rename from anslicensing/rand.h
rename to core/anslicensing/rand.h
diff --git a/anslicensing/resource.h b/core/anslicensing/resource.h
similarity index 100%
rename from anslicensing/resource.h
rename to core/anslicensing/resource.h
diff --git a/anslicensing/sdkregistration.cpp b/core/anslicensing/sdkregistration.cpp
similarity index 100%
rename from anslicensing/sdkregistration.cpp
rename to core/anslicensing/sdkregistration.cpp
diff --git a/anslicensing/sdkregistration.h b/core/anslicensing/sdkregistration.h
similarity index 100%
rename from anslicensing/sdkregistration.h
rename to core/anslicensing/sdkregistration.h
diff --git a/anslicensing/sha1.cpp b/core/anslicensing/sha1.cpp
similarity index 100%
rename from anslicensing/sha1.cpp
rename to core/anslicensing/sha1.cpp
diff --git a/anslicensing/sha1.h b/core/anslicensing/sha1.h
similarity index 100%
rename from anslicensing/sha1.h
rename to core/anslicensing/sha1.h
diff --git a/anslicensing/template.cpp b/core/anslicensing/template.cpp
similarity index 100%
rename from anslicensing/template.cpp
rename to core/anslicensing/template.cpp
diff --git a/anslicensing/template.h b/core/anslicensing/template.h
similarity index 100%
rename from anslicensing/template.h
rename to core/anslicensing/template.h
diff --git a/anslicensing/tinyxml2.cpp b/core/anslicensing/tinyxml2.cpp
similarity index 100%
rename from anslicensing/tinyxml2.cpp
rename to core/anslicensing/tinyxml2.cpp
diff --git a/anslicensing/tinyxml2.h b/core/anslicensing/tinyxml2.h
similarity index 100%
rename from anslicensing/tinyxml2.h
rename to core/anslicensing/tinyxml2.h
diff --git a/anslicensing/uniconv.h b/core/anslicensing/uniconv.h
similarity index 100%
rename from anslicensing/uniconv.h
rename to core/anslicensing/uniconv.h
diff --git a/anslicensing/validator.cpp b/core/anslicensing/validator.cpp
similarity index 100%
rename from anslicensing/validator.cpp
rename to core/anslicensing/validator.cpp
diff --git a/anslicensing/validator.h b/core/anslicensing/validator.h
similarity index 100%
rename from anslicensing/validator.h
rename to core/anslicensing/validator.h
diff --git a/anslicensing/version.h b/core/anslicensing/version.h
similarity index 100%
rename from anslicensing/version.h
rename to core/anslicensing/version.h
diff --git a/anslicensing/wmihelper.h b/core/anslicensing/wmihelper.h
similarity index 100%
rename from anslicensing/wmihelper.h
rename to core/anslicensing/wmihelper.h
diff --git a/ANNHUB/ANSANNHUB.cpp b/integrations/ANNHUB/ANSANNHUB.cpp
similarity index 100%
rename from ANNHUB/ANSANNHUB.cpp
rename to integrations/ANNHUB/ANSANNHUB.cpp
diff --git a/ANNHUB/ANSANNHUB.h b/integrations/ANNHUB/ANSANNHUB.h
similarity index 100%
rename from ANNHUB/ANSANNHUB.h
rename to integrations/ANNHUB/ANSANNHUB.h
diff --git a/ANNHUB/CMakeLists.txt b/integrations/ANNHUB/CMakeLists.txt
similarity index 100%
rename from ANNHUB/CMakeLists.txt
rename to integrations/ANNHUB/CMakeLists.txt
diff --git a/ANNHUB/dllmain.cpp b/integrations/ANNHUB/dllmain.cpp
similarity index 100%
rename from ANNHUB/dllmain.cpp
rename to integrations/ANNHUB/dllmain.cpp
diff --git a/ANSCV/framework.h b/integrations/ANNHUB/framework.h
similarity index 100%
rename from ANSCV/framework.h
rename to integrations/ANNHUB/framework.h
diff --git a/ANSFR/pch.cpp b/integrations/ANNHUB/pch.cpp
similarity index 100%
rename from ANSFR/pch.cpp
rename to integrations/ANNHUB/pch.cpp
diff --git a/ANNHUB/pch.h b/integrations/ANNHUB/pch.h
similarity index 100%
rename from ANNHUB/pch.h
rename to integrations/ANNHUB/pch.h
diff --git a/ANSIO/CMakeLists.txt b/integrations/ANSIO/CMakeLists.txt
similarity index 100%
rename from ANSIO/CMakeLists.txt
rename to integrations/ANSIO/CMakeLists.txt
diff --git a/ANSIO/IOBox/cJSON.c b/integrations/ANSIO/IOBox/cJSON.c
similarity index 100%
rename from ANSIO/IOBox/cJSON.c
rename to integrations/ANSIO/IOBox/cJSON.c
diff --git a/ANSIO/IOBox/cJSON.h b/integrations/ANSIO/IOBox/cJSON.h
similarity index 100%
rename from ANSIO/IOBox/cJSON.h
rename to integrations/ANSIO/IOBox/cJSON.h
diff --git a/ANSIO/IOBox/cJSON_Utils.c b/integrations/ANSIO/IOBox/cJSON_Utils.c
similarity index 100%
rename from ANSIO/IOBox/cJSON_Utils.c
rename to integrations/ANSIO/IOBox/cJSON_Utils.c
diff --git a/ANSIO/IOBox/cJSON_Utils.h b/integrations/ANSIO/IOBox/cJSON_Utils.h
similarity index 100%
rename from ANSIO/IOBox/cJSON_Utils.h
rename to integrations/ANSIO/IOBox/cJSON_Utils.h
diff --git a/ANSIO/IOBox/iobox_api.cpp b/integrations/ANSIO/IOBox/iobox_api.cpp
similarity index 100%
rename from ANSIO/IOBox/iobox_api.cpp
rename to integrations/ANSIO/IOBox/iobox_api.cpp
diff --git a/ANSIO/IOBox/iobox_api.h b/integrations/ANSIO/IOBox/iobox_api.h
similarity index 100%
rename from ANSIO/IOBox/iobox_api.h
rename to integrations/ANSIO/IOBox/iobox_api.h
diff --git a/ANSIO/IOBox/main.cpp b/integrations/ANSIO/IOBox/main.cpp
similarity index 100%
rename from ANSIO/IOBox/main.cpp
rename to integrations/ANSIO/IOBox/main.cpp
diff --git a/ANSIO/IOBox/mbedtls/aes.c b/integrations/ANSIO/IOBox/mbedtls/aes.c
similarity index 100%
rename from ANSIO/IOBox/mbedtls/aes.c
rename to integrations/ANSIO/IOBox/mbedtls/aes.c
diff --git a/ANSIO/IOBox/mbedtls/aes.h b/integrations/ANSIO/IOBox/mbedtls/aes.h
similarity index 100%
rename from ANSIO/IOBox/mbedtls/aes.h
rename to integrations/ANSIO/IOBox/mbedtls/aes.h
diff --git a/ANSIO/IOBox/mbedtls/base64.c b/integrations/ANSIO/IOBox/mbedtls/base64.c
similarity index 100%
rename from ANSIO/IOBox/mbedtls/base64.c
rename to integrations/ANSIO/IOBox/mbedtls/base64.c
diff --git a/ANSIO/IOBox/mbedtls/base64.h b/integrations/ANSIO/IOBox/mbedtls/base64.h
similarity index 100%
rename from ANSIO/IOBox/mbedtls/base64.h
rename to integrations/ANSIO/IOBox/mbedtls/base64.h
diff --git a/ANSIO/IOBox/mbedtls/check_config.h b/integrations/ANSIO/IOBox/mbedtls/check_config.h
similarity index 100%
rename from ANSIO/IOBox/mbedtls/check_config.h
rename to integrations/ANSIO/IOBox/mbedtls/check_config.h
diff --git a/ANSIO/IOBox/mbedtls/config.h b/integrations/ANSIO/IOBox/mbedtls/config.h
similarity index 100%
rename from ANSIO/IOBox/mbedtls/config.h
rename to integrations/ANSIO/IOBox/mbedtls/config.h
diff --git a/ANSIO/IOBox/mbedtls/platform.h b/integrations/ANSIO/IOBox/mbedtls/platform.h
similarity index 100%
rename from ANSIO/IOBox/mbedtls/platform.h
rename to integrations/ANSIO/IOBox/mbedtls/platform.h
diff --git a/ANSIO/IOBox/mbedtls/sha256.c b/integrations/ANSIO/IOBox/mbedtls/sha256.c
similarity index 100%
rename from ANSIO/IOBox/mbedtls/sha256.c
rename to integrations/ANSIO/IOBox/mbedtls/sha256.c
diff --git a/ANSIO/IOBox/mbedtls/sha256.h b/integrations/ANSIO/IOBox/mbedtls/sha256.h
similarity index 100%
rename from ANSIO/IOBox/mbedtls/sha256.h
rename to integrations/ANSIO/IOBox/mbedtls/sha256.h
diff --git a/ANSIO/dllmain.cpp b/integrations/ANSIO/dllmain.cpp
similarity index 100%
rename from ANSIO/dllmain.cpp
rename to integrations/ANSIO/dllmain.cpp
diff --git a/ANSFR/framework.h b/integrations/ANSIO/framework.h
similarity index 100%
rename from ANSFR/framework.h
rename to integrations/ANSIO/framework.h
diff --git a/ANSIO/pch.cpp b/integrations/ANSIO/pch.cpp
similarity index 100%
rename from ANSIO/pch.cpp
rename to integrations/ANSIO/pch.cpp
diff --git a/ANSIO/pch.h b/integrations/ANSIO/pch.h
similarity index 100%
rename from ANSIO/pch.h
rename to integrations/ANSIO/pch.h
diff --git a/ANSONVIF/ANSONVIF.cpp b/integrations/ANSONVIF/ANSONVIF.cpp
similarity index 100%
rename from ANSONVIF/ANSONVIF.cpp
rename to integrations/ANSONVIF/ANSONVIF.cpp
diff --git a/ANSONVIF/ANSONVIF.h b/integrations/ANSONVIF/ANSONVIF.h
similarity index 100%
rename from ANSONVIF/ANSONVIF.h
rename to integrations/ANSONVIF/ANSONVIF.h
diff --git a/ANSONVIF/CMakeLists.txt b/integrations/ANSONVIF/CMakeLists.txt
similarity index 100%
rename from ANSONVIF/CMakeLists.txt
rename to integrations/ANSONVIF/CMakeLists.txt
diff --git a/ANSODTrainingEngine/dllmain.cpp b/integrations/ANSONVIF/dllmain.cpp
similarity index 100%
rename from ANSODTrainingEngine/dllmain.cpp
rename to integrations/ANSONVIF/dllmain.cpp
diff --git a/ANSONVIF/framework.h b/integrations/ANSONVIF/framework.h
similarity index 100%
rename from ANSONVIF/framework.h
rename to integrations/ANSONVIF/framework.h
diff --git a/ANSLLM/pch.cpp b/integrations/ANSONVIF/pch.cpp
similarity index 100%
rename from ANSLLM/pch.cpp
rename to integrations/ANSONVIF/pch.cpp
diff --git a/ANSLicensingSystem/pch.h b/integrations/ANSONVIF/pch.h
similarity index 100%
rename from ANSLicensingSystem/pch.h
rename to integrations/ANSONVIF/pch.h
diff --git a/ANSPulsar/ANSPulsar.cpp b/integrations/ANSPulsar/ANSPulsar.cpp
similarity index 100%
rename from ANSPulsar/ANSPulsar.cpp
rename to integrations/ANSPulsar/ANSPulsar.cpp
diff --git a/ANSPulsar/ANSPulsar.h b/integrations/ANSPulsar/ANSPulsar.h
similarity index 100%
rename from ANSPulsar/ANSPulsar.h
rename to integrations/ANSPulsar/ANSPulsar.h
diff --git a/ANSPulsar/CMakeLists.txt b/integrations/ANSPulsar/CMakeLists.txt
similarity index 100%
rename from ANSPulsar/CMakeLists.txt
rename to integrations/ANSPulsar/CMakeLists.txt
diff --git a/ANSPulsar/dllmain.cpp b/integrations/ANSPulsar/dllmain.cpp
similarity index 100%
rename from ANSPulsar/dllmain.cpp
rename to integrations/ANSPulsar/dllmain.cpp
diff --git a/ANSIO/framework.h b/integrations/ANSPulsar/framework.h
similarity index 100%
rename from ANSIO/framework.h
rename to integrations/ANSPulsar/framework.h
diff --git a/ANSLPR/pch.cpp b/integrations/ANSPulsar/pch.cpp
similarity index 100%
rename from ANSLPR/pch.cpp
rename to integrations/ANSPulsar/pch.cpp
diff --git a/ANSMOT/pch.h b/integrations/ANSPulsar/pch.h
similarity index 100%
rename from ANSMOT/pch.h
rename to integrations/ANSPulsar/pch.h
diff --git a/ANSRabbitMQ/ANSRabbitMQ.cpp b/integrations/ANSRabbitMQ/ANSRabbitMQ.cpp
similarity index 100%
rename from ANSRabbitMQ/ANSRabbitMQ.cpp
rename to integrations/ANSRabbitMQ/ANSRabbitMQ.cpp
diff --git a/ANSRabbitMQ/ANSRabbitMQ.h b/integrations/ANSRabbitMQ/ANSRabbitMQ.h
similarity index 100%
rename from ANSRabbitMQ/ANSRabbitMQ.h
rename to integrations/ANSRabbitMQ/ANSRabbitMQ.h
diff --git a/ANSRabbitMQ/CMakeLists.txt b/integrations/ANSRabbitMQ/CMakeLists.txt
similarity index 100%
rename from ANSRabbitMQ/CMakeLists.txt
rename to integrations/ANSRabbitMQ/CMakeLists.txt
diff --git a/ANSRabbitMQ/dllmain.cpp b/integrations/ANSRabbitMQ/dllmain.cpp
similarity index 100%
rename from ANSRabbitMQ/dllmain.cpp
rename to integrations/ANSRabbitMQ/dllmain.cpp
diff --git a/ANSLLM/framework.h b/integrations/ANSRabbitMQ/framework.h
similarity index 100%
rename from ANSLLM/framework.h
rename to integrations/ANSRabbitMQ/framework.h
diff --git a/ANSLibsLoader/pch.cpp b/integrations/ANSRabbitMQ/pch.cpp
similarity index 100%
rename from ANSLibsLoader/pch.cpp
rename to integrations/ANSRabbitMQ/pch.cpp
diff --git a/ANSOCR/pch.h b/integrations/ANSRabbitMQ/pch.h
similarity index 100%
rename from ANSOCR/pch.h
rename to integrations/ANSRabbitMQ/pch.h
diff --git a/ANSCV/ANSFLV.cpp b/modules/ANSCV/ANSFLV.cpp
similarity index 100%
rename from ANSCV/ANSFLV.cpp
rename to modules/ANSCV/ANSFLV.cpp
diff --git a/ANSCV/ANSFLV.h b/modules/ANSCV/ANSFLV.h
similarity index 100%
rename from ANSCV/ANSFLV.h
rename to modules/ANSCV/ANSFLV.h
diff --git a/ANSCV/ANSFilePlayer.cpp b/modules/ANSCV/ANSFilePlayer.cpp
similarity index 100%
rename from ANSCV/ANSFilePlayer.cpp
rename to modules/ANSCV/ANSFilePlayer.cpp
diff --git a/ANSCV/ANSFilePlayer.h b/modules/ANSCV/ANSFilePlayer.h
similarity index 100%
rename from ANSCV/ANSFilePlayer.h
rename to modules/ANSCV/ANSFilePlayer.h
diff --git a/ANSCV/ANSFilePlayer_CV.cpp b/modules/ANSCV/ANSFilePlayer_CV.cpp
similarity index 100%
rename from ANSCV/ANSFilePlayer_CV.cpp
rename to modules/ANSCV/ANSFilePlayer_CV.cpp
diff --git a/ANSCV/ANSFilePlayer_CV.h b/modules/ANSCV/ANSFilePlayer_CV.h
similarity index 100%
rename from ANSCV/ANSFilePlayer_CV.h
rename to modules/ANSCV/ANSFilePlayer_CV.h
diff --git a/ANSCV/ANSGpuFrameOps.h b/modules/ANSCV/ANSGpuFrameOps.h
similarity index 100%
rename from ANSCV/ANSGpuFrameOps.h
rename to modules/ANSCV/ANSGpuFrameOps.h
diff --git a/ANSCV/ANSGpuFrameRegistry.cpp b/modules/ANSCV/ANSGpuFrameRegistry.cpp
similarity index 100%
rename from ANSCV/ANSGpuFrameRegistry.cpp
rename to modules/ANSCV/ANSGpuFrameRegistry.cpp
diff --git a/ANSCV/ANSMJPEG.cpp b/modules/ANSCV/ANSMJPEG.cpp
similarity index 100%
rename from ANSCV/ANSMJPEG.cpp
rename to modules/ANSCV/ANSMJPEG.cpp
diff --git a/ANSCV/ANSMJPEG.h b/modules/ANSCV/ANSMJPEG.h
similarity index 100%
rename from ANSCV/ANSMJPEG.h
rename to modules/ANSCV/ANSMJPEG.h
diff --git a/ANSCV/ANSMatRegistry.h b/modules/ANSCV/ANSMatRegistry.h
similarity index 100%
rename from ANSCV/ANSMatRegistry.h
rename to modules/ANSCV/ANSMatRegistry.h
diff --git a/ANSCV/ANSOpenCV.cpp b/modules/ANSCV/ANSOpenCV.cpp
similarity index 100%
rename from ANSCV/ANSOpenCV.cpp
rename to modules/ANSCV/ANSOpenCV.cpp
diff --git a/ANSCV/ANSOpenCV.h b/modules/ANSCV/ANSOpenCV.h
similarity index 100%
rename from ANSCV/ANSOpenCV.h
rename to modules/ANSCV/ANSOpenCV.h
diff --git a/ANSCV/ANSRTMP.cpp b/modules/ANSCV/ANSRTMP.cpp
similarity index 100%
rename from ANSCV/ANSRTMP.cpp
rename to modules/ANSCV/ANSRTMP.cpp
diff --git a/ANSCV/ANSRTMP.h b/modules/ANSCV/ANSRTMP.h
similarity index 100%
rename from ANSCV/ANSRTMP.h
rename to modules/ANSCV/ANSRTMP.h
diff --git a/ANSCV/ANSRTSP.cpp b/modules/ANSCV/ANSRTSP.cpp
similarity index 100%
rename from ANSCV/ANSRTSP.cpp
rename to modules/ANSCV/ANSRTSP.cpp
diff --git a/ANSCV/ANSRTSP.h b/modules/ANSCV/ANSRTSP.h
similarity index 100%
rename from ANSCV/ANSRTSP.h
rename to modules/ANSCV/ANSRTSP.h
diff --git a/ANSCV/ANSSRT.cpp b/modules/ANSCV/ANSSRT.cpp
similarity index 100%
rename from ANSCV/ANSSRT.cpp
rename to modules/ANSCV/ANSSRT.cpp
diff --git a/ANSCV/ANSSRT.h b/modules/ANSCV/ANSSRT.h
similarity index 100%
rename from ANSCV/ANSSRT.h
rename to modules/ANSCV/ANSSRT.h
diff --git a/ANSCV/ANSVideoPlayer.cpp b/modules/ANSCV/ANSVideoPlayer.cpp
similarity index 100%
rename from ANSCV/ANSVideoPlayer.cpp
rename to modules/ANSCV/ANSVideoPlayer.cpp
diff --git a/ANSCV/ANSVideoPlayer.h b/modules/ANSCV/ANSVideoPlayer.h
similarity index 100%
rename from ANSCV/ANSVideoPlayer.h
rename to modules/ANSCV/ANSVideoPlayer.h
diff --git a/ANSCV/ANSWebcam.cpp b/modules/ANSCV/ANSWebcam.cpp
similarity index 100%
rename from ANSCV/ANSWebcam.cpp
rename to modules/ANSCV/ANSWebcam.cpp
diff --git a/ANSCV/ANSWebcam.h b/modules/ANSCV/ANSWebcam.h
similarity index 100%
rename from ANSCV/ANSWebcam.h
rename to modules/ANSCV/ANSWebcam.h
diff --git a/ANSCV/CMakeLists.txt b/modules/ANSCV/CMakeLists.txt
similarity index 100%
rename from ANSCV/CMakeLists.txt
rename to modules/ANSCV/CMakeLists.txt
diff --git a/ANSCV/VideoPlayer.cpp b/modules/ANSCV/VideoPlayer.cpp
similarity index 100%
rename from ANSCV/VideoPlayer.cpp
rename to modules/ANSCV/VideoPlayer.cpp
diff --git a/ANSCV/VideoPlayer.h b/modules/ANSCV/VideoPlayer.h
similarity index 100%
rename from ANSCV/VideoPlayer.h
rename to modules/ANSCV/VideoPlayer.h
diff --git a/ANSCV/dllmain.cpp b/modules/ANSCV/dllmain.cpp
similarity index 100%
rename from ANSCV/dllmain.cpp
rename to modules/ANSCV/dllmain.cpp
diff --git a/ANSLPR/framework.h b/modules/ANSCV/framework.h
similarity index 100%
rename from ANSLPR/framework.h
rename to modules/ANSCV/framework.h
diff --git a/ANSLicensingSystem/pch.cpp b/modules/ANSCV/pch.cpp
similarity index 100%
rename from ANSLicensingSystem/pch.cpp
rename to modules/ANSCV/pch.cpp
diff --git a/ANSCV/pch.h b/modules/ANSCV/pch.h
similarity index 100%
rename from ANSCV/pch.h
rename to modules/ANSCV/pch.h
diff --git a/ANSFR/ANSFR.cpp b/modules/ANSFR/ANSFR.cpp
similarity index 100%
rename from ANSFR/ANSFR.cpp
rename to modules/ANSFR/ANSFR.cpp
diff --git a/ANSFR/ANSFR.h b/modules/ANSFR/ANSFR.h
similarity index 100%
rename from ANSFR/ANSFR.h
rename to modules/ANSFR/ANSFR.h
diff --git a/ANSFR/ANSFRCommon.cpp b/modules/ANSFR/ANSFRCommon.cpp
similarity index 100%
rename from ANSFR/ANSFRCommon.cpp
rename to modules/ANSFR/ANSFRCommon.cpp
diff --git a/ANSFR/ANSFRCommon.h b/modules/ANSFR/ANSFRCommon.h
similarity index 100%
rename from ANSFR/ANSFRCommon.h
rename to modules/ANSFR/ANSFRCommon.h
diff --git a/ANSFR/ANSFaceRecognizer.cpp b/modules/ANSFR/ANSFaceRecognizer.cpp
similarity index 100%
rename from ANSFR/ANSFaceRecognizer.cpp
rename to modules/ANSFR/ANSFaceRecognizer.cpp
diff --git a/ANSFR/ANSFaceRecognizer.h b/modules/ANSFR/ANSFaceRecognizer.h
similarity index 100%
rename from ANSFR/ANSFaceRecognizer.h
rename to modules/ANSFR/ANSFaceRecognizer.h
diff --git a/ANSFR/ANSGpuFrameRegistry.cpp b/modules/ANSFR/ANSGpuFrameRegistry.cpp
similarity index 100%
rename from ANSFR/ANSGpuFrameRegistry.cpp
rename to modules/ANSFR/ANSGpuFrameRegistry.cpp
diff --git a/ANSFR/ARCFaceRT.cpp b/modules/ANSFR/ARCFaceRT.cpp
similarity index 100%
rename from ANSFR/ARCFaceRT.cpp
rename to modules/ANSFR/ARCFaceRT.cpp
diff --git a/ANSFR/ARCFaceRT.h b/modules/ANSFR/ARCFaceRT.h
similarity index 100%
rename from ANSFR/ARCFaceRT.h
rename to modules/ANSFR/ARCFaceRT.h
diff --git a/ANSFR/CMakeLists.txt b/modules/ANSFR/CMakeLists.txt
similarity index 96%
rename from ANSFR/CMakeLists.txt
rename to modules/ANSFR/CMakeLists.txt
index c7c7439..0c1487d 100644
--- a/ANSFR/CMakeLists.txt
+++ b/modules/ANSFR/CMakeLists.txt
@@ -28,12 +28,12 @@ target_include_directories(ANSFR PRIVATE
     ${CMAKE_SOURCE_DIR}/engines/ONNXEngine
     ${CMAKE_SOURCE_DIR}/engines/OpenVINOEngine/include
     ${CMAKE_SOURCE_DIR}/engines/TensorRTAPI/include
-    ${CMAKE_SOURCE_DIR}/ANSODEngine
+    ${CMAKE_SOURCE_DIR}/modules/ANSODEngine
     ${SHARED_INCLUDE_DIR}
 )
 
 target_include_directories(ANSFR PRIVATE
-    ${CMAKE_SOURCE_DIR}/ANSMOT
+    ${CMAKE_SOURCE_DIR}/modules/ANSMOT
     ${CMAKE_SOURCE_DIR}/engines/OpenVINOEngine/include/faceapp
     ${ANSLIBS_DIR}/faiss
 )
diff --git a/ANSFR/FaceDatabase.cpp b/modules/ANSFR/FaceDatabase.cpp
similarity index 100%
rename from ANSFR/FaceDatabase.cpp
rename to modules/ANSFR/FaceDatabase.cpp
diff --git a/ANSFR/FaceDatabase.h b/modules/ANSFR/FaceDatabase.h
similarity index 100%
rename from ANSFR/FaceDatabase.h
rename to modules/ANSFR/FaceDatabase.h
diff --git a/ANSFR/FaceNet.cpp b/modules/ANSFR/FaceNet.cpp
similarity index 100%
rename from ANSFR/FaceNet.cpp
rename to modules/ANSFR/FaceNet.cpp
diff --git a/ANSFR/FaceNet.h b/modules/ANSFR/FaceNet.h
similarity index 100%
rename from ANSFR/FaceNet.h
rename to modules/ANSFR/FaceNet.h
diff --git a/ANSFR/RetinaFaceTRT.cpp b/modules/ANSFR/RetinaFaceTRT.cpp
similarity index 100%
rename from ANSFR/RetinaFaceTRT.cpp
rename to modules/ANSFR/RetinaFaceTRT.cpp
diff --git a/ANSFR/RetinaFaceTRT.h b/modules/ANSFR/RetinaFaceTRT.h
similarity index 100%
rename from ANSFR/RetinaFaceTRT.h
rename to modules/ANSFR/RetinaFaceTRT.h
diff --git a/ANSFR/WebClient.cpp b/modules/ANSFR/WebClient.cpp
similarity index 100%
rename from ANSFR/WebClient.cpp
rename to modules/ANSFR/WebClient.cpp
diff --git a/ANSFR/WebClient.h b/modules/ANSFR/WebClient.h
similarity index 100%
rename from ANSFR/WebClient.h
rename to modules/ANSFR/WebClient.h
diff --git a/ANSFR/decode.cpp b/modules/ANSFR/decode.cpp
similarity index 100%
rename from ANSFR/decode.cpp
rename to modules/ANSFR/decode.cpp
diff --git a/ANSFR/decode.h b/modules/ANSFR/decode.h
similarity index 100%
rename from ANSFR/decode.h
rename to modules/ANSFR/decode.h
diff --git a/ANSFR/dllmain.cpp b/modules/ANSFR/dllmain.cpp
similarity index 100%
rename from ANSFR/dllmain.cpp
rename to modules/ANSFR/dllmain.cpp
diff --git a/ANSLicensingSystem/framework.h b/modules/ANSFR/framework.h
similarity index 100%
rename from ANSLicensingSystem/framework.h
rename to modules/ANSFR/framework.h
diff --git a/ANSFR/macros.h b/modules/ANSFR/macros.h
similarity index 100%
rename from ANSFR/macros.h
rename to modules/ANSFR/macros.h
diff --git a/ANSMOT/pch.cpp b/modules/ANSFR/pch.cpp
similarity index 100%
rename from ANSMOT/pch.cpp
rename to modules/ANSFR/pch.cpp
diff --git a/ANSFR/pch.h b/modules/ANSFR/pch.h
similarity index 100%
rename from ANSFR/pch.h
rename to modules/ANSFR/pch.h
diff --git a/ANSFR/shell.c b/modules/ANSFR/shell.c
similarity index 100%
rename from ANSFR/shell.c
rename to modules/ANSFR/shell.c
diff --git a/ANSFR/sqlite3.c b/modules/ANSFR/sqlite3.c
similarity index 100%
rename from ANSFR/sqlite3.c
rename to modules/ANSFR/sqlite3.c
diff --git a/ANSFR/sqlite3.h b/modules/ANSFR/sqlite3.h
similarity index 100%
rename from ANSFR/sqlite3.h
rename to modules/ANSFR/sqlite3.h
diff --git a/ANSFR/sqlite3ext.h b/modules/ANSFR/sqlite3ext.h
similarity index 100%
rename from ANSFR/sqlite3ext.h
rename to modules/ANSFR/sqlite3ext.h
diff --git a/ANSLLM/ANSLLM.cpp b/modules/ANSLLM/ANSLLM.cpp
similarity index 100%
rename from ANSLLM/ANSLLM.cpp
rename to modules/ANSLLM/ANSLLM.cpp
diff --git a/ANSLLM/ANSLLM.h b/modules/ANSLLM/ANSLLM.h
similarity index 100%
rename from ANSLLM/ANSLLM.h
rename to modules/ANSLLM/ANSLLM.h
diff --git a/ANSLLM/CMakeLists.txt b/modules/ANSLLM/CMakeLists.txt
similarity index 100%
rename from ANSLLM/CMakeLists.txt
rename to modules/ANSLLM/CMakeLists.txt
diff --git a/ANSLLM/dllmain.cpp b/modules/ANSLLM/dllmain.cpp
similarity index 100%
rename from ANSLLM/dllmain.cpp
rename to modules/ANSLLM/dllmain.cpp
diff --git a/ANSMOT/framework.h b/modules/ANSLLM/framework.h
similarity index 100%
rename from ANSMOT/framework.h
rename to modules/ANSLLM/framework.h
diff --git a/ANSOCR/pch.cpp b/modules/ANSLLM/pch.cpp
similarity index 100%
rename from ANSOCR/pch.cpp
rename to modules/ANSLLM/pch.cpp
diff --git a/ANSLLM/pch.h b/modules/ANSLLM/pch.h
similarity index 100%
rename from ANSLLM/pch.h
rename to modules/ANSLLM/pch.h
diff --git a/ANSLPR/ANSALPR_OV.cpp b/modules/ANSLPR/ANSALPR_OV.cpp
similarity index 100%
rename from ANSLPR/ANSALPR_OV.cpp
rename to modules/ANSLPR/ANSALPR_OV.cpp
diff --git a/ANSLPR/ANSGpuFrameRegistry.cpp b/modules/ANSLPR/ANSGpuFrameRegistry.cpp
similarity index 100%
rename from ANSLPR/ANSGpuFrameRegistry.cpp
rename to modules/ANSLPR/ANSGpuFrameRegistry.cpp
diff --git a/ANSLPR/ANSLPR.cpp b/modules/ANSLPR/ANSLPR.cpp
similarity index 100%
rename from ANSLPR/ANSLPR.cpp
rename to modules/ANSLPR/ANSLPR.cpp
diff --git a/ANSLPR/ANSLPR.h b/modules/ANSLPR/ANSLPR.h
similarity index 100%
rename from ANSLPR/ANSLPR.h
rename to modules/ANSLPR/ANSLPR.h
diff --git a/ANSLPR/ANSLPR_CPU.cpp b/modules/ANSLPR/ANSLPR_CPU.cpp
similarity index 100%
rename from ANSLPR/ANSLPR_CPU.cpp
rename to modules/ANSLPR/ANSLPR_CPU.cpp
diff --git a/ANSLPR/ANSLPR_CPU.h b/modules/ANSLPR/ANSLPR_CPU.h
similarity index 100%
rename from ANSLPR/ANSLPR_CPU.h
rename to modules/ANSLPR/ANSLPR_CPU.h
diff --git a/ANSLPR/ANSLPR_OD.cpp b/modules/ANSLPR/ANSLPR_OD.cpp
similarity index 100%
rename from ANSLPR/ANSLPR_OD.cpp
rename to modules/ANSLPR/ANSLPR_OD.cpp
diff --git a/ANSLPR/ANSLPR_OD.h b/modules/ANSLPR/ANSLPR_OD.h
similarity index 100%
rename from ANSLPR/ANSLPR_OD.h
rename to modules/ANSLPR/ANSLPR_OD.h
diff --git a/ANSLPR/ANSLPR_OV.h b/modules/ANSLPR/ANSLPR_OV.h
similarity index 100%
rename from ANSLPR/ANSLPR_OV.h
rename to modules/ANSLPR/ANSLPR_OV.h
diff --git a/ANSLPR/ANSLPR_RT.cpp b/modules/ANSLPR/ANSLPR_RT.cpp
similarity index 100%
rename from ANSLPR/ANSLPR_RT.cpp
rename to modules/ANSLPR/ANSLPR_RT.cpp
diff --git a/ANSLPR/ANSLPR_RT.h b/modules/ANSLPR/ANSLPR_RT.h
similarity index 100%
rename from ANSLPR/ANSLPR_RT.h
rename to modules/ANSLPR/ANSLPR_RT.h
diff --git a/ANSLPR/CMakeLists.txt b/modules/ANSLPR/CMakeLists.txt
similarity index 57%
rename from ANSLPR/CMakeLists.txt
rename to modules/ANSLPR/CMakeLists.txt
index 5ccf032..e38f040 100644
--- a/ANSLPR/CMakeLists.txt
+++ b/modules/ANSLPR/CMakeLists.txt
@@ -13,17 +13,17 @@ file(GLOB ANSLPR_INCLUDE_HEADERS "include/*.h")
 
 # PaddleOCR sources compiled into ANSLPR (from original vcxproj)
 set(PADDLE_SOURCES
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/clipper.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/ocr_cls.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/ocr_det.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/ocr_rec.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/paddleocr.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/paddleocr_utility.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/paddlestructure.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/postprocess_op.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/preprocess_op.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/structure_layout.cpp
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/src/structure_table.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/clipper.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/ocr_cls.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/ocr_det.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/ocr_rec.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/paddleocr.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/paddleocr_utility.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/paddlestructure.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/postprocess_op.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/preprocess_op.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/structure_layout.cpp
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/src/structure_table.cpp
 )
 
 add_library(ANSLPR SHARED
@@ -42,10 +42,10 @@ target_include_directories(ANSLPR PRIVATE
     ${CMAKE_SOURCE_DIR}/engines/ONNXEngine
     ${CMAKE_SOURCE_DIR}/engines/OpenVINOEngine/include
     ${CMAKE_SOURCE_DIR}/engines/TensorRTAPI/include
-    ${CMAKE_SOURCE_DIR}/ANSODEngine
-    ${CMAKE_SOURCE_DIR}/ANSOCR
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR
-    ${CMAKE_SOURCE_DIR}/ANSOCR/ANSPaddleOCR/include
+    ${CMAKE_SOURCE_DIR}/modules/ANSODEngine
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR
+    ${CMAKE_SOURCE_DIR}/modules/ANSOCR/ANSPaddleOCR/include
     ${SHARED_INCLUDE_DIR}
 )
 
diff --git a/ANSLPR/dllmain.cpp b/modules/ANSLPR/dllmain.cpp
similarity index 100%
rename from ANSLPR/dllmain.cpp
rename to modules/ANSLPR/dllmain.cpp
diff --git a/ANSOCR/framework.h b/modules/ANSLPR/framework.h
similarity index 100%
rename from ANSOCR/framework.h
rename to modules/ANSLPR/framework.h
diff --git a/ANSLPR/include/Levenshtein.h b/modules/ANSLPR/include/Levenshtein.h
similarity index 100%
rename from ANSLPR/include/Levenshtein.h
rename to modules/ANSLPR/include/Levenshtein.h
diff --git a/ANSLPR/include/Line.h b/modules/ANSLPR/include/Line.h
similarity index 100%
rename from ANSLPR/include/Line.h
rename to modules/ANSLPR/include/Line.h
diff --git a/ANSLPR/include/ONNX_detector.h b/modules/ANSLPR/include/ONNX_detector.h
similarity index 100%
rename from ANSLPR/include/ONNX_detector.h
rename to modules/ANSLPR/include/ONNX_detector.h
diff --git a/ANSLPR/include/StatSommesX_Y_H_dbl.h b/modules/ANSLPR/include/StatSommesX_Y_H_dbl.h
similarity index 100%
rename from ANSLPR/include/StatSommesX_Y_H_dbl.h
rename to modules/ANSLPR/include/StatSommesX_Y_H_dbl.h
diff --git a/ANSLPR/include/utils_alpr_detect.h b/modules/ANSLPR/include/utils_alpr_detect.h
similarity index 100%
rename from ANSLPR/include/utils_alpr_detect.h
rename to modules/ANSLPR/include/utils_alpr_detect.h
diff --git a/ANSLPR/include/utils_image_file.h b/modules/ANSLPR/include/utils_image_file.h
similarity index 100%
rename from ANSLPR/include/utils_image_file.h
rename to modules/ANSLPR/include/utils_image_file.h
diff --git a/ANSLPR/include/utils_opencv.h b/modules/ANSLPR/include/utils_opencv.h
similarity index 100%
rename from ANSLPR/include/utils_opencv.h
rename to modules/ANSLPR/include/utils_opencv.h
diff --git a/ANSLPR/include/yolov5_alpr_onnx_detector.h b/modules/ANSLPR/include/yolov5_alpr_onnx_detector.h
similarity index 100%
rename from ANSLPR/include/yolov5_alpr_onnx_detector.h
rename to modules/ANSLPR/include/yolov5_alpr_onnx_detector.h
diff --git a/ANSODEngine/pch.cpp b/modules/ANSLPR/pch.cpp
similarity index 100%
rename from ANSODEngine/pch.cpp
rename to modules/ANSLPR/pch.cpp
diff --git a/ANSODEngine/pch.h b/modules/ANSLPR/pch.h
similarity index 100%
rename from ANSODEngine/pch.h
rename to modules/ANSLPR/pch.h
diff --git a/ANSLPR/src/Levenshtein.cpp b/modules/ANSLPR/src/Levenshtein.cpp
similarity index 100%
rename from ANSLPR/src/Levenshtein.cpp
rename to modules/ANSLPR/src/Levenshtein.cpp
diff --git a/ANSLPR/src/Line.cpp b/modules/ANSLPR/src/Line.cpp
similarity index 100%
rename from ANSLPR/src/Line.cpp
rename to modules/ANSLPR/src/Line.cpp
diff --git a/ANSLPR/src/ONNX_detector.cpp b/modules/ANSLPR/src/ONNX_detector.cpp
similarity index 100%
rename from ANSLPR/src/ONNX_detector.cpp
rename to modules/ANSLPR/src/ONNX_detector.cpp
diff --git a/ANSLPR/src/StatSommesX_Y_H_dbl.cpp b/modules/ANSLPR/src/StatSommesX_Y_H_dbl.cpp
similarity index 100%
rename from ANSLPR/src/StatSommesX_Y_H_dbl.cpp
rename to modules/ANSLPR/src/StatSommesX_Y_H_dbl.cpp
diff --git a/ANSLPR/src/utils_alpr_detect.cpp b/modules/ANSLPR/src/utils_alpr_detect.cpp
similarity index 100%
rename from ANSLPR/src/utils_alpr_detect.cpp
rename to modules/ANSLPR/src/utils_alpr_detect.cpp
diff --git a/ANSLPR/src/utils_image_file.cpp b/modules/ANSLPR/src/utils_image_file.cpp
similarity index 100%
rename from ANSLPR/src/utils_image_file.cpp
rename to modules/ANSLPR/src/utils_image_file.cpp
diff --git a/ANSLPR/src/utils_opencv.cpp b/modules/ANSLPR/src/utils_opencv.cpp
similarity index 100%
rename from ANSLPR/src/utils_opencv.cpp
rename to modules/ANSLPR/src/utils_opencv.cpp
diff --git a/ANSLPR/src/yolov5_alpr_onnx_detector.cpp b/modules/ANSLPR/src/yolov5_alpr_onnx_detector.cpp
similarity index 100%
rename from ANSLPR/src/yolov5_alpr_onnx_detector.cpp
rename to modules/ANSLPR/src/yolov5_alpr_onnx_detector.cpp
diff --git a/ANSMOT/ANSByteTrack.cpp b/modules/ANSMOT/ANSByteTrack.cpp
similarity index 100%
rename from ANSMOT/ANSByteTrack.cpp
rename to modules/ANSMOT/ANSByteTrack.cpp
diff --git a/ANSMOT/ANSByteTrack.h b/modules/ANSMOT/ANSByteTrack.h
similarity index 100%
rename from ANSMOT/ANSByteTrack.h
rename to modules/ANSMOT/ANSByteTrack.h
diff --git a/ANSMOT/ANSByteTrackEigen.cpp b/modules/ANSMOT/ANSByteTrackEigen.cpp
similarity index 100%
rename from ANSMOT/ANSByteTrackEigen.cpp
rename to modules/ANSMOT/ANSByteTrackEigen.cpp
diff --git a/ANSMOT/ANSByteTrackEigen.h b/modules/ANSMOT/ANSByteTrackEigen.h
similarity index 100%
rename from ANSMOT/ANSByteTrackEigen.h
rename to modules/ANSMOT/ANSByteTrackEigen.h
diff --git a/ANSMOT/ANSByteTrackNCNN.cpp b/modules/ANSMOT/ANSByteTrackNCNN.cpp
similarity index 100%
rename from ANSMOT/ANSByteTrackNCNN.cpp
rename to modules/ANSMOT/ANSByteTrackNCNN.cpp
diff --git a/ANSMOT/ANSByteTrackNCNN.h b/modules/ANSMOT/ANSByteTrackNCNN.h
similarity index 100%
rename from ANSMOT/ANSByteTrackNCNN.h
rename to modules/ANSMOT/ANSByteTrackNCNN.h
diff --git a/ANSMOT/ANSMOT.cpp b/modules/ANSMOT/ANSMOT.cpp
similarity index 100%
rename from ANSMOT/ANSMOT.cpp
rename to modules/ANSMOT/ANSMOT.cpp
diff --git a/ANSMOT/ANSMOT.h b/modules/ANSMOT/ANSMOT.h
similarity index 100%
rename from ANSMOT/ANSMOT.h
rename to modules/ANSMOT/ANSMOT.h
diff --git a/ANSMOT/ANSOCSortTrack.cpp b/modules/ANSMOT/ANSOCSortTrack.cpp
similarity index 100%
rename from ANSMOT/ANSOCSortTrack.cpp
rename to modules/ANSMOT/ANSOCSortTrack.cpp
diff --git a/ANSMOT/ANSOCSortTrack.h b/modules/ANSMOT/ANSOCSortTrack.h
similarity index 100%
rename from ANSMOT/ANSOCSortTrack.h
rename to modules/ANSMOT/ANSOCSortTrack.h
diff --git a/ANSMOT/ANSUCMC.cpp b/modules/ANSMOT/ANSUCMC.cpp
similarity index 100%
rename from ANSMOT/ANSUCMC.cpp
rename to modules/ANSMOT/ANSUCMC.cpp
diff --git a/ANSMOT/ANSUCMC.h b/modules/ANSMOT/ANSUCMC.h
similarity index 100%
rename from ANSMOT/ANSUCMC.h
rename to modules/ANSMOT/ANSUCMC.h
diff --git a/ANSMOT/ByteTrack/include/BYTETracker.h b/modules/ANSMOT/ByteTrack/include/BYTETracker.h
similarity index 100%
rename from ANSMOT/ByteTrack/include/BYTETracker.h
rename to modules/ANSMOT/ByteTrack/include/BYTETracker.h
diff --git a/ANSMOT/ByteTrack/include/KalmanFilter.h b/modules/ANSMOT/ByteTrack/include/KalmanFilter.h
similarity index 100%
rename from ANSMOT/ByteTrack/include/KalmanFilter.h
rename to modules/ANSMOT/ByteTrack/include/KalmanFilter.h
diff --git a/ANSMOT/ByteTrack/include/Object.h b/modules/ANSMOT/ByteTrack/include/Object.h
similarity index 100%
rename from ANSMOT/ByteTrack/include/Object.h
rename to modules/ANSMOT/ByteTrack/include/Object.h
diff --git a/ANSMOT/ByteTrack/include/Rect.h b/modules/ANSMOT/ByteTrack/include/Rect.h
similarity index 100%
rename from ANSMOT/ByteTrack/include/Rect.h
rename to modules/ANSMOT/ByteTrack/include/Rect.h
diff --git a/ANSMOT/ByteTrack/include/STrack.h b/modules/ANSMOT/ByteTrack/include/STrack.h
similarity index 100%
rename from ANSMOT/ByteTrack/include/STrack.h
rename to modules/ANSMOT/ByteTrack/include/STrack.h
diff --git a/ANSMOT/ByteTrack/include/lapjv.h b/modules/ANSMOT/ByteTrack/include/lapjv.h
similarity index 100%
rename from ANSMOT/ByteTrack/include/lapjv.h
rename to modules/ANSMOT/ByteTrack/include/lapjv.h
diff --git a/ANSMOT/ByteTrack/src/BYTETracker.cpp b/modules/ANSMOT/ByteTrack/src/BYTETracker.cpp
similarity index 100%
rename from ANSMOT/ByteTrack/src/BYTETracker.cpp
rename to modules/ANSMOT/ByteTrack/src/BYTETracker.cpp
diff --git a/ANSMOT/ByteTrack/src/KalmanFilter.cpp b/modules/ANSMOT/ByteTrack/src/KalmanFilter.cpp
similarity index 100%
rename from ANSMOT/ByteTrack/src/KalmanFilter.cpp
rename to modules/ANSMOT/ByteTrack/src/KalmanFilter.cpp
diff --git a/ANSMOT/ByteTrack/src/Object.cpp b/modules/ANSMOT/ByteTrack/src/Object.cpp
similarity index 100%
rename from ANSMOT/ByteTrack/src/Object.cpp
rename to modules/ANSMOT/ByteTrack/src/Object.cpp
diff --git a/ANSMOT/ByteTrack/src/Rect.cpp b/modules/ANSMOT/ByteTrack/src/Rect.cpp
similarity index 100%
rename from ANSMOT/ByteTrack/src/Rect.cpp
rename to modules/ANSMOT/ByteTrack/src/Rect.cpp
diff --git a/ANSMOT/ByteTrack/src/STrack.cpp b/modules/ANSMOT/ByteTrack/src/STrack.cpp
similarity index 100%
rename from ANSMOT/ByteTrack/src/STrack.cpp
rename to modules/ANSMOT/ByteTrack/src/STrack.cpp
diff --git a/ANSMOT/ByteTrack/src/lapjv.cpp b/modules/ANSMOT/ByteTrack/src/lapjv.cpp
similarity index 100%
rename from ANSMOT/ByteTrack/src/lapjv.cpp
rename to modules/ANSMOT/ByteTrack/src/lapjv.cpp
diff --git a/ANSMOT/ByteTrackEigen/include/EigenBYTETracker.h b/modules/ANSMOT/ByteTrackEigen/include/EigenBYTETracker.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenBYTETracker.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenBYTETracker.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenBaseTrack.h b/modules/ANSMOT/ByteTrackEigen/include/EigenBaseTrack.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenBaseTrack.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenBaseTrack.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenBoundingBoxIoUMatching.h b/modules/ANSMOT/ByteTrackEigen/include/EigenBoundingBoxIoUMatching.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenBoundingBoxIoUMatching.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenBoundingBoxIoUMatching.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenBoundingBoxTrackUtils.h b/modules/ANSMOT/ByteTrackEigen/include/EigenBoundingBoxTrackUtils.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenBoundingBoxTrackUtils.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenBoundingBoxTrackUtils.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenExport.h b/modules/ANSMOT/ByteTrackEigen/include/EigenExport.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenExport.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenExport.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenHungarianAlgorithm.h b/modules/ANSMOT/ByteTrackEigen/include/EigenHungarianAlgorithm.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenHungarianAlgorithm.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenHungarianAlgorithm.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenKalmanBBoxTrack.h b/modules/ANSMOT/ByteTrackEigen/include/EigenKalmanBBoxTrack.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenKalmanBBoxTrack.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenKalmanBBoxTrack.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenKalmanFilter.h b/modules/ANSMOT/ByteTrackEigen/include/EigenKalmanFilter.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenKalmanFilter.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenKalmanFilter.h
diff --git a/ANSMOT/ByteTrackEigen/include/EigenLinearAssignment.h b/modules/ANSMOT/ByteTrackEigen/include/EigenLinearAssignment.h
similarity index 100%
rename from ANSMOT/ByteTrackEigen/include/EigenLinearAssignment.h
rename to modules/ANSMOT/ByteTrackEigen/include/EigenLinearAssignment.h
diff --git a/ANSMOT/ByteTrackEigen/src/EigenBYTETracker.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenBYTETracker.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenBYTETracker.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenBYTETracker.cpp
diff --git a/ANSMOT/ByteTrackEigen/src/EigenBaseTrack.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenBaseTrack.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenBaseTrack.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenBaseTrack.cpp
diff --git a/ANSMOT/ByteTrackEigen/src/EigenBoundingBoxIoUMatching.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenBoundingBoxIoUMatching.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenBoundingBoxIoUMatching.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenBoundingBoxIoUMatching.cpp
diff --git a/ANSMOT/ByteTrackEigen/src/EigenBoundingBoxTrackUtils.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenBoundingBoxTrackUtils.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenBoundingBoxTrackUtils.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenBoundingBoxTrackUtils.cpp
diff --git a/ANSMOT/ByteTrackEigen/src/EigenHungarianAlgorithm.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenHungarianAlgorithm.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenHungarianAlgorithm.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenHungarianAlgorithm.cpp
diff --git a/ANSMOT/ByteTrackEigen/src/EigenKalmanBBoxTrack.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenKalmanBBoxTrack.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenKalmanBBoxTrack.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenKalmanBBoxTrack.cpp
diff --git a/ANSMOT/ByteTrackEigen/src/EigenKalmanFilter.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenKalmanFilter.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenKalmanFilter.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenKalmanFilter.cpp
diff --git a/ANSMOT/ByteTrackEigen/src/EigenLinearAssignment.cpp b/modules/ANSMOT/ByteTrackEigen/src/EigenLinearAssignment.cpp
similarity index 100%
rename from ANSMOT/ByteTrackEigen/src/EigenLinearAssignment.cpp
rename to modules/ANSMOT/ByteTrackEigen/src/EigenLinearAssignment.cpp
diff --git a/ANSMOT/ByteTrackNCNN/include/NCNNBYTETracker.h b/modules/ANSMOT/ByteTrackNCNN/include/NCNNBYTETracker.h
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/include/NCNNBYTETracker.h
rename to modules/ANSMOT/ByteTrackNCNN/include/NCNNBYTETracker.h
diff --git a/ANSMOT/ByteTrackNCNN/include/NCNNBytekalmanFilter.h b/modules/ANSMOT/ByteTrackNCNN/include/NCNNBytekalmanFilter.h
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/include/NCNNBytekalmanFilter.h
rename to modules/ANSMOT/ByteTrackNCNN/include/NCNNBytekalmanFilter.h
diff --git a/ANSMOT/ByteTrackNCNN/include/NCNNObject.h b/modules/ANSMOT/ByteTrackNCNN/include/NCNNObject.h
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/include/NCNNObject.h
rename to modules/ANSMOT/ByteTrackNCNN/include/NCNNObject.h
diff --git a/ANSMOT/ByteTrackNCNN/include/NCNNRect.h b/modules/ANSMOT/ByteTrackNCNN/include/NCNNRect.h
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/include/NCNNRect.h
rename to modules/ANSMOT/ByteTrackNCNN/include/NCNNRect.h
diff --git a/ANSMOT/ByteTrackNCNN/include/NCNNSTrack.h b/modules/ANSMOT/ByteTrackNCNN/include/NCNNSTrack.h
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/include/NCNNSTrack.h
rename to modules/ANSMOT/ByteTrackNCNN/include/NCNNSTrack.h
diff --git a/ANSMOT/ByteTrackNCNN/include/NCNNdataType.h b/modules/ANSMOT/ByteTrackNCNN/include/NCNNdataType.h
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/include/NCNNdataType.h
rename to modules/ANSMOT/ByteTrackNCNN/include/NCNNdataType.h
diff --git a/ANSMOT/ByteTrackNCNN/include/NCNNlapjv.h b/modules/ANSMOT/ByteTrackNCNN/include/NCNNlapjv.h
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/include/NCNNlapjv.h
rename to modules/ANSMOT/ByteTrackNCNN/include/NCNNlapjv.h
diff --git a/ANSMOT/ByteTrackNCNN/src/NCNNBYTETracker.cpp b/modules/ANSMOT/ByteTrackNCNN/src/NCNNBYTETracker.cpp
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/src/NCNNBYTETracker.cpp
rename to modules/ANSMOT/ByteTrackNCNN/src/NCNNBYTETracker.cpp
diff --git a/ANSMOT/ByteTrackNCNN/src/NCNNBytekalmanFilter.cpp b/modules/ANSMOT/ByteTrackNCNN/src/NCNNBytekalmanFilter.cpp
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/src/NCNNBytekalmanFilter.cpp
rename to modules/ANSMOT/ByteTrackNCNN/src/NCNNBytekalmanFilter.cpp
diff --git a/ANSMOT/ByteTrackNCNN/src/NCNNObject.cpp b/modules/ANSMOT/ByteTrackNCNN/src/NCNNObject.cpp
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/src/NCNNObject.cpp
rename to modules/ANSMOT/ByteTrackNCNN/src/NCNNObject.cpp
diff --git a/ANSMOT/ByteTrackNCNN/src/NCNNRect.cpp b/modules/ANSMOT/ByteTrackNCNN/src/NCNNRect.cpp
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/src/NCNNRect.cpp
rename to modules/ANSMOT/ByteTrackNCNN/src/NCNNRect.cpp
diff --git a/ANSMOT/ByteTrackNCNN/src/NCNNSTrack.cpp b/modules/ANSMOT/ByteTrackNCNN/src/NCNNSTrack.cpp
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/src/NCNNSTrack.cpp
rename to modules/ANSMOT/ByteTrackNCNN/src/NCNNSTrack.cpp
diff --git a/ANSMOT/ByteTrackNCNN/src/NCNNlapjv.cpp b/modules/ANSMOT/ByteTrackNCNN/src/NCNNlapjv.cpp
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/src/NCNNlapjv.cpp
rename to modules/ANSMOT/ByteTrackNCNN/src/NCNNlapjv.cpp
diff --git a/ANSMOT/ByteTrackNCNN/src/NCNNutils.cpp b/modules/ANSMOT/ByteTrackNCNN/src/NCNNutils.cpp
similarity index 100%
rename from ANSMOT/ByteTrackNCNN/src/NCNNutils.cpp
rename to modules/ANSMOT/ByteTrackNCNN/src/NCNNutils.cpp
diff --git a/ANSMOT/CMakeLists.txt b/modules/ANSMOT/CMakeLists.txt
similarity index 100%
rename from ANSMOT/CMakeLists.txt
rename to modules/ANSMOT/CMakeLists.txt
diff --git a/ANSMOT/OCSort/include/Association.h b/modules/ANSMOT/OCSort/include/Association.h
similarity index 100%
rename from ANSMOT/OCSort/include/Association.h
rename to modules/ANSMOT/OCSort/include/Association.h
diff --git a/ANSMOT/OCSort/include/KalmanBoxTracker.h b/modules/ANSMOT/OCSort/include/KalmanBoxTracker.h
similarity index 100%
rename from ANSMOT/OCSort/include/KalmanBoxTracker.h
rename to modules/ANSMOT/OCSort/include/KalmanBoxTracker.h
diff --git a/ANSMOT/OCSort/include/OCSort.h b/modules/ANSMOT/OCSort/include/OCSort.h
similarity index 100%
rename from ANSMOT/OCSort/include/OCSort.h
rename to modules/ANSMOT/OCSort/include/OCSort.h
diff --git a/ANSMOT/OCSort/include/OCSortKalmanFilter.h b/modules/ANSMOT/OCSort/include/OCSortKalmanFilter.h
similarity index 100%
rename from ANSMOT/OCSort/include/OCSortKalmanFilter.h
rename to modules/ANSMOT/OCSort/include/OCSortKalmanFilter.h
diff --git a/ANSMOT/OCSort/include/OCSortObject.h b/modules/ANSMOT/OCSort/include/OCSortObject.h
similarity index 100%
rename from ANSMOT/OCSort/include/OCSortObject.h
rename to modules/ANSMOT/OCSort/include/OCSortObject.h
diff --git a/ANSMOT/OCSort/include/OCSortRect.h b/modules/ANSMOT/OCSort/include/OCSortRect.h
similarity index 100%
rename from ANSMOT/OCSort/include/OCSortRect.h
rename to modules/ANSMOT/OCSort/include/OCSortRect.h
diff --git a/ANSMOT/OCSort/include/OCSortUtilities.h b/modules/ANSMOT/OCSort/include/OCSortUtilities.h
similarity index 100%
rename from ANSMOT/OCSort/include/OCSortUtilities.h
rename to modules/ANSMOT/OCSort/include/OCSortUtilities.h
diff --git a/ANSMOT/OCSort/include/OCSortlapjv.h b/modules/ANSMOT/OCSort/include/OCSortlapjv.h
similarity index 100%
rename from ANSMOT/OCSort/include/OCSortlapjv.h
rename to modules/ANSMOT/OCSort/include/OCSortlapjv.h
diff --git a/ANSMOT/OCSort/src/Association.cpp b/modules/ANSMOT/OCSort/src/Association.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/Association.cpp
rename to modules/ANSMOT/OCSort/src/Association.cpp
diff --git a/ANSMOT/OCSort/src/KalmanBoxTracker.cpp b/modules/ANSMOT/OCSort/src/KalmanBoxTracker.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/KalmanBoxTracker.cpp
rename to modules/ANSMOT/OCSort/src/KalmanBoxTracker.cpp
diff --git a/ANSMOT/OCSort/src/OCSort.cpp b/modules/ANSMOT/OCSort/src/OCSort.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/OCSort.cpp
rename to modules/ANSMOT/OCSort/src/OCSort.cpp
diff --git a/ANSMOT/OCSort/src/OCSortKalmanFilter.cpp b/modules/ANSMOT/OCSort/src/OCSortKalmanFilter.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/OCSortKalmanFilter.cpp
rename to modules/ANSMOT/OCSort/src/OCSortKalmanFilter.cpp
diff --git a/ANSMOT/OCSort/src/OCSortObject.cpp b/modules/ANSMOT/OCSort/src/OCSortObject.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/OCSortObject.cpp
rename to modules/ANSMOT/OCSort/src/OCSortObject.cpp
diff --git a/ANSMOT/OCSort/src/OCSortRect.cpp b/modules/ANSMOT/OCSort/src/OCSortRect.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/OCSortRect.cpp
rename to modules/ANSMOT/OCSort/src/OCSortRect.cpp
diff --git a/ANSMOT/OCSort/src/OCSortUtilities.cpp b/modules/ANSMOT/OCSort/src/OCSortUtilities.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/OCSortUtilities.cpp
rename to modules/ANSMOT/OCSort/src/OCSortUtilities.cpp
diff --git a/ANSMOT/OCSort/src/OCSortlapjv.cpp b/modules/ANSMOT/OCSort/src/OCSortlapjv.cpp
similarity index 100%
rename from ANSMOT/OCSort/src/OCSortlapjv.cpp
rename to modules/ANSMOT/OCSort/src/OCSortlapjv.cpp
diff --git a/ANSMOT/UCMC/include/UCMClapjv.h b/modules/ANSMOT/UCMC/include/UCMClapjv.h
similarity index 100%
rename from ANSMOT/UCMC/include/UCMClapjv.h
rename to modules/ANSMOT/UCMC/include/UCMClapjv.h
diff --git a/ANSMOT/UCMC/src/UCMClapjv.cpp b/modules/ANSMOT/UCMC/src/UCMClapjv.cpp
similarity index 100%
rename from ANSMOT/UCMC/src/UCMClapjv.cpp
rename to modules/ANSMOT/UCMC/src/UCMClapjv.cpp
diff --git a/ANSMOT/UCMC/src/UCMClapmod.cpp b/modules/ANSMOT/UCMC/src/UCMClapmod.cpp
similarity index 100%
rename from ANSMOT/UCMC/src/UCMClapmod.cpp
rename to modules/ANSMOT/UCMC/src/UCMClapmod.cpp
diff --git a/ANSMOT/UCMCKalman.cpp b/modules/ANSMOT/UCMCKalman.cpp
similarity index 100%
rename from ANSMOT/UCMCKalman.cpp
rename to modules/ANSMOT/UCMCKalman.cpp
diff --git a/ANSMOT/UCMCKalman.h b/modules/ANSMOT/UCMCKalman.h
similarity index 100%
rename from ANSMOT/UCMCKalman.h
rename to modules/ANSMOT/UCMCKalman.h
diff --git a/ANSMOT/UCMCTracker.cpp b/modules/ANSMOT/UCMCTracker.cpp
similarity index 100%
rename from ANSMOT/UCMCTracker.cpp
rename to modules/ANSMOT/UCMCTracker.cpp
diff --git a/ANSMOT/UCMCTracker.h b/modules/ANSMOT/UCMCTracker.h
similarity index 100%
rename from ANSMOT/UCMCTracker.h
rename to modules/ANSMOT/UCMCTracker.h
diff --git a/ANSMOT/dllmain.cpp b/modules/ANSMOT/dllmain.cpp
similarity index 100%
rename from ANSMOT/dllmain.cpp
rename to modules/ANSMOT/dllmain.cpp
diff --git a/ANSODEngine/framework.h b/modules/ANSMOT/framework.h
similarity index 100%
rename from ANSODEngine/framework.h
rename to modules/ANSMOT/framework.h
diff --git a/ANSODTrainingEngine/pch.cpp b/modules/ANSMOT/pch.cpp
similarity index 100%
rename from ANSODTrainingEngine/pch.cpp
rename to modules/ANSMOT/pch.cpp
diff --git a/ANSODTrainingEngine/pch.h b/modules/ANSMOT/pch.h
similarity index 100%
rename from ANSODTrainingEngine/pch.h
rename to modules/ANSMOT/pch.h
diff --git a/ANSOCR/ANSCpuOCR.cpp b/modules/ANSOCR/ANSCpuOCR.cpp
similarity index 100%
rename from ANSOCR/ANSCpuOCR.cpp
rename to modules/ANSOCR/ANSCpuOCR.cpp
diff --git a/ANSOCR/ANSCpuOCR.h b/modules/ANSOCR/ANSCpuOCR.h
similarity index 100%
rename from ANSOCR/ANSCpuOCR.h
rename to modules/ANSOCR/ANSCpuOCR.h
diff --git a/ANSOCR/ANSGpuFrameRegistry.cpp b/modules/ANSOCR/ANSGpuFrameRegistry.cpp
similarity index 100%
rename from ANSOCR/ANSGpuFrameRegistry.cpp
rename to modules/ANSOCR/ANSGpuFrameRegistry.cpp
diff --git a/ANSOCR/ANSOCR.cpp b/modules/ANSOCR/ANSOCR.cpp
similarity index 100%
rename from ANSOCR/ANSOCR.cpp
rename to modules/ANSOCR/ANSOCR.cpp
diff --git a/ANSOCR/ANSOCR.h b/modules/ANSOCR/ANSOCR.h
similarity index 100%
rename from ANSOCR/ANSOCR.h
rename to modules/ANSOCR/ANSOCR.h
diff --git a/ANSOCR/ANSOCRBase.cpp b/modules/ANSOCR/ANSOCRBase.cpp
similarity index 100%
rename from ANSOCR/ANSOCRBase.cpp
rename to modules/ANSOCR/ANSOCRBase.cpp
diff --git a/ANSOCR/ANSOCRBase.h b/modules/ANSOCR/ANSOCRBase.h
similarity index 100%
rename from ANSOCR/ANSOCRBase.h
rename to modules/ANSOCR/ANSOCRBase.h
diff --git a/ANSOCR/ANSONNXOCR/ONNXOCRClassifier.cpp b/modules/ANSOCR/ANSONNXOCR/ONNXOCRClassifier.cpp
similarity index 100%
rename from ANSOCR/ANSONNXOCR/ONNXOCRClassifier.cpp
rename to modules/ANSOCR/ANSONNXOCR/ONNXOCRClassifier.cpp
diff --git a/ANSOCR/ANSONNXOCR/ONNXOCRClassifier.h b/modules/ANSOCR/ANSONNXOCR/ONNXOCRClassifier.h
similarity index 100%
rename from ANSOCR/ANSONNXOCR/ONNXOCRClassifier.h
rename to modules/ANSOCR/ANSONNXOCR/ONNXOCRClassifier.h
diff --git a/ANSOCR/ANSONNXOCR/ONNXOCRDetector.cpp b/modules/ANSOCR/ANSONNXOCR/ONNXOCRDetector.cpp
similarity index 100%
rename from ANSOCR/ANSONNXOCR/ONNXOCRDetector.cpp
rename to modules/ANSOCR/ANSONNXOCR/ONNXOCRDetector.cpp
diff --git a/ANSOCR/ANSONNXOCR/ONNXOCRDetector.h b/modules/ANSOCR/ANSONNXOCR/ONNXOCRDetector.h
similarity index 100%
rename from ANSOCR/ANSONNXOCR/ONNXOCRDetector.h
rename to modules/ANSOCR/ANSONNXOCR/ONNXOCRDetector.h
diff --git a/ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.cpp b/modules/ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.cpp
similarity index 100%
rename from ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.cpp
rename to modules/ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.cpp
diff --git a/ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.h b/modules/ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.h
similarity index 100%
rename from ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.h
rename to modules/ANSOCR/ANSONNXOCR/ONNXOCRRecognizer.h
diff --git a/ANSOCR/ANSONNXOCR/ONNXOCRTypes.h b/modules/ANSOCR/ANSONNXOCR/ONNXOCRTypes.h
similarity index 100%
rename from ANSOCR/ANSONNXOCR/ONNXOCRTypes.h
rename to modules/ANSOCR/ANSONNXOCR/ONNXOCRTypes.h
diff --git a/ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.cpp b/modules/ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.cpp
similarity index 100%
rename from ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.cpp
rename to modules/ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.cpp
diff --git a/ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.h b/modules/ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.h
similarity index 100%
rename from ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.h
rename to modules/ANSOCR/ANSONNXOCR/PaddleOCRV5Engine.h
diff --git a/ANSOCR/ANSOdOCR.cpp b/modules/ANSOCR/ANSOdOCR.cpp
similarity index 100%
rename from ANSOCR/ANSOdOCR.cpp
rename to modules/ANSOCR/ANSOdOCR.cpp
diff --git a/ANSOCR/ANSOnnxOCR.cpp b/modules/ANSOCR/ANSOnnxOCR.cpp
similarity index 100%
rename from ANSOCR/ANSOnnxOCR.cpp
rename to modules/ANSOCR/ANSOnnxOCR.cpp
diff --git a/ANSOCR/ANSOnnxOCR.h b/modules/ANSOCR/ANSOnnxOCR.h
similarity index 100%
rename from ANSOCR/ANSOnnxOCR.h
rename to modules/ANSOCR/ANSOnnxOCR.h
diff --git a/ANSOCR/ANSPaddleOCR/include/args.h b/modules/ANSOCR/ANSPaddleOCR/include/args.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/args.h
rename to modules/ANSOCR/ANSPaddleOCR/include/args.h
diff --git a/ANSOCR/ANSPaddleOCR/include/clipper.h b/modules/ANSOCR/ANSPaddleOCR/include/clipper.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/clipper.h
rename to modules/ANSOCR/ANSPaddleOCR/include/clipper.h
diff --git a/ANSOCR/ANSPaddleOCR/include/ocr_cls.h b/modules/ANSOCR/ANSPaddleOCR/include/ocr_cls.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/ocr_cls.h
rename to modules/ANSOCR/ANSPaddleOCR/include/ocr_cls.h
diff --git a/ANSOCR/ANSPaddleOCR/include/ocr_det.h b/modules/ANSOCR/ANSPaddleOCR/include/ocr_det.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/ocr_det.h
rename to modules/ANSOCR/ANSPaddleOCR/include/ocr_det.h
diff --git a/ANSOCR/ANSPaddleOCR/include/ocr_rec.h b/modules/ANSOCR/ANSPaddleOCR/include/ocr_rec.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/ocr_rec.h
rename to modules/ANSOCR/ANSPaddleOCR/include/ocr_rec.h
diff --git a/ANSOCR/ANSPaddleOCR/include/paddleocr.h b/modules/ANSOCR/ANSPaddleOCR/include/paddleocr.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/paddleocr.h
rename to modules/ANSOCR/ANSPaddleOCR/include/paddleocr.h
diff --git a/ANSOCR/ANSPaddleOCR/include/paddleocr_utility.h b/modules/ANSOCR/ANSPaddleOCR/include/paddleocr_utility.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/paddleocr_utility.h
rename to modules/ANSOCR/ANSPaddleOCR/include/paddleocr_utility.h
diff --git a/ANSOCR/ANSPaddleOCR/include/paddlestructure.h b/modules/ANSOCR/ANSPaddleOCR/include/paddlestructure.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/paddlestructure.h
rename to modules/ANSOCR/ANSPaddleOCR/include/paddlestructure.h
diff --git a/ANSOCR/ANSPaddleOCR/include/postprocess_op.h b/modules/ANSOCR/ANSPaddleOCR/include/postprocess_op.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/postprocess_op.h
rename to modules/ANSOCR/ANSPaddleOCR/include/postprocess_op.h
diff --git a/ANSOCR/ANSPaddleOCR/include/preprocess_op.h b/modules/ANSOCR/ANSPaddleOCR/include/preprocess_op.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/preprocess_op.h
rename to modules/ANSOCR/ANSPaddleOCR/include/preprocess_op.h
diff --git a/ANSOCR/ANSPaddleOCR/include/structure_layout.h b/modules/ANSOCR/ANSPaddleOCR/include/structure_layout.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/structure_layout.h
rename to modules/ANSOCR/ANSPaddleOCR/include/structure_layout.h
diff --git a/ANSOCR/ANSPaddleOCR/include/structure_table.h b/modules/ANSOCR/ANSPaddleOCR/include/structure_table.h
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/include/structure_table.h
rename to modules/ANSOCR/ANSPaddleOCR/include/structure_table.h
diff --git a/ANSOCR/ANSPaddleOCR/src/args.cpp b/modules/ANSOCR/ANSPaddleOCR/src/args.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/args.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/args.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/clipper.cpp b/modules/ANSOCR/ANSPaddleOCR/src/clipper.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/clipper.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/clipper.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/ocr_cls.cpp b/modules/ANSOCR/ANSPaddleOCR/src/ocr_cls.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/ocr_cls.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/ocr_cls.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/ocr_det.cpp b/modules/ANSOCR/ANSPaddleOCR/src/ocr_det.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/ocr_det.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/ocr_det.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/ocr_rec.cpp b/modules/ANSOCR/ANSPaddleOCR/src/ocr_rec.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/ocr_rec.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/ocr_rec.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/paddleocr.cpp b/modules/ANSOCR/ANSPaddleOCR/src/paddleocr.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/paddleocr.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/paddleocr.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/paddleocr_utility.cpp b/modules/ANSOCR/ANSPaddleOCR/src/paddleocr_utility.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/paddleocr_utility.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/paddleocr_utility.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/paddlestructure.cpp b/modules/ANSOCR/ANSPaddleOCR/src/paddlestructure.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/paddlestructure.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/paddlestructure.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/postprocess_op.cpp b/modules/ANSOCR/ANSPaddleOCR/src/postprocess_op.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/postprocess_op.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/postprocess_op.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/preprocess_op.cpp b/modules/ANSOCR/ANSPaddleOCR/src/preprocess_op.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/preprocess_op.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/preprocess_op.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/rec.bak b/modules/ANSOCR/ANSPaddleOCR/src/rec.bak
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/rec.bak
rename to modules/ANSOCR/ANSPaddleOCR/src/rec.bak
diff --git a/ANSOCR/ANSPaddleOCR/src/structure_layout.cpp b/modules/ANSOCR/ANSPaddleOCR/src/structure_layout.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/structure_layout.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/structure_layout.cpp
diff --git a/ANSOCR/ANSPaddleOCR/src/structure_table.cpp b/modules/ANSOCR/ANSPaddleOCR/src/structure_table.cpp
similarity index 100%
rename from ANSOCR/ANSPaddleOCR/src/structure_table.cpp
rename to modules/ANSOCR/ANSPaddleOCR/src/structure_table.cpp
diff --git a/ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.cpp b/modules/ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.cpp
similarity index 100%
rename from ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.cpp
rename to modules/ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.cpp
diff --git a/ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.h b/modules/ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.h
similarity index 100%
rename from ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.h
rename to modules/ANSOCR/ANSRTOCR/PaddleOCRV5RTEngine.h
diff --git a/ANSOCR/ANSRTOCR/RTOCRClassifier.cpp b/modules/ANSOCR/ANSRTOCR/RTOCRClassifier.cpp
similarity index 100%
rename from ANSOCR/ANSRTOCR/RTOCRClassifier.cpp
rename to modules/ANSOCR/ANSRTOCR/RTOCRClassifier.cpp
diff --git a/ANSOCR/ANSRTOCR/RTOCRClassifier.h b/modules/ANSOCR/ANSRTOCR/RTOCRClassifier.h
similarity index 100%
rename from ANSOCR/ANSRTOCR/RTOCRClassifier.h
rename to modules/ANSOCR/ANSRTOCR/RTOCRClassifier.h
diff --git a/ANSOCR/ANSRTOCR/RTOCRDetector.cpp b/modules/ANSOCR/ANSRTOCR/RTOCRDetector.cpp
similarity index 100%
rename from ANSOCR/ANSRTOCR/RTOCRDetector.cpp
rename to modules/ANSOCR/ANSRTOCR/RTOCRDetector.cpp
diff --git a/ANSOCR/ANSRTOCR/RTOCRDetector.h b/modules/ANSOCR/ANSRTOCR/RTOCRDetector.h
similarity index 100%
rename from ANSOCR/ANSRTOCR/RTOCRDetector.h
rename to modules/ANSOCR/ANSRTOCR/RTOCRDetector.h
diff --git a/ANSOCR/ANSRTOCR/RTOCRRecognizer.cpp b/modules/ANSOCR/ANSRTOCR/RTOCRRecognizer.cpp
similarity index 100%
rename from ANSOCR/ANSRTOCR/RTOCRRecognizer.cpp
rename to modules/ANSOCR/ANSRTOCR/RTOCRRecognizer.cpp
diff --git a/ANSOCR/ANSRTOCR/RTOCRRecognizer.h b/modules/ANSOCR/ANSRTOCR/RTOCRRecognizer.h
similarity index 100%
rename from ANSOCR/ANSRTOCR/RTOCRRecognizer.h
rename to modules/ANSOCR/ANSRTOCR/RTOCRRecognizer.h
diff --git a/ANSOCR/ANSRTOCR/RTOCRTypes.h b/modules/ANSOCR/ANSRTOCR/RTOCRTypes.h
similarity index 100%
rename from ANSOCR/ANSRTOCR/RTOCRTypes.h
rename to modules/ANSOCR/ANSRTOCR/RTOCRTypes.h
diff --git a/ANSOCR/ANSRtOCR.cpp b/modules/ANSOCR/ANSRtOCR.cpp
similarity index 100%
rename from ANSOCR/ANSRtOCR.cpp
rename to modules/ANSOCR/ANSRtOCR.cpp
diff --git a/ANSOCR/ANSRtOCR.h b/modules/ANSOCR/ANSRtOCR.h
similarity index 100%
rename from ANSOCR/ANSRtOCR.h
rename to modules/ANSOCR/ANSRtOCR.h
diff --git a/ANSOCR/CMakeLists.txt b/modules/ANSOCR/CMakeLists.txt
similarity index 97%
rename from ANSOCR/CMakeLists.txt
rename to modules/ANSOCR/CMakeLists.txt
index 3dc78d3..37a81d6 100644
--- a/ANSOCR/CMakeLists.txt
+++ b/modules/ANSOCR/CMakeLists.txt
@@ -31,7 +31,7 @@ target_include_directories(ANSOCR PRIVATE
     ${CMAKE_SOURCE_DIR}/engines/ONNXEngine
     ${CMAKE_SOURCE_DIR}/engines/OpenVINOEngine/include
     ${CMAKE_SOURCE_DIR}/engines/TensorRTAPI/include
-    ${CMAKE_SOURCE_DIR}/ANSLicensingSystem
+    ${CMAKE_SOURCE_DIR}/core/ANSLicensingSystem
     ${SHARED_INCLUDE_DIR}
 )
 
diff --git a/ANSOCR/dllmain.cpp b/modules/ANSOCR/dllmain.cpp
similarity index 100%
rename from ANSOCR/dllmain.cpp
rename to modules/ANSOCR/dllmain.cpp
diff --git a/ANSODTrainingEngine/framework.h b/modules/ANSOCR/framework.h
similarity index 100%
rename from ANSODTrainingEngine/framework.h
rename to modules/ANSOCR/framework.h
diff --git a/ANSONVIF/pch.cpp b/modules/ANSOCR/pch.cpp
similarity index 100%
rename from ANSONVIF/pch.cpp
rename to modules/ANSOCR/pch.cpp
diff --git a/ANSONVIF/pch.h b/modules/ANSOCR/pch.h
similarity index 100%
rename from ANSONVIF/pch.h
rename to modules/ANSOCR/pch.h
diff --git a/ANSODEngine/ANSANOMALIB.cpp b/modules/ANSODEngine/ANSANOMALIB.cpp
similarity index 100%
rename from ANSODEngine/ANSANOMALIB.cpp
rename to modules/ANSODEngine/ANSANOMALIB.cpp
diff --git a/ANSODEngine/ANSANOMALIB.h b/modules/ANSODEngine/ANSANOMALIB.h
similarity index 100%
rename from ANSODEngine/ANSANOMALIB.h
rename to modules/ANSODEngine/ANSANOMALIB.h
diff --git a/ANSODEngine/ANSCLIPTokenizer.cpp b/modules/ANSODEngine/ANSCLIPTokenizer.cpp
similarity index 100%
rename from ANSODEngine/ANSCLIPTokenizer.cpp
rename to modules/ANSODEngine/ANSCLIPTokenizer.cpp
diff --git a/ANSODEngine/ANSCLIPTokenizer.h b/modules/ANSODEngine/ANSCLIPTokenizer.h
similarity index 100%
rename from ANSODEngine/ANSCLIPTokenizer.h
rename to modules/ANSODEngine/ANSCLIPTokenizer.h
diff --git a/ANSODEngine/ANSCUSTOMDETECTOR.cpp b/modules/ANSODEngine/ANSCUSTOMDETECTOR.cpp
similarity index 100%
rename from ANSODEngine/ANSCUSTOMDETECTOR.cpp
rename to modules/ANSODEngine/ANSCUSTOMDETECTOR.cpp
diff --git a/ANSODEngine/ANSCUSTOMDetector.h b/modules/ANSODEngine/ANSCUSTOMDetector.h
similarity index 100%
rename from ANSODEngine/ANSCUSTOMDetector.h
rename to modules/ANSODEngine/ANSCUSTOMDetector.h
diff --git a/ANSODEngine/ANSCUSTOMPY.cpp b/modules/ANSODEngine/ANSCUSTOMPY.cpp
similarity index 100%
rename from ANSODEngine/ANSCUSTOMPY.cpp
rename to modules/ANSODEngine/ANSCUSTOMPY.cpp
diff --git a/ANSODEngine/ANSCUSTOMPY.h b/modules/ANSODEngine/ANSCUSTOMPY.h
similarity index 100%
rename from ANSODEngine/ANSCUSTOMPY.h
rename to modules/ANSODEngine/ANSCUSTOMPY.h
diff --git a/ANSODEngine/ANSCustomCode.h b/modules/ANSODEngine/ANSCustomCode.h
similarity index 100%
rename from ANSODEngine/ANSCustomCode.h
rename to modules/ANSODEngine/ANSCustomCode.h
diff --git a/ANSODEngine/ANSEngineCommon.cpp b/modules/ANSODEngine/ANSEngineCommon.cpp
similarity index 100%
rename from ANSODEngine/ANSEngineCommon.cpp
rename to modules/ANSODEngine/ANSEngineCommon.cpp
diff --git a/ANSODEngine/ANSEngineCommon.h b/modules/ANSODEngine/ANSEngineCommon.h
similarity index 100%
rename from ANSODEngine/ANSEngineCommon.h
rename to modules/ANSODEngine/ANSEngineCommon.h
diff --git a/ANSODEngine/ANSFD.cpp b/modules/ANSODEngine/ANSFD.cpp
similarity index 100%
rename from ANSODEngine/ANSFD.cpp
rename to modules/ANSODEngine/ANSFD.cpp
diff --git a/ANSODEngine/ANSFD.h b/modules/ANSODEngine/ANSFD.h
similarity index 100%
rename from ANSODEngine/ANSFD.h
rename to modules/ANSODEngine/ANSFD.h
diff --git a/ANSODEngine/ANSFDModel.h b/modules/ANSODEngine/ANSFDModel.h
similarity index 100%
rename from ANSODEngine/ANSFDModel.h
rename to modules/ANSODEngine/ANSFDModel.h
diff --git a/ANSODEngine/ANSFaceDetectorEngine.cpp b/modules/ANSODEngine/ANSFaceDetectorEngine.cpp
similarity index 100%
rename from ANSODEngine/ANSFaceDetectorEngine.cpp
rename to modules/ANSODEngine/ANSFaceDetectorEngine.cpp
diff --git a/ANSODEngine/ANSFaceRecognizerEngine.cpp b/modules/ANSODEngine/ANSFaceRecognizerEngine.cpp
similarity index 100%
rename from ANSODEngine/ANSFaceRecognizerEngine.cpp
rename to modules/ANSODEngine/ANSFaceRecognizerEngine.cpp
diff --git a/ANSODEngine/ANSFireNSmoke.cpp b/modules/ANSODEngine/ANSFireNSmoke.cpp
similarity index 100%
rename from ANSODEngine/ANSFireNSmoke.cpp
rename to modules/ANSODEngine/ANSFireNSmoke.cpp
diff --git a/ANSODEngine/ANSFireNSmoke.h b/modules/ANSODEngine/ANSFireNSmoke.h
similarity index 100%
rename from ANSODEngine/ANSFireNSmoke.h
rename to modules/ANSODEngine/ANSFireNSmoke.h
diff --git a/ANSODEngine/ANSGpuFrameRegistry.cpp b/modules/ANSODEngine/ANSGpuFrameRegistry.cpp
similarity index 100%
rename from ANSODEngine/ANSGpuFrameRegistry.cpp
rename to modules/ANSODEngine/ANSGpuFrameRegistry.cpp
diff --git a/ANSODEngine/ANSMotionDetector.cpp b/modules/ANSODEngine/ANSMotionDetector.cpp
similarity index 100%
rename from ANSODEngine/ANSMotionDetector.cpp
rename to modules/ANSODEngine/ANSMotionDetector.cpp
diff --git a/ANSODEngine/ANSMotionDetector.h b/modules/ANSODEngine/ANSMotionDetector.h
similarity index 100%
rename from ANSODEngine/ANSMotionDetector.h
rename to modules/ANSODEngine/ANSMotionDetector.h
diff --git a/ANSODEngine/ANSODEngine.cpp b/modules/ANSODEngine/ANSODEngine.cpp
similarity index 100%
rename from ANSODEngine/ANSODEngine.cpp
rename to modules/ANSODEngine/ANSODEngine.cpp
diff --git a/ANSODEngine/ANSODEngine.h b/modules/ANSODEngine/ANSODEngine.h
similarity index 100%
rename from ANSODEngine/ANSODEngine.h
rename to modules/ANSODEngine/ANSODEngine.h
diff --git a/ANSODEngine/ANSODHUB.cpp b/modules/ANSODEngine/ANSODHUB.cpp
similarity index 100%
rename from ANSODEngine/ANSODHUB.cpp
rename to modules/ANSODEngine/ANSODHUB.cpp
diff --git a/ANSODEngine/ANSODHUB.h b/modules/ANSODEngine/ANSODHUB.h
similarity index 100%
rename from ANSODEngine/ANSODHUB.h
rename to modules/ANSODEngine/ANSODHUB.h
diff --git a/ANSODEngine/ANSONNXCL.cpp b/modules/ANSODEngine/ANSONNXCL.cpp
similarity index 100%
rename from ANSODEngine/ANSONNXCL.cpp
rename to modules/ANSODEngine/ANSONNXCL.cpp
diff --git a/ANSODEngine/ANSONNXCL.h b/modules/ANSODEngine/ANSONNXCL.h
similarity index 100%
rename from ANSODEngine/ANSONNXCL.h
rename to modules/ANSODEngine/ANSONNXCL.h
diff --git a/ANSODEngine/ANSONNXOBB.cpp b/modules/ANSODEngine/ANSONNXOBB.cpp
similarity index 100%
rename from ANSODEngine/ANSONNXOBB.cpp
rename to modules/ANSODEngine/ANSONNXOBB.cpp
diff --git a/ANSODEngine/ANSONNXOBB.h b/modules/ANSODEngine/ANSONNXOBB.h
similarity index 100%
rename from ANSODEngine/ANSONNXOBB.h
rename to modules/ANSODEngine/ANSONNXOBB.h
diff --git a/ANSODEngine/ANSONNXPOSE.cpp b/modules/ANSODEngine/ANSONNXPOSE.cpp
similarity index 100%
rename from ANSODEngine/ANSONNXPOSE.cpp
rename to modules/ANSODEngine/ANSONNXPOSE.cpp
diff --git a/ANSODEngine/ANSONNXPOSE.h b/modules/ANSODEngine/ANSONNXPOSE.h
similarity index 100%
rename from ANSODEngine/ANSONNXPOSE.h
rename to modules/ANSODEngine/ANSONNXPOSE.h
diff --git a/ANSODEngine/ANSONNXSAM3.cpp b/modules/ANSODEngine/ANSONNXSAM3.cpp
similarity index 100%
rename from ANSODEngine/ANSONNXSAM3.cpp
rename to modules/ANSODEngine/ANSONNXSAM3.cpp
diff --git a/ANSODEngine/ANSONNXSAM3.h b/modules/ANSODEngine/ANSONNXSAM3.h
similarity index 100%
rename from ANSODEngine/ANSONNXSAM3.h
rename to modules/ANSODEngine/ANSONNXSAM3.h
diff --git a/ANSODEngine/ANSONNXSEG.cpp b/modules/ANSODEngine/ANSONNXSEG.cpp
similarity index 100%
rename from ANSODEngine/ANSONNXSEG.cpp
rename to modules/ANSODEngine/ANSONNXSEG.cpp
diff --git a/ANSODEngine/ANSONNXSEG.h b/modules/ANSODEngine/ANSONNXSEG.h
similarity index 100%
rename from ANSODEngine/ANSONNXSEG.h
rename to modules/ANSODEngine/ANSONNXSEG.h
diff --git a/ANSODEngine/ANSONNXYOLO.cpp b/modules/ANSODEngine/ANSONNXYOLO.cpp
similarity index 100%
rename from ANSODEngine/ANSONNXYOLO.cpp
rename to modules/ANSODEngine/ANSONNXYOLO.cpp
diff --git a/ANSODEngine/ANSONNXYOLO.h b/modules/ANSODEngine/ANSONNXYOLO.h
similarity index 100%
rename from ANSODEngine/ANSONNXYOLO.h
rename to modules/ANSODEngine/ANSONNXYOLO.h
diff --git a/ANSODEngine/ANSOPENVINOCL.cpp b/modules/ANSODEngine/ANSOPENVINOCL.cpp
similarity index 100%
rename from ANSODEngine/ANSOPENVINOCL.cpp
rename to modules/ANSODEngine/ANSOPENVINOCL.cpp
diff --git a/ANSODEngine/ANSOPENVINOCL.h b/modules/ANSODEngine/ANSOPENVINOCL.h
similarity index 100%
rename from ANSODEngine/ANSOPENVINOCL.h
rename to modules/ANSODEngine/ANSOPENVINOCL.h
diff --git a/ANSODEngine/ANSOPENVINOOD.cpp b/modules/ANSODEngine/ANSOPENVINOOD.cpp
similarity index 100%
rename from ANSODEngine/ANSOPENVINOOD.cpp
rename to modules/ANSODEngine/ANSOPENVINOOD.cpp
diff --git a/ANSODEngine/ANSOPENVINOOD.h b/modules/ANSODEngine/ANSOPENVINOOD.h
similarity index 100%
rename from ANSODEngine/ANSOPENVINOOD.h
rename to modules/ANSODEngine/ANSOPENVINOOD.h
diff --git a/ANSODEngine/ANSOVFBFaceDetector.cpp b/modules/ANSODEngine/ANSOVFBFaceDetector.cpp
similarity index 100%
rename from ANSODEngine/ANSOVFBFaceDetector.cpp
rename to modules/ANSODEngine/ANSOVFBFaceDetector.cpp
diff --git a/ANSODEngine/ANSOVFBFaceDetector.h b/modules/ANSODEngine/ANSOVFBFaceDetector.h
similarity index 100%
rename from ANSODEngine/ANSOVFBFaceDetector.h
rename to modules/ANSODEngine/ANSOVFBFaceDetector.h
diff --git a/ANSODEngine/ANSOVFaceDetector.cpp b/modules/ANSODEngine/ANSOVFaceDetector.cpp
similarity index 100%
rename from ANSODEngine/ANSOVFaceDetector.cpp
rename to modules/ANSODEngine/ANSOVFaceDetector.cpp
diff --git a/ANSODEngine/ANSOVFaceDetector.h b/modules/ANSODEngine/ANSOVFaceDetector.h
similarity index 100%
rename from ANSODEngine/ANSOVFaceDetector.h
rename to modules/ANSODEngine/ANSOVFaceDetector.h
diff --git a/ANSODEngine/ANSOVSEG.cpp b/modules/ANSODEngine/ANSOVSEG.cpp
similarity index 100%
rename from ANSODEngine/ANSOVSEG.cpp
rename to modules/ANSODEngine/ANSOVSEG.cpp
diff --git a/ANSODEngine/ANSOVSEG.h b/modules/ANSODEngine/ANSOVSEG.h
similarity index 100%
rename from ANSODEngine/ANSOVSEG.h
rename to modules/ANSODEngine/ANSOVSEG.h
diff --git a/ANSODEngine/ANSPOSE.cpp b/modules/ANSODEngine/ANSPOSE.cpp
similarity index 100%
rename from ANSODEngine/ANSPOSE.cpp
rename to modules/ANSODEngine/ANSPOSE.cpp
diff --git a/ANSODEngine/ANSPOSE.h b/modules/ANSODEngine/ANSPOSE.h
similarity index 100%
rename from ANSODEngine/ANSPOSE.h
rename to modules/ANSODEngine/ANSPOSE.h
diff --git a/ANSODEngine/ANSRTYOLO.cpp b/modules/ANSODEngine/ANSRTYOLO.cpp
similarity index 100%
rename from ANSODEngine/ANSRTYOLO.cpp
rename to modules/ANSODEngine/ANSRTYOLO.cpp
diff --git a/ANSODEngine/ANSRTYOLO.h b/modules/ANSODEngine/ANSRTYOLO.h
similarity index 100%
rename from ANSODEngine/ANSRTYOLO.h
rename to modules/ANSODEngine/ANSRTYOLO.h
diff --git a/ANSODEngine/ANSSAM.cpp b/modules/ANSODEngine/ANSSAM.cpp
similarity index 100%
rename from ANSODEngine/ANSSAM.cpp
rename to modules/ANSODEngine/ANSSAM.cpp
diff --git a/ANSODEngine/ANSSAM.h b/modules/ANSODEngine/ANSSAM.h
similarity index 100%
rename from ANSODEngine/ANSSAM.h
rename to modules/ANSODEngine/ANSSAM.h
diff --git a/ANSODEngine/ANSSAM3.cpp b/modules/ANSODEngine/ANSSAM3.cpp
similarity index 100%
rename from ANSODEngine/ANSSAM3.cpp
rename to modules/ANSODEngine/ANSSAM3.cpp
diff --git a/ANSODEngine/ANSSAM3.h b/modules/ANSODEngine/ANSSAM3.h
similarity index 100%
rename from ANSODEngine/ANSSAM3.h
rename to modules/ANSODEngine/ANSSAM3.h
diff --git a/ANSODEngine/ANSTENSORRTCL.cpp b/modules/ANSODEngine/ANSTENSORRTCL.cpp
similarity index 100%
rename from ANSODEngine/ANSTENSORRTCL.cpp
rename to modules/ANSODEngine/ANSTENSORRTCL.cpp
diff --git a/ANSODEngine/ANSTENSORRTCL.h b/modules/ANSODEngine/ANSTENSORRTCL.h
similarity index 100%
rename from ANSODEngine/ANSTENSORRTCL.h
rename to modules/ANSODEngine/ANSTENSORRTCL.h
diff --git a/ANSODEngine/ANSTENSORRTOD.h b/modules/ANSODEngine/ANSTENSORRTOD.h
similarity index 100%
rename from ANSODEngine/ANSTENSORRTOD.h
rename to modules/ANSODEngine/ANSTENSORRTOD.h
diff --git a/ANSODEngine/ANSTENSORRTPOSE.cpp b/modules/ANSODEngine/ANSTENSORRTPOSE.cpp
similarity index 100%
rename from ANSODEngine/ANSTENSORRTPOSE.cpp
rename to modules/ANSODEngine/ANSTENSORRTPOSE.cpp
diff --git a/ANSODEngine/ANSTENSORRTPOSE.h b/modules/ANSODEngine/ANSTENSORRTPOSE.h
similarity index 100%
rename from ANSODEngine/ANSTENSORRTPOSE.h
rename to modules/ANSODEngine/ANSTENSORRTPOSE.h
diff --git a/ANSODEngine/ANSTENSORRTSEG.cpp b/modules/ANSODEngine/ANSTENSORRTSEG.cpp
similarity index 100%
rename from ANSODEngine/ANSTENSORRTSEG.cpp
rename to modules/ANSODEngine/ANSTENSORRTSEG.cpp
diff --git a/ANSODEngine/ANSTENSORRTSEG.h b/modules/ANSODEngine/ANSTENSORRTSEG.h
similarity index 100%
rename from ANSODEngine/ANSTENSORRTSEG.h
rename to modules/ANSODEngine/ANSTENSORRTSEG.h
diff --git a/ANSODEngine/ANSTENSORTRTOD.cpp b/modules/ANSODEngine/ANSTENSORTRTOD.cpp
similarity index 100%
rename from ANSODEngine/ANSTENSORTRTOD.cpp
rename to modules/ANSODEngine/ANSTENSORTRTOD.cpp
diff --git a/ANSODEngine/ANSYOLO12OD.cpp b/modules/ANSODEngine/ANSYOLO12OD.cpp
similarity index 100%
rename from ANSODEngine/ANSYOLO12OD.cpp
rename to modules/ANSODEngine/ANSYOLO12OD.cpp
diff --git a/ANSODEngine/ANSYOLO12OD.h b/modules/ANSODEngine/ANSYOLO12OD.h
similarity index 100%
rename from ANSODEngine/ANSYOLO12OD.h
rename to modules/ANSODEngine/ANSYOLO12OD.h
diff --git a/ANSODEngine/ANSYOLOOD.cpp b/modules/ANSODEngine/ANSYOLOOD.cpp
similarity index 100%
rename from ANSODEngine/ANSYOLOOD.cpp
rename to modules/ANSODEngine/ANSYOLOOD.cpp
diff --git a/ANSODEngine/ANSYOLOOD.h b/modules/ANSODEngine/ANSYOLOOD.h
similarity index 100%
rename from ANSODEngine/ANSYOLOOD.h
rename to modules/ANSODEngine/ANSYOLOOD.h
diff --git a/ANSODEngine/ANSYOLOV10OVOD.cpp b/modules/ANSODEngine/ANSYOLOV10OVOD.cpp
similarity index 100%
rename from ANSODEngine/ANSYOLOV10OVOD.cpp
rename to modules/ANSODEngine/ANSYOLOV10OVOD.cpp
diff --git a/ANSODEngine/ANSYOLOV10OVOD.h b/modules/ANSODEngine/ANSYOLOV10OVOD.h
similarity index 100%
rename from ANSODEngine/ANSYOLOV10OVOD.h
rename to modules/ANSODEngine/ANSYOLOV10OVOD.h
diff --git a/ANSODEngine/ANSYOLOV10RTOD.cpp b/modules/ANSODEngine/ANSYOLOV10RTOD.cpp
similarity index 100%
rename from ANSODEngine/ANSYOLOV10RTOD.cpp
rename to modules/ANSODEngine/ANSYOLOV10RTOD.cpp
diff --git a/ANSODEngine/ANSYOLOV10RTOD.h b/modules/ANSODEngine/ANSYOLOV10RTOD.h
similarity index 100%
rename from ANSODEngine/ANSYOLOV10RTOD.h
rename to modules/ANSODEngine/ANSYOLOV10RTOD.h
diff --git a/ANSODEngine/ANSYOLOV12RTOD.cpp b/modules/ANSODEngine/ANSYOLOV12RTOD.cpp
similarity index 100%
rename from ANSODEngine/ANSYOLOV12RTOD.cpp
rename to modules/ANSODEngine/ANSYOLOV12RTOD.cpp
diff --git a/ANSODEngine/ANSYOLOV12RTOD.h b/modules/ANSODEngine/ANSYOLOV12RTOD.h
similarity index 100%
rename from ANSODEngine/ANSYOLOV12RTOD.h
rename to modules/ANSODEngine/ANSYOLOV12RTOD.h
diff --git a/ANSODEngine/CMakeLists.txt b/modules/ANSODEngine/CMakeLists.txt
similarity index 98%
rename from ANSODEngine/CMakeLists.txt
rename to modules/ANSODEngine/CMakeLists.txt
index 90f6d73..9d84e1d 100644
--- a/ANSODEngine/CMakeLists.txt
+++ b/modules/ANSODEngine/CMakeLists.txt
@@ -97,7 +97,7 @@ target_include_directories(ANSODEngine PRIVATE
     ${CMAKE_SOURCE_DIR}/engines/OpenVINOEngine/include/faceapp
     ${CMAKE_SOURCE_DIR}/engines/TensorRTAPI/include
     ${CMAKE_SOURCE_DIR}/engines/TensorRTEngine
-    ${CMAKE_SOURCE_DIR}/ANSLicensingSystem
+    ${CMAKE_SOURCE_DIR}/core/ANSLicensingSystem
     ${ANSLIBS_DIR}/nlohmann
     ${RESEARCH_DIR}/spdlog-1.12.0/include
     ${RESEARCH_DIR}
diff --git a/ANSODEngine/CNNFaceDetector.cpp b/modules/ANSODEngine/CNNFaceDetector.cpp
similarity index 100%
rename from ANSODEngine/CNNFaceDetector.cpp
rename to modules/ANSODEngine/CNNFaceDetector.cpp
diff --git a/ANSODEngine/CNNFaceDetector.h b/modules/ANSODEngine/CNNFaceDetector.h
similarity index 100%
rename from ANSODEngine/CNNFaceDetector.h
rename to modules/ANSODEngine/CNNFaceDetector.h
diff --git a/ANSODEngine/CUDA/cuda_utils.h b/modules/ANSODEngine/CUDA/cuda_utils.h
similarity index 100%
rename from ANSODEngine/CUDA/cuda_utils.h
rename to modules/ANSODEngine/CUDA/cuda_utils.h
diff --git a/ANSODEngine/CUDA/preprocess.cu b/modules/ANSODEngine/CUDA/preprocess.cu
similarity index 100%
rename from ANSODEngine/CUDA/preprocess.cu
rename to modules/ANSODEngine/CUDA/preprocess.cu
diff --git a/ANSODEngine/CUDA/preprocess.h b/modules/ANSODEngine/CUDA/preprocess.h
similarity index 100%
rename from ANSODEngine/CUDA/preprocess.h
rename to modules/ANSODEngine/CUDA/preprocess.h
diff --git a/ANSODEngine/Movienet.cpp b/modules/ANSODEngine/Movienet.cpp
similarity index 100%
rename from ANSODEngine/Movienet.cpp
rename to modules/ANSODEngine/Movienet.cpp
diff --git a/ANSODEngine/Movienet.h b/modules/ANSODEngine/Movienet.h
similarity index 100%
rename from ANSODEngine/Movienet.h
rename to modules/ANSODEngine/Movienet.h
diff --git a/ANSODEngine/NV12PreprocessHelper.cpp b/modules/ANSODEngine/NV12PreprocessHelper.cpp
similarity index 100%
rename from ANSODEngine/NV12PreprocessHelper.cpp
rename to modules/ANSODEngine/NV12PreprocessHelper.cpp
diff --git a/ANSODEngine/NV12PreprocessHelper.h b/modules/ANSODEngine/NV12PreprocessHelper.h
similarity index 100%
rename from ANSODEngine/NV12PreprocessHelper.h
rename to modules/ANSODEngine/NV12PreprocessHelper.h
diff --git a/ANSODEngine/RetinaFaceDetector.cpp b/modules/ANSODEngine/RetinaFaceDetector.cpp
similarity index 100%
rename from ANSODEngine/RetinaFaceDetector.cpp
rename to modules/ANSODEngine/RetinaFaceDetector.cpp
diff --git a/ANSODEngine/RetinaFaceDetector.h b/modules/ANSODEngine/RetinaFaceDetector.h
similarity index 100%
rename from ANSODEngine/RetinaFaceDetector.h
rename to modules/ANSODEngine/RetinaFaceDetector.h
diff --git a/ANSODEngine/SCRFDFaceDetector.cpp b/modules/ANSODEngine/SCRFDFaceDetector.cpp
similarity index 100%
rename from ANSODEngine/SCRFDFaceDetector.cpp
rename to modules/ANSODEngine/SCRFDFaceDetector.cpp
diff --git a/ANSODEngine/SCRFDFaceDetector.h b/modules/ANSODEngine/SCRFDFaceDetector.h
similarity index 100%
rename from ANSODEngine/SCRFDFaceDetector.h
rename to modules/ANSODEngine/SCRFDFaceDetector.h
diff --git a/ANSODEngine/SCRFDOVFaceDetector.cpp b/modules/ANSODEngine/SCRFDOVFaceDetector.cpp
similarity index 100%
rename from ANSODEngine/SCRFDOVFaceDetector.cpp
rename to modules/ANSODEngine/SCRFDOVFaceDetector.cpp
diff --git a/ANSODEngine/SCRFDOVFaceDetector.h b/modules/ANSODEngine/SCRFDOVFaceDetector.h
similarity index 100%
rename from ANSODEngine/SCRFDOVFaceDetector.h
rename to modules/ANSODEngine/SCRFDOVFaceDetector.h
diff --git a/ANSODEngine/dllmain.cpp b/modules/ANSODEngine/dllmain.cpp
similarity index 100%
rename from ANSODEngine/dllmain.cpp
rename to modules/ANSODEngine/dllmain.cpp
diff --git a/ANSODEngine/download_merges.py b/modules/ANSODEngine/download_merges.py
similarity index 100%
rename from ANSODEngine/download_merges.py
rename to modules/ANSODEngine/download_merges.py
diff --git a/ANSODEngine/engine.cpp b/modules/ANSODEngine/engine.cpp
similarity index 100%
rename from ANSODEngine/engine.cpp
rename to modules/ANSODEngine/engine.cpp
diff --git a/ANSODEngine/engine.h b/modules/ANSODEngine/engine.h
similarity index 100%
rename from ANSODEngine/engine.h
rename to modules/ANSODEngine/engine.h
diff --git a/ANSPulsar/framework.h b/modules/ANSODEngine/framework.h
similarity index 100%
rename from ANSPulsar/framework.h
rename to modules/ANSODEngine/framework.h
diff --git a/ANSODEngine/merges.txt b/modules/ANSODEngine/merges.txt
similarity index 100%
rename from ANSODEngine/merges.txt
rename to modules/ANSODEngine/merges.txt
diff --git a/ANSODEngine/nv12_to_rgb.cu b/modules/ANSODEngine/nv12_to_rgb.cu
similarity index 100%
rename from ANSODEngine/nv12_to_rgb.cu
rename to modules/ANSODEngine/nv12_to_rgb.cu
diff --git a/ANSODEngine/patch_tensorrtcl.py b/modules/ANSODEngine/patch_tensorrtcl.py
similarity index 100%
rename from ANSODEngine/patch_tensorrtcl.py
rename to modules/ANSODEngine/patch_tensorrtcl.py
diff --git a/ANSODEngine/patch_tensorrtpose.py b/modules/ANSODEngine/patch_tensorrtpose.py
similarity index 100%
rename from ANSODEngine/patch_tensorrtpose.py
rename to modules/ANSODEngine/patch_tensorrtpose.py
diff --git a/ANSODEngine/patch_tensorrtseg.py b/modules/ANSODEngine/patch_tensorrtseg.py
similarity index 100%
rename from ANSODEngine/patch_tensorrtseg.py
rename to modules/ANSODEngine/patch_tensorrtseg.py
diff --git a/ANSPulsar/pch.cpp b/modules/ANSODEngine/pch.cpp
similarity index 100%
rename from ANSPulsar/pch.cpp
rename to modules/ANSODEngine/pch.cpp
diff --git a/ANSPulsar/pch.h b/modules/ANSODEngine/pch.h
similarity index 100%
rename from ANSPulsar/pch.h
rename to modules/ANSODEngine/pch.h
diff --git a/ANSODTrainingEngine/ANSODTrainingEngine.cpp b/modules/ANSTrainingEngine/ANSODTrainingEngine.cpp
similarity index 100%
rename from ANSODTrainingEngine/ANSODTrainingEngine.cpp
rename to modules/ANSTrainingEngine/ANSODTrainingEngine.cpp
diff --git a/ANSODTrainingEngine/ANSODTraininingEngine.h b/modules/ANSTrainingEngine/ANSODTraininingEngine.h
similarity index 100%
rename from ANSODTrainingEngine/ANSODTraininingEngine.h
rename to modules/ANSTrainingEngine/ANSODTraininingEngine.h
diff --git a/ANSODTrainingEngine/ANSTrainingEngine.cpp b/modules/ANSTrainingEngine/ANSTrainingEngine.cpp
similarity index 100%
rename from ANSODTrainingEngine/ANSTrainingEngine.cpp
rename to modules/ANSTrainingEngine/ANSTrainingEngine.cpp
diff --git a/ANSODTrainingEngine/ANSTrainingEngine.h b/modules/ANSTrainingEngine/ANSTrainingEngine.h
similarity index 100%
rename from ANSODTrainingEngine/ANSTrainingEngine.h
rename to modules/ANSTrainingEngine/ANSTrainingEngine.h
diff --git a/ANSODTrainingEngine/ANSYOLOCLTrainingEngine.cpp b/modules/ANSTrainingEngine/ANSYOLOCLTrainingEngine.cpp
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOCLTrainingEngine.cpp
rename to modules/ANSTrainingEngine/ANSYOLOCLTrainingEngine.cpp
diff --git a/ANSODTrainingEngine/ANSYOLOCLTrainingEngine.h b/modules/ANSTrainingEngine/ANSYOLOCLTrainingEngine.h
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOCLTrainingEngine.h
rename to modules/ANSTrainingEngine/ANSYOLOCLTrainingEngine.h
diff --git a/ANSODTrainingEngine/ANSYOLOOBBTrainingEngine.cpp b/modules/ANSTrainingEngine/ANSYOLOOBBTrainingEngine.cpp
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOOBBTrainingEngine.cpp
rename to modules/ANSTrainingEngine/ANSYOLOOBBTrainingEngine.cpp
diff --git a/ANSODTrainingEngine/ANSYOLOOBBTrainingEngine.h b/modules/ANSTrainingEngine/ANSYOLOOBBTrainingEngine.h
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOOBBTrainingEngine.h
rename to modules/ANSTrainingEngine/ANSYOLOOBBTrainingEngine.h
diff --git a/ANSODTrainingEngine/ANSYOLOSEGTrainingEngine.cpp b/modules/ANSTrainingEngine/ANSYOLOSEGTrainingEngine.cpp
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOSEGTrainingEngine.cpp
rename to modules/ANSTrainingEngine/ANSYOLOSEGTrainingEngine.cpp
diff --git a/ANSODTrainingEngine/ANSYOLOSEGTrainingEngine.h b/modules/ANSTrainingEngine/ANSYOLOSEGTrainingEngine.h
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOSEGTrainingEngine.h
rename to modules/ANSTrainingEngine/ANSYOLOSEGTrainingEngine.h
diff --git a/ANSODTrainingEngine/ANSYOLOTrainingEngine.cpp b/modules/ANSTrainingEngine/ANSYOLOTrainingEngine.cpp
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOTrainingEngine.cpp
rename to modules/ANSTrainingEngine/ANSYOLOTrainingEngine.cpp
diff --git a/ANSODTrainingEngine/ANSYOLOTrainingEngine.h b/modules/ANSTrainingEngine/ANSYOLOTrainingEngine.h
similarity index 100%
rename from ANSODTrainingEngine/ANSYOLOTrainingEngine.h
rename to modules/ANSTrainingEngine/ANSYOLOTrainingEngine.h
diff --git a/ANSODTrainingEngine/CMakeLists.txt b/modules/ANSTrainingEngine/CMakeLists.txt
similarity index 100%
rename from ANSODTrainingEngine/CMakeLists.txt
rename to modules/ANSTrainingEngine/CMakeLists.txt
diff --git a/ANSONVIF/dllmain.cpp b/modules/ANSTrainingEngine/dllmain.cpp
similarity index 100%
rename from ANSONVIF/dllmain.cpp
rename to modules/ANSTrainingEngine/dllmain.cpp
diff --git a/ANSRabbitMQ/framework.h b/modules/ANSTrainingEngine/framework.h
similarity index 100%
rename from ANSRabbitMQ/framework.h
rename to modules/ANSTrainingEngine/framework.h
diff --git a/ANSRabbitMQ/pch.cpp b/modules/ANSTrainingEngine/pch.cpp
similarity index 100%
rename from ANSRabbitMQ/pch.cpp
rename to modules/ANSTrainingEngine/pch.cpp
diff --git a/ANSRabbitMQ/pch.h b/modules/ANSTrainingEngine/pch.h
similarity index 100%
rename from ANSRabbitMQ/pch.h
rename to modules/ANSTrainingEngine/pch.h
diff --git a/ANSUtilities/ANSAWSS3.cpp b/modules/ANSUtilities/ANSAWSS3.cpp
similarity index 100%
rename from ANSUtilities/ANSAWSS3.cpp
rename to modules/ANSUtilities/ANSAWSS3.cpp
diff --git a/ANSUtilities/ANSUtilities.cpp b/modules/ANSUtilities/ANSUtilities.cpp
similarity index 100%
rename from ANSUtilities/ANSUtilities.cpp
rename to modules/ANSUtilities/ANSUtilities.cpp
diff --git a/ANSUtilities/ANSUtilities.h b/modules/ANSUtilities/ANSUtilities.h
similarity index 100%
rename from ANSUtilities/ANSUtilities.h
rename to modules/ANSUtilities/ANSUtilities.h
diff --git a/ANSUtilities/CMakeLists.txt b/modules/ANSUtilities/CMakeLists.txt
similarity index 100%
rename from ANSUtilities/CMakeLists.txt
rename to modules/ANSUtilities/CMakeLists.txt
diff --git a/ANSUtilities/dllmain.cpp b/modules/ANSUtilities/dllmain.cpp
similarity index 100%
rename from ANSUtilities/dllmain.cpp
rename to modules/ANSUtilities/dllmain.cpp
diff --git a/ANSUtilities/framework.h b/modules/ANSUtilities/framework.h
similarity index 100%
rename from ANSUtilities/framework.h
rename to modules/ANSUtilities/framework.h
diff --git a/ANSUtilities/pch.cpp b/modules/ANSUtilities/pch.cpp
similarity index 100%
rename from ANSUtilities/pch.cpp
rename to modules/ANSUtilities/pch.cpp
diff --git a/ANSUtilities/pch.h b/modules/ANSUtilities/pch.h
similarity index 100%
rename from ANSUtilities/pch.h
rename to modules/ANSUtilities/pch.h
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..0075b41
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,2 @@
+# ANSCORE Unit Tests
+# Add test executables here as needed