diff --git a/build-qt/HGSolution/HGScanner.pro b/build-qt/HGSolution/HGScanner.pro
index e8576f92..51370e7d 100644
--- a/build-qt/HGSolution/HGScanner.pro
+++ b/build-qt/HGSolution/HGScanner.pro
@@ -84,7 +84,6 @@ unix {
 	}
 }
 
-INCLUDEPATH += $$PWD/../../ui/
 INCLUDEPATH += $$PWD/../../app/scanner/
 INCLUDEPATH += $$PWD/../../../sdk/include/
 
diff --git a/build/linux/HGBase/HGBase.cbp b/build/linux/HGBase/HGBase.cbp
index b8598e45..4fe2ea11 100644
--- a/build/linux/HGBase/HGBase.cbp
+++ b/build/linux/HGBase/HGBase.cbp
@@ -95,39 +95,39 @@
 			<Add option="-z defs" />
 			<Add option="-B direct" />
 		</Linker>
-		<Unit filename="../../../base/HGBase.h" />
-		<Unit filename="../../../base/HGBase64.cpp" />
-		<Unit filename="../../../base/HGBase64.h" />
-		<Unit filename="../../../base/HGBaseErr.h" />
-		<Unit filename="../../../base/HGBuffer.cpp" />
-		<Unit filename="../../../base/HGBuffer.h" />
-		<Unit filename="../../../base/HGConsole.cpp" />
-		<Unit filename="../../../base/HGConsole.h" />
-		<Unit filename="../../../base/HGDef.h" />
-		<Unit filename="../../../base/HGDes.cpp" />
-		<Unit filename="../../../base/HGDes.h" />
-		<Unit filename="../../../base/HGDll.cpp" />
-		<Unit filename="../../../base/HGDll.h" />
-		<Unit filename="../../../base/HGEvent.cpp" />
-		<Unit filename="../../../base/HGEvent.h" />
-		<Unit filename="../../../base/HGImage.cpp" />
-		<Unit filename="../../../base/HGImage.h" />
-		<Unit filename="../../../base/HGInc.h" />
-		<Unit filename="../../../base/HGInfo.cpp" />
-		<Unit filename="../../../base/HGInfo.h" />
-		<Unit filename="../../../base/HGInfoImpl.cpp" />
-		<Unit filename="../../../base/HGInfoImpl.hpp" />
-		<Unit filename="../../../base/HGLock.cpp" />
-		<Unit filename="../../../base/HGLock.h" />
-		<Unit filename="../../../base/HGLog.cpp" />
-		<Unit filename="../../../base/HGLog.h" />
-		<Unit filename="../../../base/HGMd5.cpp" />
-		<Unit filename="../../../base/HGMd5.h" />
-		<Unit filename="../../../base/HGThread.cpp" />
-		<Unit filename="../../../base/HGThread.h" />
-		<Unit filename="../../../base/HGUtility.cpp" />
-		<Unit filename="../../../base/HGUtility.h" />
-		<Unit filename="../../../base/dllmain.cpp" />
+		<Unit filename="../../../modules/base/HGBase.h" />
+		<Unit filename="../../../modules/base/HGBase64.cpp" />
+		<Unit filename="../../../modules/base/HGBase64.h" />
+		<Unit filename="../../../modules/base/HGBaseErr.h" />
+		<Unit filename="../../../modules/base/HGBuffer.cpp" />
+		<Unit filename="../../../modules/base/HGBuffer.h" />
+		<Unit filename="../../../modules/base/HGConsole.cpp" />
+		<Unit filename="../../../modules/base/HGConsole.h" />
+		<Unit filename="../../../modules/base/HGDef.h" />
+		<Unit filename="../../../modules/base/HGDes.cpp" />
+		<Unit filename="../../../modules/base/HGDes.h" />
+		<Unit filename="../../../modules/base/HGDll.cpp" />
+		<Unit filename="../../../modules/base/HGDll.h" />
+		<Unit filename="../../../modules/base/HGEvent.cpp" />
+		<Unit filename="../../../modules/base/HGEvent.h" />
+		<Unit filename="../../../modules/base/HGImage.cpp" />
+		<Unit filename="../../../modules/base/HGImage.h" />
+		<Unit filename="../../../modules/base/HGInc.h" />
+		<Unit filename="../../../modules/base/HGInfo.cpp" />
+		<Unit filename="../../../modules/base/HGInfo.h" />
+		<Unit filename="../../../modules/base/HGInfoImpl.cpp" />
+		<Unit filename="../../../modules/base/HGInfoImpl.hpp" />
+		<Unit filename="../../../modules/base/HGLock.cpp" />
+		<Unit filename="../../../modules/base/HGLock.h" />
+		<Unit filename="../../../modules/base/HGLog.cpp" />
+		<Unit filename="../../../modules/base/HGLog.h" />
+		<Unit filename="../../../modules/base/HGMd5.cpp" />
+		<Unit filename="../../../modules/base/HGMd5.h" />
+		<Unit filename="../../../modules/base/HGThread.cpp" />
+		<Unit filename="../../../modules/base/HGThread.h" />
+		<Unit filename="../../../modules/base/HGUtility.cpp" />
+		<Unit filename="../../../modules/base/HGUtility.h" />
+		<Unit filename="../../../modules/base/dllmain.cpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/build/linux/HGImgFmt/HGImgFmt.cbp b/build/linux/HGImgFmt/HGImgFmt.cbp
index 538feb87..fdbb74a9 100644
--- a/build/linux/HGImgFmt/HGImgFmt.cbp
+++ b/build/linux/HGImgFmt/HGImgFmt.cbp
@@ -194,25 +194,25 @@
 			<Add option="-z defs" />
 			<Add option="-B direct" />
 		</Linker>
-		<Unit filename="../../../imgfmt/HGBmp.cpp" />
-		<Unit filename="../../../imgfmt/HGBmp.h" />
-		<Unit filename="../../../imgfmt/HGImgFmt.cpp" />
-		<Unit filename="../../../imgfmt/HGImgFmt.h" />
-		<Unit filename="../../../imgfmt/HGImgFmtErr.h" />
-		<Unit filename="../../../imgfmt/HGJpeg.cpp" />
-		<Unit filename="../../../imgfmt/HGJpeg.h" />
-		<Unit filename="../../../imgfmt/HGOfd.cpp" />
-		<Unit filename="../../../imgfmt/HGOfd.h" />
-		<Unit filename="../../../imgfmt/HGOfdImpl.cpp" />
-		<Unit filename="../../../imgfmt/HGOfdImpl.hpp" />
-		<Unit filename="../../../imgfmt/HGPdf.cpp" />
-		<Unit filename="../../../imgfmt/HGPdf.h" />
-		<Unit filename="../../../imgfmt/HGPdfImpl.cpp" />
-		<Unit filename="../../../imgfmt/HGPdfImpl.hpp" />
-		<Unit filename="../../../imgfmt/HGPng.cpp" />
-		<Unit filename="../../../imgfmt/HGPng.h" />
-		<Unit filename="../../../imgfmt/HGTiff.cpp" />
-		<Unit filename="../../../imgfmt/HGTiff.h" />
+		<Unit filename="../../../modules/imgfmt/HGBmp.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGBmp.h" />
+		<Unit filename="../../../modules/imgfmt/HGImgFmt.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGImgFmt.h" />
+		<Unit filename="../../../modules/imgfmt/HGImgFmtErr.h" />
+		<Unit filename="../../../modules/imgfmt/HGJpeg.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGJpeg.h" />
+		<Unit filename="../../../modules/imgfmt/HGOfd.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGOfd.h" />
+		<Unit filename="../../../modules/imgfmt/HGOfdImpl.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGOfdImpl.hpp" />
+		<Unit filename="../../../modules/imgfmt/HGPdf.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGPdf.h" />
+		<Unit filename="../../../modules/imgfmt/HGPdfImpl.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGPdfImpl.hpp" />
+		<Unit filename="../../../modules/imgfmt/HGPng.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGPng.h" />
+		<Unit filename="../../../modules/imgfmt/HGTiff.cpp" />
+		<Unit filename="../../../modules/imgfmt/HGTiff.h" />
 		<Unit filename="../../../utility/HGString.cpp" />
 		<Unit filename="../../../utility/HGString.h" />
 		<Extensions>
diff --git a/build/linux/HGImgProc/HGImgProc.cbp b/build/linux/HGImgProc/HGImgProc.cbp
index 75d761a6..bc19248f 100644
--- a/build/linux/HGImgProc/HGImgProc.cbp
+++ b/build/linux/HGImgProc/HGImgProc.cbp
@@ -161,29 +161,29 @@
 			<Add option="-z defs" />
 			<Add option="-B direct" />
 		</Linker>
-		<Unit filename="../../../imgproc/HGImgProc.cpp" />
-		<Unit filename="../../../imgproc/HGImgProc.h" />
-		<Unit filename="../../../imgproc/HGImgProcErr.h" />
-		<Unit filename="../../../imgproc/HGOCR.cpp" />
-		<Unit filename="../../../imgproc/HGOCR.h" />
-		<Unit filename="../../../imgproc/HGOCRBase.cpp" />
-		<Unit filename="../../../imgproc/HGOCRBase.hpp" />
-		<Unit filename="../../../imgproc/HGOCRHanvon.cpp" />
-		<Unit filename="../../../imgproc/HGOCRHanvon.hpp" />
-		<Unit filename="../../../imgproc/HGOCRRetImpl.cpp" />
-		<Unit filename="../../../imgproc/HGOCRRetImpl.hpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApply.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApply.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAdjustColors.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAdjustColors.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAutoCrop.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyAutoCrop.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDiscardBlank.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDiscardBlank.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDispersion.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageApplyDispersion.h" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageProcess_Public.cpp" />
-		<Unit filename="../../../imgproc/ImageProcess/ImageProcess_Public.h" />
+		<Unit filename="../../../modules/imgproc/HGImgProc.cpp" />
+		<Unit filename="../../../modules/imgproc/HGImgProc.h" />
+		<Unit filename="../../../modules/imgproc/HGImgProcErr.h" />
+		<Unit filename="../../../modules/imgproc/HGOCR.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCR.h" />
+		<Unit filename="../../../modules/imgproc/HGOCRBase.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRBase.hpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRHanvon.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRHanvon.hpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRRetImpl.cpp" />
+		<Unit filename="../../../modules/imgproc/HGOCRRetImpl.hpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApply.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApply.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAdjustColors.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAdjustColors.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAutoCrop.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyAutoCrop.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDiscardBlank.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDiscardBlank.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDispersion.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageApplyDispersion.h" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageProcess_Public.cpp" />
+		<Unit filename="../../../modules/imgproc/ImageProcess/ImageProcess_Public.h" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/build/linux/HGSaneUser/HGSaneUser.cbp b/build/linux/HGSaneUser/HGSaneUser.cbp
index d2c88509..8a1b6a05 100644
--- a/build/linux/HGSaneUser/HGSaneUser.cbp
+++ b/build/linux/HGSaneUser/HGSaneUser.cbp
@@ -88,11 +88,11 @@
 			<Add option="-fvisibility=hidden" />
 			<Add directory="../../../third_party/sane" />
 		</Compiler>
-		<Unit filename="../../../sane_user/HGSane.cpp" />
-		<Unit filename="../../../sane_user/HGSane.h" />
-		<Unit filename="../../../sane_user/HGSaneErr.h" />
-		<Unit filename="../../../sane_user/HGSaneImpl.cpp" />
-		<Unit filename="../../../sane_user/HGSaneImpl.hpp" />
+		<Unit filename="../../../modules/sane_user/HGSane.cpp" />
+		<Unit filename="../../../modules/sane_user/HGSane.h" />
+		<Unit filename="../../../modules/sane_user/HGSaneErr.h" />
+		<Unit filename="../../../modules/sane_user/HGSaneImpl.cpp" />
+		<Unit filename="../../../modules/sane_user/HGSaneImpl.hpp" />
 		<Extensions>
 			<code_completion />
 			<debugger />
diff --git a/build/linux/HGTest/main.cpp b/build/linux/HGTest/main.cpp
index 83313bc1..1205309a 100644
--- a/build/linux/HGTest/main.cpp
+++ b/build/linux/HGTest/main.cpp
@@ -1,8 +1,9 @@
 #include "stdio.h"
-#include "../../../base/HGBase.h"
-#include "../../../imgfmt/HGImgFmt.h"
-#include "../../../imgproc/HGImgProc.h"
-#include "../../../imgproc/HGOCR.h"
+#include "base/HGBase.h"
+#include "imgfmt/HGImgFmt.h"
+#include "imgproc/HGImgProc.h"
+#include "imgproc/HGOCR.h"
+#include "sane_user/HGSane.h"
 
 int main()
 {
diff --git a/build/windows/HGBase/HGBase.vcxproj b/build/windows/HGBase/HGBase.vcxproj
index 26af5e77..4c12dde8 100644
--- a/build/windows/HGBase/HGBase.vcxproj
+++ b/build/windows/HGBase/HGBase.vcxproj
@@ -22,41 +22,41 @@
     <None Include="HGBase.def" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\base\dllmain.cpp" />
-    <ClCompile Include="..\..\..\base\HGBase64.cpp" />
-    <ClCompile Include="..\..\..\base\HGBuffer.cpp" />
-    <ClCompile Include="..\..\..\base\HGConsole.cpp" />
-    <ClCompile Include="..\..\..\base\HGDes.cpp" />
-    <ClCompile Include="..\..\..\base\HGDll.cpp" />
-    <ClCompile Include="..\..\..\base\HGEvent.cpp" />
-    <ClCompile Include="..\..\..\base\HGImage.cpp" />
-    <ClCompile Include="..\..\..\base\HGInfo.cpp" />
-    <ClCompile Include="..\..\..\base\HGInfoImpl.cpp" />
-    <ClCompile Include="..\..\..\base\HGLock.cpp" />
-    <ClCompile Include="..\..\..\base\HGLog.cpp" />
-    <ClCompile Include="..\..\..\base\HGMd5.cpp" />
-    <ClCompile Include="..\..\..\base\HGThread.cpp" />
-    <ClCompile Include="..\..\..\base\HGUtility.cpp" />
+    <ClCompile Include="..\..\..\modules\base\dllmain.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGBase64.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGBuffer.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGConsole.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGDes.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGDll.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGEvent.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGImage.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGInfo.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGInfoImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGLock.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGLog.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGMd5.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGThread.cpp" />
+    <ClCompile Include="..\..\..\modules\base\HGUtility.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\base\HGBase.h" />
-    <ClInclude Include="..\..\..\base\HGBase64.h" />
-    <ClInclude Include="..\..\..\base\HGBaseErr.h" />
-    <ClInclude Include="..\..\..\base\HGConsole.h" />
-    <ClInclude Include="..\..\..\base\HGInc.h" />
-    <ClInclude Include="..\..\..\base\HGBuffer.h" />
-    <ClInclude Include="..\..\..\base\HGDef.h" />
-    <ClInclude Include="..\..\..\base\HGDes.h" />
-    <ClInclude Include="..\..\..\base\HGDll.h" />
-    <ClInclude Include="..\..\..\base\HGEvent.h" />
-    <ClInclude Include="..\..\..\base\HGImage.h" />
-    <ClInclude Include="..\..\..\base\HGInfo.h" />
-    <ClInclude Include="..\..\..\base\HGInfoImpl.hpp" />
-    <ClInclude Include="..\..\..\base\HGLock.h" />
-    <ClInclude Include="..\..\..\base\HGLog.h" />
-    <ClInclude Include="..\..\..\base\HGMd5.h" />
-    <ClInclude Include="..\..\..\base\HGThread.h" />
-    <ClInclude Include="..\..\..\base\HGUtility.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBase.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBase64.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBaseErr.h" />
+    <ClInclude Include="..\..\..\modules\base\HGConsole.h" />
+    <ClInclude Include="..\..\..\modules\base\HGInc.h" />
+    <ClInclude Include="..\..\..\modules\base\HGBuffer.h" />
+    <ClInclude Include="..\..\..\modules\base\HGDef.h" />
+    <ClInclude Include="..\..\..\modules\base\HGDes.h" />
+    <ClInclude Include="..\..\..\modules\base\HGDll.h" />
+    <ClInclude Include="..\..\..\modules\base\HGEvent.h" />
+    <ClInclude Include="..\..\..\modules\base\HGImage.h" />
+    <ClInclude Include="..\..\..\modules\base\HGInfo.h" />
+    <ClInclude Include="..\..\..\modules\base\HGInfoImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\base\HGLock.h" />
+    <ClInclude Include="..\..\..\modules\base\HGLog.h" />
+    <ClInclude Include="..\..\..\modules\base\HGMd5.h" />
+    <ClInclude Include="..\..\..\modules\base\HGThread.h" />
+    <ClInclude Include="..\..\..\modules\base\HGUtility.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -169,7 +169,7 @@
     <PostBuildEvent>
       <Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
 copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
-copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
+copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
 copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -220,7 +220,7 @@ copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comman
     <PostBuildEvent>
       <Command>copy $(OutDir)HGBase.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
 copy $(OutDir)HGBase.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
-copy $(SolutionDir)..\..\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
+copy $(SolutionDir)..\..\modules\base\*.h $(SolutionDir)..\..\..\sdk\include\base\
 copy $(OutDir)HGBase.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
diff --git a/build/windows/HGImgFmt/HGImgFmt.vcxproj b/build/windows/HGImgFmt/HGImgFmt.vcxproj
index 482ee8d8..419a33c3 100644
--- a/build/windows/HGImgFmt/HGImgFmt.vcxproj
+++ b/build/windows/HGImgFmt/HGImgFmt.vcxproj
@@ -22,28 +22,28 @@
     <None Include="HGImgFmt.def" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\imgfmt\HGBmp.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGImgFmt.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGJpeg.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGOfd.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGOfdImpl.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGPdf.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGPdfImpl.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGPng.cpp" />
-    <ClCompile Include="..\..\..\imgfmt\HGTiff.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGBmp.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGImgFmt.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGJpeg.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGOfd.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGOfdImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGPdf.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGPdfImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGPng.cpp" />
+    <ClCompile Include="..\..\..\modules\imgfmt\HGTiff.cpp" />
     <ClCompile Include="..\..\..\utility\HGString.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\imgfmt\HGBmp.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGImgFmt.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGImgFmtErr.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGJpeg.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGOfd.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGOfdImpl.hpp" />
-    <ClInclude Include="..\..\..\imgfmt\HGPdf.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGPdfImpl.hpp" />
-    <ClInclude Include="..\..\..\imgfmt\HGPng.h" />
-    <ClInclude Include="..\..\..\imgfmt\HGTiff.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGBmp.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGImgFmt.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGImgFmtErr.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGJpeg.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGOfd.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGOfdImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGPdf.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGPdfImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGPng.h" />
+    <ClInclude Include="..\..\..\modules\imgfmt\HGTiff.h" />
     <ClInclude Include="..\..\..\utility\HGString.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -119,7 +119,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -142,7 +142,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -157,7 +157,7 @@
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
 copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
-copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
+copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
 copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -170,7 +170,7 @@ copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comm
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <WholeProgramOptimization>false</WholeProgramOptimization>
     </ClCompile>
@@ -194,7 +194,7 @@ copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comm
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../third_party/libjpeg/windows/include;../../../third_party/libnsbmp/windows/include;../../../third_party/libpng/windows/include;../../../third_party/zlib/windows/include;../../../third_party/libtiff/windows/include;../../../third_party/mupdf/windows/include;../../../third_party/pdflib/windows/include;../../../third_party/libzip/windows/include;../../../third_party/tinyxml2/windows/include;../../../utility;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -209,7 +209,7 @@ copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Comm
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgFmt.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
 copy $(OutDir)HGImgFmt.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
-copy $(SolutionDir)..\..\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
+copy $(SolutionDir)..\..\modules\imgfmt\*.h $(SolutionDir)..\..\..\sdk\include\imgfmt\
 copy $(OutDir)HGImgFmt.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
diff --git a/build/windows/HGImgProc/HGImgProc.vcxproj b/build/windows/HGImgProc/HGImgProc.vcxproj
index 22579f17..ff9a537b 100644
--- a/build/windows/HGImgProc/HGImgProc.vcxproj
+++ b/build/windows/HGImgProc/HGImgProc.vcxproj
@@ -19,31 +19,31 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\imgproc\HGImgProc.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCR.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCRBase.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCRHanvon.cpp" />
-    <ClCompile Include="..\..\..\imgproc\HGOCRRetImpl.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApply.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyAdjustColors.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyAutoCrop.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyDiscardBlank.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageApplyDispersion.cpp" />
-    <ClCompile Include="..\..\..\imgproc\ImageProcess\ImageProcess_Public.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGImgProc.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCR.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCRBase.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCRHanvon.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\HGOCRRetImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApply.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAdjustColors.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAutoCrop.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDiscardBlank.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDispersion.cpp" />
+    <ClCompile Include="..\..\..\modules\imgproc\ImageProcess\ImageProcess_Public.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\imgproc\HGImgProc.h" />
-    <ClInclude Include="..\..\..\imgproc\HGImgProcErr.h" />
-    <ClInclude Include="..\..\..\imgproc\HGOCR.h" />
-    <ClInclude Include="..\..\..\imgproc\HGOCRBase.hpp" />
-    <ClInclude Include="..\..\..\imgproc\HGOCRHanvon.hpp" />
-    <ClInclude Include="..\..\..\imgproc\HGOCRRetImpl.hpp" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApply.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyAdjustColors.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyAutoCrop.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyDiscardBlank.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageApplyDispersion.h" />
-    <ClInclude Include="..\..\..\imgproc\ImageProcess\ImageProcess_Public.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGImgProc.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGImgProcErr.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCR.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCRBase.hpp" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCRHanvon.hpp" />
+    <ClInclude Include="..\..\..\modules\imgproc\HGOCRRetImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApply.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAdjustColors.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyAutoCrop.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDiscardBlank.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageApplyDispersion.h" />
+    <ClInclude Include="..\..\..\modules\imgproc\ImageProcess\ImageProcess_Public.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="HGImgProc.def" />
@@ -160,7 +160,7 @@
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
 copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x86\Release\
-copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
+copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
 copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
@@ -212,7 +212,7 @@ copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x86\Release\</Com
     <PostBuildEvent>
       <Command>copy $(OutDir)HGImgProc.lib $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
 copy $(OutDir)HGImgProc.pdb $(SolutionDir)..\..\..\sdk\lib\win\x64\Release\
-copy $(SolutionDir)..\..\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
+copy $(SolutionDir)..\..\modules\imgproc\*.h $(SolutionDir)..\..\..\sdk\include\imgproc\
 copy $(OutDir)HGImgProc.dll $(SolutionDir)..\..\..\release\win\x64\Release\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
diff --git a/build/windows/HGSaneUser/HGSaneUser.vcxproj b/build/windows/HGSaneUser/HGSaneUser.vcxproj
index 20bbfa82..f64cfe45 100644
--- a/build/windows/HGSaneUser/HGSaneUser.vcxproj
+++ b/build/windows/HGSaneUser/HGSaneUser.vcxproj
@@ -19,13 +19,13 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\sane_user\HGSane.cpp" />
-    <ClCompile Include="..\..\..\sane_user\HGSaneImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\sane_user\HGSane.cpp" />
+    <ClCompile Include="..\..\..\modules\sane_user\HGSaneImpl.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\sane_user\HGSane.h" />
-    <ClInclude Include="..\..\..\sane_user\HGSaneErr.h" />
-    <ClInclude Include="..\..\..\sane_user\HGSaneImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\sane_user\HGSane.h" />
+    <ClInclude Include="..\..\..\modules\sane_user\HGSaneErr.h" />
+    <ClInclude Include="..\..\..\modules\sane_user\HGSaneImpl.hpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="HGSaneUser.def" />
diff --git a/build/windows/HGTest/HGTest.vcxproj b/build/windows/HGTest/HGTest.vcxproj
index 45e2a8b4..4de9d506 100644
--- a/build/windows/HGTest/HGTest.vcxproj
+++ b/build/windows/HGTest/HGTest.vcxproj
@@ -93,6 +93,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -115,6 +116,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -139,6 +141,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -166,6 +169,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>../../../modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/build/windows/HGTest/pch.cpp b/build/windows/HGTest/pch.cpp
index 7e76c1e2..6ed571a8 100644
--- a/build/windows/HGTest/pch.cpp
+++ b/build/windows/HGTest/pch.cpp
@@ -8,24 +8,28 @@
 #ifdef _DEBUG
 #pragma comment(lib, "../x64/Debug/HGBase.lib")
 #pragma comment(lib, "../x64/Debug/HGImgFmt.lib")
-#pragma comment(lib, "../x64/Debug/HGTwainUser.lib")
 #pragma comment(lib, "../x64/Debug/HGImgProc.lib")
+#pragma comment(lib, "../x64/Debug/HGTwainUser.lib")
+#pragma comment(lib, "../x64/Debug/HGSaneUser.lib")
 #else
 #pragma comment(lib, "../x64/Release/HGBase.lib")
 #pragma comment(lib, "../x64/Release/HGImgFmt.lib")
-#pragma comment(lib, "../x64/Release/HGTwainUser.lib")
 #pragma comment(lib, "../x64/Release/HGImgProc.lib")
+#pragma comment(lib, "../x64/Release/HGTwainUser.lib")
+#pragma comment(lib, "../x64/Release/HGSaneUser.lib")
 #endif
 #else
 #ifdef _DEBUG
 #pragma comment(lib, "../Debug/HGBase.lib")
 #pragma comment(lib, "../Debug/HGImgFmt.lib")
-#pragma comment(lib, "../Debug/HGTwainUser.lib")
 #pragma comment(lib, "../Debug/HGImgProc.lib")
+#pragma comment(lib, "../Debug/HGTwainUser.lib")
+#pragma comment(lib, "../Debug/HGSaneUser.lib")
 #else
 #pragma comment(lib, "../Release/HGBase.lib")
 #pragma comment(lib, "../Release/HGImgFmt.lib")
-#pragma comment(lib, "../Release/HGTwainUser.lib")
 #pragma comment(lib, "../Release/HGImgProc.lib")
+#pragma comment(lib, "../Release/HGTwainUser.lib")
+#pragma comment(lib, "../Release/HGSaneUser.lib")
 #endif
 #endif
diff --git a/build/windows/HGTest/pch.h b/build/windows/HGTest/pch.h
index 21194e34..cf27d615 100644
--- a/build/windows/HGTest/pch.h
+++ b/build/windows/HGTest/pch.h
@@ -10,16 +10,17 @@
 // 添加要在此处预编译的标头
 #include "framework.h"
 
-#include "../../../base/HGBase.h"
-#include "../../../imgfmt/HGJpeg.h"
-#include "../../../imgfmt/HGBmp.h"
-#include "../../../imgfmt/HGPng.h"
-#include "../../../imgfmt/HGTiff.h"
-#include "../../../imgfmt/HGPdf.h"
-#include "../../../imgfmt/HGOfd.h"
-#include "../../../imgfmt/HGImgFmt.h"
-#include "../../../twain_user/HGTwain.h"
-#include "../../../imgproc/HGImgProc.h"
-#include "../../../imgproc/HGOCR.h"
+#include "base/HGBase.h"
+#include "imgfmt/HGJpeg.h"
+#include "imgfmt/HGBmp.h"
+#include "imgfmt/HGPng.h"
+#include "imgfmt/HGTiff.h"
+#include "imgfmt/HGPdf.h"
+#include "imgfmt/HGOfd.h"
+#include "imgfmt/HGImgFmt.h"
+#include "imgproc/HGImgProc.h"
+#include "imgproc/HGOCR.h"
+#include "twain_user/HGTwain.h"
+#include "sane_user/HGSane.h"
 
 #endif //PCH_H
diff --git a/build/windows/HGTwainUser/HGTwainUser.vcxproj b/build/windows/HGTwainUser/HGTwainUser.vcxproj
index 2012c69d..e904c38c 100644
--- a/build/windows/HGTwainUser/HGTwainUser.vcxproj
+++ b/build/windows/HGTwainUser/HGTwainUser.vcxproj
@@ -22,14 +22,14 @@
     <None Include="HGTwainUser.def" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\twain_user\dllmain.cpp" />
-    <ClCompile Include="..\..\..\twain_user\HGTwain.cpp" />
-    <ClCompile Include="..\..\..\twain_user\HGTwainImpl.cpp" />
+    <ClCompile Include="..\..\..\modules\twain_user\dllmain.cpp" />
+    <ClCompile Include="..\..\..\modules\twain_user\HGTwain.cpp" />
+    <ClCompile Include="..\..\..\modules\twain_user\HGTwainImpl.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\twain_user\HGTwain.h" />
-    <ClInclude Include="..\..\..\twain_user\HGTwainErr.h" />
-    <ClInclude Include="..\..\..\twain_user\HGTwainImpl.hpp" />
+    <ClInclude Include="..\..\..\modules\twain_user\HGTwain.h" />
+    <ClInclude Include="..\..\..\modules\twain_user\HGTwainErr.h" />
+    <ClInclude Include="..\..\..\modules\twain_user\HGTwainImpl.hpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
diff --git a/build/windows/HGWebService/HGWebService.vcxproj b/build/windows/HGWebService/HGWebService.vcxproj
index 20e0e643..e789fbd8 100644
--- a/build/windows/HGWebService/HGWebService.vcxproj
+++ b/build/windows/HGWebService/HGWebService.vcxproj
@@ -119,7 +119,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -137,7 +137,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;CURL_STATICLIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -158,7 +158,7 @@
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -176,7 +176,7 @@
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;_CONSOLE;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../third_party/libzip/windows/include;../../../third_party/libcurl/windows/include;../../../../sdk/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../modules/;../../../third_party/sha1/;../../../third_party/base64/;../../../third_party/json/;../../../utility/;../../../third_party/libzip/windows/include/;../../../third_party/libcurl/windows/include/;../../../../sdk/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/base/HGBase.h b/modules/base/HGBase.h
similarity index 100%
rename from base/HGBase.h
rename to modules/base/HGBase.h
diff --git a/base/HGBase64.cpp b/modules/base/HGBase64.cpp
similarity index 100%
rename from base/HGBase64.cpp
rename to modules/base/HGBase64.cpp
diff --git a/base/HGBase64.h b/modules/base/HGBase64.h
similarity index 100%
rename from base/HGBase64.h
rename to modules/base/HGBase64.h
diff --git a/base/HGBaseErr.h b/modules/base/HGBaseErr.h
similarity index 100%
rename from base/HGBaseErr.h
rename to modules/base/HGBaseErr.h
diff --git a/base/HGBuffer.cpp b/modules/base/HGBuffer.cpp
similarity index 100%
rename from base/HGBuffer.cpp
rename to modules/base/HGBuffer.cpp
diff --git a/base/HGBuffer.h b/modules/base/HGBuffer.h
similarity index 100%
rename from base/HGBuffer.h
rename to modules/base/HGBuffer.h
diff --git a/base/HGConsole.cpp b/modules/base/HGConsole.cpp
similarity index 100%
rename from base/HGConsole.cpp
rename to modules/base/HGConsole.cpp
diff --git a/base/HGConsole.h b/modules/base/HGConsole.h
similarity index 100%
rename from base/HGConsole.h
rename to modules/base/HGConsole.h
diff --git a/base/HGDef.h b/modules/base/HGDef.h
similarity index 100%
rename from base/HGDef.h
rename to modules/base/HGDef.h
diff --git a/base/HGDes.cpp b/modules/base/HGDes.cpp
similarity index 100%
rename from base/HGDes.cpp
rename to modules/base/HGDes.cpp
diff --git a/base/HGDes.h b/modules/base/HGDes.h
similarity index 100%
rename from base/HGDes.h
rename to modules/base/HGDes.h
diff --git a/base/HGDll.cpp b/modules/base/HGDll.cpp
similarity index 100%
rename from base/HGDll.cpp
rename to modules/base/HGDll.cpp
diff --git a/base/HGDll.h b/modules/base/HGDll.h
similarity index 100%
rename from base/HGDll.h
rename to modules/base/HGDll.h
diff --git a/base/HGEvent.cpp b/modules/base/HGEvent.cpp
similarity index 100%
rename from base/HGEvent.cpp
rename to modules/base/HGEvent.cpp
diff --git a/base/HGEvent.h b/modules/base/HGEvent.h
similarity index 100%
rename from base/HGEvent.h
rename to modules/base/HGEvent.h
diff --git a/base/HGImage.cpp b/modules/base/HGImage.cpp
similarity index 100%
rename from base/HGImage.cpp
rename to modules/base/HGImage.cpp
diff --git a/base/HGImage.h b/modules/base/HGImage.h
similarity index 100%
rename from base/HGImage.h
rename to modules/base/HGImage.h
diff --git a/base/HGInc.h b/modules/base/HGInc.h
similarity index 100%
rename from base/HGInc.h
rename to modules/base/HGInc.h
diff --git a/base/HGInfo.cpp b/modules/base/HGInfo.cpp
similarity index 100%
rename from base/HGInfo.cpp
rename to modules/base/HGInfo.cpp
diff --git a/base/HGInfo.h b/modules/base/HGInfo.h
similarity index 100%
rename from base/HGInfo.h
rename to modules/base/HGInfo.h
diff --git a/base/HGInfoImpl.cpp b/modules/base/HGInfoImpl.cpp
similarity index 100%
rename from base/HGInfoImpl.cpp
rename to modules/base/HGInfoImpl.cpp
diff --git a/base/HGInfoImpl.hpp b/modules/base/HGInfoImpl.hpp
similarity index 100%
rename from base/HGInfoImpl.hpp
rename to modules/base/HGInfoImpl.hpp
diff --git a/base/HGLock.cpp b/modules/base/HGLock.cpp
similarity index 100%
rename from base/HGLock.cpp
rename to modules/base/HGLock.cpp
diff --git a/base/HGLock.h b/modules/base/HGLock.h
similarity index 100%
rename from base/HGLock.h
rename to modules/base/HGLock.h
diff --git a/base/HGLog.cpp b/modules/base/HGLog.cpp
similarity index 100%
rename from base/HGLog.cpp
rename to modules/base/HGLog.cpp
diff --git a/base/HGLog.h b/modules/base/HGLog.h
similarity index 100%
rename from base/HGLog.h
rename to modules/base/HGLog.h
diff --git a/base/HGMd5.cpp b/modules/base/HGMd5.cpp
similarity index 100%
rename from base/HGMd5.cpp
rename to modules/base/HGMd5.cpp
diff --git a/base/HGMd5.h b/modules/base/HGMd5.h
similarity index 100%
rename from base/HGMd5.h
rename to modules/base/HGMd5.h
diff --git a/base/HGThread.cpp b/modules/base/HGThread.cpp
similarity index 100%
rename from base/HGThread.cpp
rename to modules/base/HGThread.cpp
diff --git a/base/HGThread.h b/modules/base/HGThread.h
similarity index 100%
rename from base/HGThread.h
rename to modules/base/HGThread.h
diff --git a/base/HGUtility.cpp b/modules/base/HGUtility.cpp
similarity index 100%
rename from base/HGUtility.cpp
rename to modules/base/HGUtility.cpp
diff --git a/base/HGUtility.h b/modules/base/HGUtility.h
similarity index 100%
rename from base/HGUtility.h
rename to modules/base/HGUtility.h
diff --git a/base/dllmain.cpp b/modules/base/dllmain.cpp
similarity index 100%
rename from base/dllmain.cpp
rename to modules/base/dllmain.cpp
diff --git a/imgfmt/HGBmp.cpp b/modules/imgfmt/HGBmp.cpp
similarity index 100%
rename from imgfmt/HGBmp.cpp
rename to modules/imgfmt/HGBmp.cpp
diff --git a/imgfmt/HGBmp.h b/modules/imgfmt/HGBmp.h
similarity index 100%
rename from imgfmt/HGBmp.h
rename to modules/imgfmt/HGBmp.h
diff --git a/imgfmt/HGImgFmt.cpp b/modules/imgfmt/HGImgFmt.cpp
similarity index 100%
rename from imgfmt/HGImgFmt.cpp
rename to modules/imgfmt/HGImgFmt.cpp
diff --git a/imgfmt/HGImgFmt.h b/modules/imgfmt/HGImgFmt.h
similarity index 100%
rename from imgfmt/HGImgFmt.h
rename to modules/imgfmt/HGImgFmt.h
diff --git a/imgfmt/HGImgFmtErr.h b/modules/imgfmt/HGImgFmtErr.h
similarity index 100%
rename from imgfmt/HGImgFmtErr.h
rename to modules/imgfmt/HGImgFmtErr.h
diff --git a/imgfmt/HGJpeg.cpp b/modules/imgfmt/HGJpeg.cpp
similarity index 100%
rename from imgfmt/HGJpeg.cpp
rename to modules/imgfmt/HGJpeg.cpp
diff --git a/imgfmt/HGJpeg.h b/modules/imgfmt/HGJpeg.h
similarity index 100%
rename from imgfmt/HGJpeg.h
rename to modules/imgfmt/HGJpeg.h
diff --git a/imgfmt/HGOfd.cpp b/modules/imgfmt/HGOfd.cpp
similarity index 100%
rename from imgfmt/HGOfd.cpp
rename to modules/imgfmt/HGOfd.cpp
diff --git a/imgfmt/HGOfd.h b/modules/imgfmt/HGOfd.h
similarity index 100%
rename from imgfmt/HGOfd.h
rename to modules/imgfmt/HGOfd.h
diff --git a/imgfmt/HGOfdImpl.cpp b/modules/imgfmt/HGOfdImpl.cpp
similarity index 99%
rename from imgfmt/HGOfdImpl.cpp
rename to modules/imgfmt/HGOfdImpl.cpp
index 35d1fb7b..caabe489 100644
--- a/imgfmt/HGOfdImpl.cpp
+++ b/modules/imgfmt/HGOfdImpl.cpp
@@ -1,7 +1,7 @@
 #include "HGOfdImpl.hpp"
 #include "../base/HGInc.h"
 #include "../base/HGUtility.h"
-#include "../utility/HGString.h"
+#include "HGString.h"
 
 #define A4page_page_PhysicalBox_Width	210.000000
 #define A4page_page_PhysicalBox_Height	297.000000
diff --git a/imgfmt/HGOfdImpl.hpp b/modules/imgfmt/HGOfdImpl.hpp
similarity index 100%
rename from imgfmt/HGOfdImpl.hpp
rename to modules/imgfmt/HGOfdImpl.hpp
diff --git a/imgfmt/HGPdf.cpp b/modules/imgfmt/HGPdf.cpp
similarity index 100%
rename from imgfmt/HGPdf.cpp
rename to modules/imgfmt/HGPdf.cpp
diff --git a/imgfmt/HGPdf.h b/modules/imgfmt/HGPdf.h
similarity index 100%
rename from imgfmt/HGPdf.h
rename to modules/imgfmt/HGPdf.h
diff --git a/imgfmt/HGPdfImpl.cpp b/modules/imgfmt/HGPdfImpl.cpp
similarity index 99%
rename from imgfmt/HGPdfImpl.cpp
rename to modules/imgfmt/HGPdfImpl.cpp
index 38d84fb0..f758082d 100644
--- a/imgfmt/HGPdfImpl.cpp
+++ b/modules/imgfmt/HGPdfImpl.cpp
@@ -1,7 +1,7 @@
 #include "HGPdfImpl.hpp"
 #include "../base/HGInc.h"
 #include "../base/HGUtility.h"
-#include "../utility/HGString.h"
+#include "HGString.h"
 #include <string>
 #include <iostream>
 
diff --git a/imgfmt/HGPdfImpl.hpp b/modules/imgfmt/HGPdfImpl.hpp
similarity index 100%
rename from imgfmt/HGPdfImpl.hpp
rename to modules/imgfmt/HGPdfImpl.hpp
diff --git a/imgfmt/HGPng.cpp b/modules/imgfmt/HGPng.cpp
similarity index 100%
rename from imgfmt/HGPng.cpp
rename to modules/imgfmt/HGPng.cpp
diff --git a/imgfmt/HGPng.h b/modules/imgfmt/HGPng.h
similarity index 100%
rename from imgfmt/HGPng.h
rename to modules/imgfmt/HGPng.h
diff --git a/imgfmt/HGTiff.cpp b/modules/imgfmt/HGTiff.cpp
similarity index 100%
rename from imgfmt/HGTiff.cpp
rename to modules/imgfmt/HGTiff.cpp
diff --git a/imgfmt/HGTiff.h b/modules/imgfmt/HGTiff.h
similarity index 100%
rename from imgfmt/HGTiff.h
rename to modules/imgfmt/HGTiff.h
diff --git a/imgproc/HGImgProc.cpp b/modules/imgproc/HGImgProc.cpp
similarity index 100%
rename from imgproc/HGImgProc.cpp
rename to modules/imgproc/HGImgProc.cpp
diff --git a/imgproc/HGImgProc.h b/modules/imgproc/HGImgProc.h
similarity index 100%
rename from imgproc/HGImgProc.h
rename to modules/imgproc/HGImgProc.h
diff --git a/imgproc/HGImgProcErr.h b/modules/imgproc/HGImgProcErr.h
similarity index 100%
rename from imgproc/HGImgProcErr.h
rename to modules/imgproc/HGImgProcErr.h
diff --git a/imgproc/HGOCR.cpp b/modules/imgproc/HGOCR.cpp
similarity index 100%
rename from imgproc/HGOCR.cpp
rename to modules/imgproc/HGOCR.cpp
diff --git a/imgproc/HGOCR.h b/modules/imgproc/HGOCR.h
similarity index 100%
rename from imgproc/HGOCR.h
rename to modules/imgproc/HGOCR.h
diff --git a/imgproc/HGOCRBase.cpp b/modules/imgproc/HGOCRBase.cpp
similarity index 100%
rename from imgproc/HGOCRBase.cpp
rename to modules/imgproc/HGOCRBase.cpp
diff --git a/imgproc/HGOCRBase.hpp b/modules/imgproc/HGOCRBase.hpp
similarity index 100%
rename from imgproc/HGOCRBase.hpp
rename to modules/imgproc/HGOCRBase.hpp
diff --git a/imgproc/HGOCRHanvon.cpp b/modules/imgproc/HGOCRHanvon.cpp
similarity index 100%
rename from imgproc/HGOCRHanvon.cpp
rename to modules/imgproc/HGOCRHanvon.cpp
diff --git a/imgproc/HGOCRHanvon.hpp b/modules/imgproc/HGOCRHanvon.hpp
similarity index 100%
rename from imgproc/HGOCRHanvon.hpp
rename to modules/imgproc/HGOCRHanvon.hpp
diff --git a/imgproc/HGOCRRetImpl.cpp b/modules/imgproc/HGOCRRetImpl.cpp
similarity index 100%
rename from imgproc/HGOCRRetImpl.cpp
rename to modules/imgproc/HGOCRRetImpl.cpp
diff --git a/imgproc/HGOCRRetImpl.hpp b/modules/imgproc/HGOCRRetImpl.hpp
similarity index 100%
rename from imgproc/HGOCRRetImpl.hpp
rename to modules/imgproc/HGOCRRetImpl.hpp
diff --git a/imgproc/ImageProcess/ImageApply.cpp b/modules/imgproc/ImageProcess/ImageApply.cpp
similarity index 100%
rename from imgproc/ImageProcess/ImageApply.cpp
rename to modules/imgproc/ImageProcess/ImageApply.cpp
diff --git a/imgproc/ImageProcess/ImageApply.h b/modules/imgproc/ImageProcess/ImageApply.h
similarity index 100%
rename from imgproc/ImageProcess/ImageApply.h
rename to modules/imgproc/ImageProcess/ImageApply.h
diff --git a/imgproc/ImageProcess/ImageApplyAdjustColors.cpp b/modules/imgproc/ImageProcess/ImageApplyAdjustColors.cpp
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyAdjustColors.cpp
rename to modules/imgproc/ImageProcess/ImageApplyAdjustColors.cpp
diff --git a/imgproc/ImageProcess/ImageApplyAdjustColors.h b/modules/imgproc/ImageProcess/ImageApplyAdjustColors.h
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyAdjustColors.h
rename to modules/imgproc/ImageProcess/ImageApplyAdjustColors.h
diff --git a/imgproc/ImageProcess/ImageApplyAutoCrop.cpp b/modules/imgproc/ImageProcess/ImageApplyAutoCrop.cpp
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyAutoCrop.cpp
rename to modules/imgproc/ImageProcess/ImageApplyAutoCrop.cpp
diff --git a/imgproc/ImageProcess/ImageApplyAutoCrop.h b/modules/imgproc/ImageProcess/ImageApplyAutoCrop.h
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyAutoCrop.h
rename to modules/imgproc/ImageProcess/ImageApplyAutoCrop.h
diff --git a/imgproc/ImageProcess/ImageApplyDiscardBlank.cpp b/modules/imgproc/ImageProcess/ImageApplyDiscardBlank.cpp
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyDiscardBlank.cpp
rename to modules/imgproc/ImageProcess/ImageApplyDiscardBlank.cpp
diff --git a/imgproc/ImageProcess/ImageApplyDiscardBlank.h b/modules/imgproc/ImageProcess/ImageApplyDiscardBlank.h
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyDiscardBlank.h
rename to modules/imgproc/ImageProcess/ImageApplyDiscardBlank.h
diff --git a/imgproc/ImageProcess/ImageApplyDispersion.cpp b/modules/imgproc/ImageProcess/ImageApplyDispersion.cpp
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyDispersion.cpp
rename to modules/imgproc/ImageProcess/ImageApplyDispersion.cpp
diff --git a/imgproc/ImageProcess/ImageApplyDispersion.h b/modules/imgproc/ImageProcess/ImageApplyDispersion.h
similarity index 100%
rename from imgproc/ImageProcess/ImageApplyDispersion.h
rename to modules/imgproc/ImageProcess/ImageApplyDispersion.h
diff --git a/imgproc/ImageProcess/ImageProcess_Public.cpp b/modules/imgproc/ImageProcess/ImageProcess_Public.cpp
similarity index 100%
rename from imgproc/ImageProcess/ImageProcess_Public.cpp
rename to modules/imgproc/ImageProcess/ImageProcess_Public.cpp
diff --git a/imgproc/ImageProcess/ImageProcess_Public.h b/modules/imgproc/ImageProcess/ImageProcess_Public.h
similarity index 100%
rename from imgproc/ImageProcess/ImageProcess_Public.h
rename to modules/imgproc/ImageProcess/ImageProcess_Public.h
diff --git a/sane_user/HGSane.cpp b/modules/sane_user/HGSane.cpp
similarity index 100%
rename from sane_user/HGSane.cpp
rename to modules/sane_user/HGSane.cpp
diff --git a/sane_user/HGSane.h b/modules/sane_user/HGSane.h
similarity index 100%
rename from sane_user/HGSane.h
rename to modules/sane_user/HGSane.h
diff --git a/sane_user/HGSaneErr.h b/modules/sane_user/HGSaneErr.h
similarity index 100%
rename from sane_user/HGSaneErr.h
rename to modules/sane_user/HGSaneErr.h
diff --git a/sane_user/HGSaneImpl.cpp b/modules/sane_user/HGSaneImpl.cpp
similarity index 100%
rename from sane_user/HGSaneImpl.cpp
rename to modules/sane_user/HGSaneImpl.cpp
diff --git a/sane_user/HGSaneImpl.hpp b/modules/sane_user/HGSaneImpl.hpp
similarity index 100%
rename from sane_user/HGSaneImpl.hpp
rename to modules/sane_user/HGSaneImpl.hpp
diff --git a/twain_user/HGTwain.cpp b/modules/twain_user/HGTwain.cpp
similarity index 100%
rename from twain_user/HGTwain.cpp
rename to modules/twain_user/HGTwain.cpp
diff --git a/twain_user/HGTwain.h b/modules/twain_user/HGTwain.h
similarity index 100%
rename from twain_user/HGTwain.h
rename to modules/twain_user/HGTwain.h
diff --git a/twain_user/HGTwainErr.h b/modules/twain_user/HGTwainErr.h
similarity index 100%
rename from twain_user/HGTwainErr.h
rename to modules/twain_user/HGTwainErr.h
diff --git a/twain_user/HGTwainImpl.cpp b/modules/twain_user/HGTwainImpl.cpp
similarity index 100%
rename from twain_user/HGTwainImpl.cpp
rename to modules/twain_user/HGTwainImpl.cpp
diff --git a/twain_user/HGTwainImpl.hpp b/modules/twain_user/HGTwainImpl.hpp
similarity index 100%
rename from twain_user/HGTwainImpl.hpp
rename to modules/twain_user/HGTwainImpl.hpp
diff --git a/twain_user/dllmain.cpp b/modules/twain_user/dllmain.cpp
similarity index 100%
rename from twain_user/dllmain.cpp
rename to modules/twain_user/dllmain.cpp
diff --git a/sdk/webservice/HttpHead.cpp b/sdk/webservice/HttpHead.cpp
index ce20bb07..68225095 100644
--- a/sdk/webservice/HttpHead.cpp
+++ b/sdk/webservice/HttpHead.cpp
@@ -1,5 +1,4 @@
 #include "HttpHead.h"
-#include "../../utility/HGString.h"
 
 const unsigned int asciiTableData[256] = 
 {
@@ -22,6 +21,63 @@ const unsigned int asciiTableData[256] =
   /* the upper 128 are all zeroes */
 };
 
+static void TrimString(std::string& str)
+{
+	std::string str1;
+	bool add1 = false;
+	std::string::const_iterator iter1;
+	for (iter1 = str.begin(); iter1 != str.end(); ++iter1)
+	{
+		int c = (HGByte)(*iter1);
+		if (!add1)
+		{
+			if (!isspace(c))
+			{
+				str1.push_back(c);
+				add1 = true;
+			}
+		}
+		else
+		{
+			str1.push_back(c);
+		}
+	}
+
+	if (str1.empty())
+	{
+		str.clear();
+		return;
+	}
+
+	std::string str2;
+	bool add2 = false;
+	std::string::const_reverse_iterator iter2;
+	for (iter2 = str1.rbegin(); iter2 != str1.rend(); ++iter2)
+	{
+		int c = (HGByte)(*iter2);
+		if (!add2)
+		{
+			if (!isspace(c))
+			{
+				str2.push_back(c);
+				add2 = true;
+			}
+		}
+		else
+		{
+			str2.push_back(c);
+		}
+	}
+
+	if (str2.empty())
+	{
+		str.clear();
+		return;
+	}
+
+	str = std::string(str2.rbegin(), str2.rend());
+}
+
 HttpHead::HttpHead()
 {
 
diff --git a/sdk/webservice/HttpHead.h b/sdk/webservice/HttpHead.h
index 32401c02..ae69ecfc 100644
--- a/sdk/webservice/HttpHead.h
+++ b/sdk/webservice/HttpHead.h
@@ -1,8 +1,8 @@
 #ifndef __HTTPHEAD_H__
 #define __HTTPHEAD_H__
 
-#include "../../base/HGDef.h"
-#include "../../base/HGInc.h"
+#include "base/HGDef.h"
+#include "base/HGInc.h"
 #include <string>
 #include <vector>
 
diff --git a/sdk/webservice/HttpUser.cpp b/sdk/webservice/HttpUser.cpp
index b72107b4..a63ddf8e 100644
--- a/sdk/webservice/HttpUser.cpp
+++ b/sdk/webservice/HttpUser.cpp
@@ -2,7 +2,7 @@
 #include "WebServer.h"
 #include "MsgLoop.h"
 #include "Manager.h"
-#include "../../base/HGInfo.h"
+#include "base/HGInfo.h"
 #include "cJSON.h"
 
 static std::string ToJsonPair(const std::string& key, int value, bool sep)
diff --git a/sdk/webservice/Manager.cpp b/sdk/webservice/Manager.cpp
index 0cc3a349..10038c2e 100644
--- a/sdk/webservice/Manager.cpp
+++ b/sdk/webservice/Manager.cpp
@@ -1,15 +1,15 @@
 #include "Manager.h"
 #include "MsgLoop.h"
-#include "../../base/HGBuffer.h"
-#include "../../base/HGBase64.h"
-#include "../../base/HGUtility.h"
-#include "../../base/HGInfo.h"
-#include "../../imgfmt/HGJpeg.h"
-#include "../../imgfmt/HGOfd.h"
-#include "../../imgfmt/HGPdf.h"
-#include "../../imgfmt/HGTiff.h"
-#include "../../imgfmt/HGImgFmt.h"
-#include "../../utility/HGString.h"
+#include "base/HGBuffer.h"
+#include "base/HGBase64.h"
+#include "base/HGUtility.h"
+#include "base/HGInfo.h"
+#include "imgfmt/HGJpeg.h"
+#include "imgfmt/HGOfd.h"
+#include "imgfmt/HGPdf.h"
+#include "imgfmt/HGTiff.h"
+#include "imgfmt/HGImgFmt.h"
+#include "HGString.h"
 extern "C"
 {
 #include "zip.h"
diff --git a/sdk/webservice/Manager.h b/sdk/webservice/Manager.h
index 8d24ee80..387ad849 100644
--- a/sdk/webservice/Manager.h
+++ b/sdk/webservice/Manager.h
@@ -1,10 +1,10 @@
 #ifndef __MANAGER_H__
 #define __MANAGER_H__
 
-#include "../../base/HGDef.h"
-#include "../../base/HGInc.h"
-#include "../../base/HGLock.h"
-#include "../../base/HGImage.h"
+#include "base/HGDef.h"
+#include "base/HGInc.h"
+#include "base/HGLock.h"
+#include "base/HGImage.h"
 #include "sane/sane_ex.h"
 #include "sane/sane_option_definitions.h"
 #include "WebMsg.h"
diff --git a/sdk/webservice/MsgLoop.h b/sdk/webservice/MsgLoop.h
index 66dbc0e3..a6485d52 100644
--- a/sdk/webservice/MsgLoop.h
+++ b/sdk/webservice/MsgLoop.h
@@ -1,10 +1,10 @@
 #ifndef __MSGLOOP_H__
 #define __MSGLOOP_H__
 
-#include "../../base/HGDef.h"
-#include "../../base/HGInc.h"
-#include "../../base/HGEvent.h"
-#include "../../base/HGLock.h"
+#include "base/HGDef.h"
+#include "base/HGInc.h"
+#include "base/HGEvent.h"
+#include "base/HGLock.h"
 #include "WebMsg.h"
 #include "Manager.h"
 #include "WebServer.h"
diff --git a/sdk/webservice/SockIoUser.cpp b/sdk/webservice/SockIoUser.cpp
index 46033dd5..97707788 100644
--- a/sdk/webservice/SockIoUser.cpp
+++ b/sdk/webservice/SockIoUser.cpp
@@ -2,8 +2,8 @@
 #include "WebServer.h"
 #include "MsgLoop.h"
 #include "Manager.h"
-#include "../../base/HGInfo.h"
-#include "../../base/HGUtility.h"
+#include "base/HGInfo.h"
+#include "base/HGUtility.h"
 #include "sha1.h"
 #include "base64.h"
 #include "cJSON.h"
diff --git a/sdk/webservice/WebMsg.h b/sdk/webservice/WebMsg.h
index c8e00fe2..3b47ac20 100644
--- a/sdk/webservice/WebMsg.h
+++ b/sdk/webservice/WebMsg.h
@@ -1,8 +1,8 @@
 #ifndef __WEBMSG_H__
 #define __WEBMSG_H__
 
-#include "../../base/HGDef.h"
-#include "../../base/HGInc.h"
+#include "base/HGDef.h"
+#include "base/HGInc.h"
 #include "HttpHead.h"
 #include <string>
 
diff --git a/sdk/webservice/WebServer.cpp b/sdk/webservice/WebServer.cpp
index 37e95f1d..862ceee0 100644
--- a/sdk/webservice/WebServer.cpp
+++ b/sdk/webservice/WebServer.cpp
@@ -3,7 +3,7 @@
 #include "WsUser.h"
 #include "HttpUser.h"
 #include "SockIoUser.h"
-#include "../../base/HGInfo.h"
+#include "base/HGInfo.h"
 
 WebServer::WebServer(class MsgLoop* loop, HGUInt type)
 {
diff --git a/sdk/webservice/WebServer.h b/sdk/webservice/WebServer.h
index 8049d17b..e1699e07 100644
--- a/sdk/webservice/WebServer.h
+++ b/sdk/webservice/WebServer.h
@@ -1,9 +1,9 @@
 #ifndef __WEBSERVER_H__
 #define __WEBSERVER_H__
 
-#include "../../base/HGDef.h"
-#include "../../base/HGInc.h"
-#include "../../base/HGThread.h"
+#include "base/HGDef.h"
+#include "base/HGInc.h"
+#include "base/HGThread.h"
 #include "WebMsg.h"
 #include <vector>
 
diff --git a/sdk/webservice/WebUser.cpp b/sdk/webservice/WebUser.cpp
index 05db06c6..2cbde46c 100644
--- a/sdk/webservice/WebUser.cpp
+++ b/sdk/webservice/WebUser.cpp
@@ -1,7 +1,7 @@
 #include "WebUser.h"
 #include "WebServer.h"
 #include "MsgLoop.h"
-#include "../../base/HGInfo.h"
+#include "base/HGInfo.h"
 
 #if defined(HG_CMP_MSC)
 WebUser::WebUser(class WebServer* server, HGUInt id, const char* ip, uint16_t port, SOCKET sockConn)
diff --git a/sdk/webservice/WebUser.h b/sdk/webservice/WebUser.h
index 96973b7d..6ec7381b 100644
--- a/sdk/webservice/WebUser.h
+++ b/sdk/webservice/WebUser.h
@@ -1,10 +1,10 @@
 #ifndef __WEBUSER_H__
 #define __WEBUSER_H__
 
-#include "../../base/HGDef.h"
-#include "../../base/HGInc.h"
-#include "../../base/HGLock.h"
-#include "../../base/HGThread.h"
+#include "base/HGDef.h"
+#include "base/HGInc.h"
+#include "base/HGLock.h"
+#include "base/HGThread.h"
 
 class WebUser
 {
diff --git a/sdk/webservice/WsUser.cpp b/sdk/webservice/WsUser.cpp
index 6cdc69c4..b6b6b2b4 100644
--- a/sdk/webservice/WsUser.cpp
+++ b/sdk/webservice/WsUser.cpp
@@ -2,7 +2,7 @@
 #include "WebServer.h"
 #include "MsgLoop.h"
 #include "Manager.h"
-#include "../../base/HGInfo.h"
+#include "base/HGInfo.h"
 #include "sha1.h"
 #include "base64.h"
 
diff --git a/sdk/webservice/main.cpp b/sdk/webservice/main.cpp
index ce0c849d..b0cc2e5e 100644
--- a/sdk/webservice/main.cpp
+++ b/sdk/webservice/main.cpp
@@ -1,6 +1,6 @@
-#include "../../base/HGDef.h"
-#include "../../base/HGInc.h"
-#include "../../base/HGThread.h"
+#include "base/HGDef.h"
+#include "base/HGInc.h"
+#include "base/HGThread.h"
 #include "MsgLoop.h"
 
 static void ThreadFunc(HGThread thread, HGPointer param)
diff --git a/utility/HGString.cpp b/utility/HGString.cpp
index ff3756ed..4c4ff71e 100644
--- a/utility/HGString.cpp
+++ b/utility/HGString.cpp
@@ -1,65 +1,8 @@
 #include "HGString.h"
-#include "../base/HGDef.h"
-#include "../base/HGInc.h"
+#include "../modules/base/HGDef.h"
+#include "../modules/base/HGInc.h"
 #include <algorithm>
 
-void TrimString(std::string& str)
-{
-	std::string str1;
-	bool add1 = false;
-	std::string::const_iterator iter1;
-	for (iter1 = str.begin(); iter1 != str.end(); ++iter1)
-	{
-		int c = (HGByte)(*iter1);
-		if (!add1)
-		{
-			if (!isspace(c))
-			{
-				str1.push_back(c);
-				add1 = true;
-			}
-		}
-		else
-		{
-			str1.push_back(c);
-		}
-	}
-
-	if (str1.empty())
-	{
-		str.clear();
-		return;
-	}
-
-	std::string str2;
-	bool add2 = false;
-	std::string::const_reverse_iterator iter2;
-	for (iter2 = str1.rbegin(); iter2 != str1.rend(); ++iter2)
-	{
-		int c = (HGByte)(*iter2);
-		if (!add2)
-		{
-			if (!isspace(c))
-			{
-				str2.push_back(c);
-				add2 = true;
-			}
-		}
-		else
-		{
-			str2.push_back(c);
-		}
-	}
-
-	if (str2.empty())
-	{
-		str.clear();
-		return;
-	}
-
-	str = std::string(str2.rbegin(), str2.rend());
-}
-
 #if defined(HG_CMP_MSC)
 static std::string AnsiToUtf8(const char* text)
 {
diff --git a/utility/HGString.h b/utility/HGString.h
index 5a9c7f16..79c0180e 100644
--- a/utility/HGString.h
+++ b/utility/HGString.h
@@ -5,9 +5,6 @@
 
 // 标准字符串：windows下为ansi编码，linux下为utf8编码
 
-// 去掉前后空格
-void TrimString(std::string& str);
-
 // UTF8转标准字符串
 std::string Utf8ToStdString(const char* utf8);