diff --git a/tools/apps/hgjson/DlgCondition.cpp b/tools/apps/hgjson/DlgCondition.cpp
index bbd7954..367b4b4 100644
--- a/tools/apps/hgjson/DlgCondition.cpp
+++ b/tools/apps/hgjson/DlgCondition.cpp
@@ -7,7 +7,7 @@
 #include "afxdialogex.h"
 
 #include "resource.h"
-#include "../../../../code_device/hgdriver/hgdev/simple_logic.h"
+#include "../../../../code_device/hgdriver/hgdev/user-opt/simple_logic.h"
 #include "opt_ui/DlgPage.h"	// for u2a
 
 // CDlgCondition 对话框
diff --git a/tools/apps/hgjson/DlgOptJson.cpp b/tools/apps/hgjson/DlgOptJson.cpp
index 993aab8..06f864f 100644
--- a/tools/apps/hgjson/DlgOptJson.cpp
+++ b/tools/apps/hgjson/DlgOptJson.cpp
@@ -25,7 +25,7 @@ static std::string device_opt_json[] = {
 // known name ...
 #include "opt_ui/DlgSetting.h"
 #include "../../../../code_device/hgsane/sane_opt/sane_opts.h"
-#include "../../../../code_device/hgdriver/hgdev/device_opt.h"
+#include "../../../../code_device/hgdriver/hgdev/user-opt/device_opt.h"
 #include "../../../../code_device/sdk/hginclude/huagaoxxx_warraper_ex.h"
 
 namespace known_name
diff --git a/tools/apps/hgjson/hgjson.vcxproj b/tools/apps/hgjson/hgjson.vcxproj
index 29c6aa4..a10668e 100644
--- a/tools/apps/hgjson/hgjson.vcxproj
+++ b/tools/apps/hgjson/hgjson.vcxproj
@@ -115,9 +115,9 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\device_opt.h" />
     <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\scanner_setting.h" />
-    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\simple_logic.h" />
+    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\device_opt.h" />
+    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.h" />
     <ClInclude Include="..\..\..\..\code_device\hgsane\sane_opt\sane_opts.h" />
     <ClInclude Include="..\..\..\..\code_device\sdk\json\cJSON.h" />
     <ClInclude Include="..\..\..\..\code_device\sdk\json\gb_json.h" />
@@ -139,15 +139,15 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\device_opt.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\scanner_setting.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\simple_logic.cpp">
+    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\device_opt.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
diff --git a/tools/apps/hgjson/hgjson.vcxproj.filters b/tools/apps/hgjson/hgjson.vcxproj.filters
index 2dee2bf..7d73520 100644
--- a/tools/apps/hgjson/hgjson.vcxproj.filters
+++ b/tools/apps/hgjson/hgjson.vcxproj.filters
@@ -75,12 +75,6 @@
     <ClInclude Include="..\..\..\..\code_device\sdk\json\gb_json.h">
       <Filter>sane_opt\json</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\device_opt.h">
-      <Filter>sane_opt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\simple_logic.h">
-      <Filter>sane_opt</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\code_device\hgsane\sane_opt\sane_opts.h">
       <Filter>sane_opt</Filter>
     </ClInclude>
@@ -93,6 +87,12 @@
     <ClInclude Include="DlgCondition.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\device_opt.h">
+      <Filter>sane_opt</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.h">
+      <Filter>sane_opt</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="hgjson.cpp">
@@ -137,12 +137,6 @@
     <ClCompile Include="..\..\..\..\code_device\sdk\json\gb_json.cpp">
       <Filter>sane_opt\json</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\device_opt.cpp">
-      <Filter>sane_opt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\simple_logic.cpp">
-      <Filter>sane_opt</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\code_device\hgsane\sane_opt\sane_opts.cpp">
       <Filter>sane_opt</Filter>
     </ClCompile>
@@ -155,6 +149,12 @@
     <ClCompile Include="DlgCondition.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\device_opt.cpp">
+      <Filter>sane_opt</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\user-opt\simple_logic.cpp">
+      <Filter>sane_opt</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="hgjson.rc">
diff --git a/tools/solution/Release/hgjson.exe b/tools/solution/Release/hgjson.exe
index 2db1380..4becf6e 100644
Binary files a/tools/solution/Release/hgjson.exe and b/tools/solution/Release/hgjson.exe differ