diff --git a/Makefile b/Makefile
index 0dfd1f54a..d737b2c86 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ all_samples: all_lib
 	@(cd lib_acl_cpp/samples; make)
 #	@(cd lib_dict; make $(MAKE_ARGS))
 #	@(cd lib_tls; make $(MAKE_ARGS))
-all: all_lib all_samples
+all: all_lib acl_master all_samples
 clean:
 	@(cd lib_acl; make clean)
 	@(cd lib_protocol; make clean)
@@ -123,7 +123,7 @@ clean:
 #	@(cd lib_dict; make clean)
 #	@(cd lib_tls; make clean)
 
-acl_master:
+acl_master: all_lib
 	@(cd app/master; make)
 
 packinstall:
diff --git a/lib_acl/lib_acl_vc2003.vcproj b/lib_acl/lib_acl_vc2003.vcproj
index c494bd050..01bf7ac54 100644
--- a/lib_acl/lib_acl_vc2003.vcproj
+++ b/lib_acl/lib_acl_vc2003.vcproj
@@ -1091,25 +1091,13 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
 				Name="master"
 				Filter="">
 				<File
-					RelativePath=".\src\master\master_flow.c">
+					RelativePath=".\src\master\acl_master_flow.c">
 				</File>
 				<File
-					RelativePath=".\src\master\master_flow.h">
+					RelativePath=".\src\master\acl_master_params.c">
 				</File>
 				<File
-					RelativePath=".\src\master\master_params.c">
-				</File>
-				<File
-					RelativePath=".\src\master\master_params.h">
-				</File>
-				<File
-					RelativePath=".\src\master\master_proto.c">
-				</File>
-				<File
-					RelativePath=".\src\master\master_proto.h">
-				</File>
-				<File
-					RelativePath=".\src\master\master_vars.c">
+					RelativePath=".\src\master\acl_master_proto.c">
 				</File>
 				<Filter
 					Name="template"
@@ -1117,12 +1105,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
 					<File
 						RelativePath=".\src\master\template\acl_aio_server.c">
 					</File>
-					<File
-						RelativePath=".\src\master\template\acl_ioctl_server.c">
-					</File>
-					<File
-						RelativePath=".\src\master\template\acl_multi_server.c">
-					</File>
 					<File
 						RelativePath=".\src\master\template\acl_single_server.c">
 					</File>
@@ -1142,72 +1124,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
 						RelativePath=".\src\master\template\master_log.h">
 					</File>
 				</Filter>
-				<Filter
-					Name="framework"
-					Filter="">
-					<File
-						RelativePath=".\src\master\framework\master.h">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_avail.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_conf.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_ent.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_listen.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_pathname.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_pathname.h">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_service.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_sig.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_spawn.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_status.c">
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_wakeup.c">
-					</File>
-					<Filter
-						Name="trigger"
-						Filter="">
-						<File
-							RelativePath=".\src\master\framework\trigger\fifo_trigger.c">
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\inet_trigger.c">
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\stream_trigger.c">
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\trigger.h">
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\unix_trigger.c">
-						</File>
-					</Filter>
-				</Filter>
-				<Filter
-					Name="daemon"
-					Filter="">
-					<File
-						RelativePath=".\src\master\daemon\master.c">
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="proctl"
@@ -1807,9 +1723,6 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
 				<File
 					RelativePath=".\include\master\acl_aio_params.h">
 				</File>
-				<File
-					RelativePath=".\include\master\acl_ioctl_params.h">
-				</File>
 				<File
 					RelativePath=".\include\master\acl_master.h">
 				</File>
@@ -1817,10 +1730,13 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
 					RelativePath=".\include\master\acl_master_conf.h">
 				</File>
 				<File
-					RelativePath=".\include\master\acl_master_type.h">
+					RelativePath=".\include\master\acl_master_flow.h">
 				</File>
 				<File
-					RelativePath=".\include\master\acl_multi_params.h">
+					RelativePath=".\include\master\acl_master_proto.h">
+				</File>
+				<File
+					RelativePath=".\include\master\acl_master_type.h">
 				</File>
 				<File
 					RelativePath=".\include\master\acl_server_api.h">
diff --git a/lib_acl/lib_acl_vc2008.vcproj b/lib_acl/lib_acl_vc2008.vcproj
index 91a0b577e..c618b2039 100644
--- a/lib_acl/lib_acl_vc2008.vcproj
+++ b/lib_acl/lib_acl_vc2008.vcproj
@@ -1437,31 +1437,15 @@
 				Name="master"
 				>
 				<File
-					RelativePath=".\src\master\master_flow.c"
+					RelativePath=".\src\master\acl_master_flow.c"
 					>
 				</File>
 				<File
-					RelativePath=".\src\master\master_flow.h"
+					RelativePath=".\src\master\acl_master_params.c"
 					>
 				</File>
 				<File
-					RelativePath=".\src\master\master_params.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\master\master_params.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\master\master_proto.c"
-					>
-				</File>
-				<File
-					RelativePath=".\src\master\master_proto.h"
-					>
-				</File>
-				<File
-					RelativePath=".\src\master\master_vars.c"
+					RelativePath=".\src\master\acl_master_proto.c"
 					>
 				</File>
 				<Filter
@@ -1471,14 +1455,6 @@
 						RelativePath=".\src\master\template\acl_aio_server.c"
 						>
 					</File>
-					<File
-						RelativePath=".\src\master\template\acl_ioctl_server.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\template\acl_multi_server.c"
-						>
-					</File>
 					<File
 						RelativePath=".\src\master\template\acl_single_server.c"
 						>
@@ -1504,90 +1480,6 @@
 						>
 					</File>
 				</Filter>
-				<Filter
-					Name="framework"
-					>
-					<File
-						RelativePath=".\src\master\framework\master.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_avail.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_conf.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_ent.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_listen.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_pathname.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_pathname.h"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_service.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_sig.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_spawn.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_status.c"
-						>
-					</File>
-					<File
-						RelativePath=".\src\master\framework\master_wakeup.c"
-						>
-					</File>
-					<Filter
-						Name="trigger"
-						>
-						<File
-							RelativePath=".\src\master\framework\trigger\fifo_trigger.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\inet_trigger.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\stream_trigger.c"
-							>
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\trigger.h"
-							>
-						</File>
-						<File
-							RelativePath=".\src\master\framework\trigger\unix_trigger.c"
-							>
-						</File>
-					</Filter>
-				</Filter>
-				<Filter
-					Name="daemon"
-					>
-					<File
-						RelativePath=".\src\master\daemon\master.c"
-						>
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="proctl"
@@ -2357,10 +2249,6 @@
 					RelativePath=".\include\master\acl_aio_params.h"
 					>
 				</File>
-				<File
-					RelativePath=".\include\master\acl_ioctl_params.h"
-					>
-				</File>
 				<File
 					RelativePath=".\include\master\acl_master.h"
 					>
@@ -2370,11 +2258,15 @@
 					>
 				</File>
 				<File
-					RelativePath=".\include\master\acl_master_type.h"
+					RelativePath=".\include\master\acl_master_flow.h"
 					>
 				</File>
 				<File
-					RelativePath=".\include\master\acl_multi_params.h"
+					RelativePath=".\include\master\acl_master_proto.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\master\acl_master_type.h"
 					>
 				</File>
 				<File
diff --git a/lib_acl/lib_acl_vc2010.vcxproj b/lib_acl/lib_acl_vc2010.vcxproj
index 36ac593f5..260aa287d 100644
--- a/lib_acl/lib_acl_vc2010.vcxproj
+++ b/lib_acl/lib_acl_vc2010.vcxproj
@@ -414,33 +414,15 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
     <ClCompile Include=".\src\unit_test\acl_test_outer.c" />
     <ClCompile Include=".\src\unit_test\acl_test_runner.c" />
     <ClCompile Include=".\src\unit_test\acl_test_token.c" />
-    <ClCompile Include=".\src\master\master_flow.c" />
-    <ClCompile Include=".\src\master\master_params.c" />
-    <ClCompile Include=".\src\master\master_proto.c" />
-    <ClCompile Include=".\src\master\master_vars.c" />
+    <ClCompile Include=".\src\master\acl_master_flow.c" />
+    <ClCompile Include=".\src\master\acl_master_params.c" />
+    <ClCompile Include=".\src\master\acl_master_proto.c" />
     <ClCompile Include=".\src\master\template\acl_aio_server.c" />
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c" />
     <ClCompile Include=".\src\master\template\master_log.c" />
-    <ClCompile Include=".\src\master\template\acl_multi_server.c" />
     <ClCompile Include=".\src\master\template\acl_single_server.c" />
     <ClCompile Include=".\src\master\template\acl_threads_server.c" />
     <ClCompile Include=".\src\master\template\acl_trigger_server.c" />
     <ClCompile Include=".\src\master\template\acl_udp_server.c" />
-    <ClCompile Include=".\src\master\framework\master_avail.c" />
-    <ClCompile Include=".\src\master\framework\master_conf.c" />
-    <ClCompile Include=".\src\master\framework\master_ent.c" />
-    <ClCompile Include=".\src\master\framework\master_listen.c" />
-    <ClCompile Include=".\src\master\framework\master_pathname.c" />
-    <ClCompile Include=".\src\master\framework\master_service.c" />
-    <ClCompile Include=".\src\master\framework\master_sig.c" />
-    <ClCompile Include=".\src\master\framework\master_spawn.c" />
-    <ClCompile Include=".\src\master\framework\master_status.c" />
-    <ClCompile Include=".\src\master\framework\master_wakeup.c" />
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c" />
-    <ClCompile Include=".\src\master\daemon\master.c" />
     <ClCompile Include=".\src\proctl\acl_proctl.c" />
     <ClCompile Include=".\src\proctl\proctl_child.c" />
     <ClCompile Include=".\src\proctl\proctl_monitor.c" />
@@ -509,13 +491,7 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
     <ClInclude Include=".\src\db\null\acl_dbnull.h" />
     <ClInclude Include=".\src\db\null\acl_dbpool_null.h" />
     <ClInclude Include=".\src\db\zdb\zdb_private.h" />
-    <ClInclude Include=".\src\master\master_flow.h" />
-    <ClInclude Include=".\src\master\master_params.h" />
-    <ClInclude Include=".\src\master\master_proto.h" />
     <ClInclude Include=".\src\master\template\master_log.h" />
-    <ClInclude Include=".\src\master\framework\master.h" />
-    <ClInclude Include=".\src\master\framework\master_pathname.h" />
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h" />
     <ClInclude Include=".\src\proctl\proctl_internal.h" />
     <ClInclude Include=".\src\init\init.h" />
     <ClInclude Include=".\src\private\private.h" />
@@ -661,11 +637,11 @@ copy $(TargetName).pdb ..\dist\lib\win32\$(TargetName).pdb /Y
     <ClInclude Include=".\include\code\acl_urlcode.h" />
     <ClInclude Include=".\include\code\acl_vstring_base64.h" />
     <ClInclude Include=".\include\master\acl_aio_params.h" />
-    <ClInclude Include=".\include\master\acl_ioctl_params.h" />
     <ClInclude Include=".\include\master\acl_master.h" />
     <ClInclude Include=".\include\master\acl_master_conf.h" />
+    <ClInclude Include=".\include\master\acl_master_flow.h" />
+    <ClInclude Include=".\include\master\acl_master_proto.h" />
     <ClInclude Include=".\include\master\acl_master_type.h" />
-    <ClInclude Include=".\include\master\acl_multi_params.h" />
     <ClInclude Include=".\include\master\acl_server_api.h" />
     <ClInclude Include=".\include\master\acl_single_params.h" />
     <ClInclude Include=".\include\master\acl_threads_params.h" />
diff --git a/lib_acl/lib_acl_vc2010.vcxproj.filters b/lib_acl/lib_acl_vc2010.vcxproj.filters
index c0b27e126..11bf9f027 100644
--- a/lib_acl/lib_acl_vc2010.vcxproj.filters
+++ b/lib_acl/lib_acl_vc2010.vcxproj.filters
@@ -92,15 +92,6 @@
     <Filter Include="Source Files\master\template">
       <UniqueIdentifier>{01684461-568d-4c09-b1c0-1c4df0e12ae6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\master\framework">
-      <UniqueIdentifier>{9b13391b-9bed-4d58-9e22-bc169844986e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\master\framework\trigger">
-      <UniqueIdentifier>{35b92483-33d0-43ee-b8af-f8f93b8dcd3b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\master\daemon">
-      <UniqueIdentifier>{d249f3dc-3b3d-4453-96fd-87ceced12484}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\proctl">
       <UniqueIdentifier>{f721cf19-6c42-4e35-9e10-e1a681d6daed}</UniqueIdentifier>
     </Filter>
@@ -761,30 +752,21 @@
     <ClCompile Include=".\src\unit_test\acl_test_token.c">
       <Filter>Source Files\unit_test</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_flow.c">
+    <ClCompile Include=".\src\master\acl_master_flow.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_params.c">
+    <ClCompile Include=".\src\master\acl_master_params.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_proto.c">
-      <Filter>Source Files\master</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\master_vars.c">
+    <ClCompile Include=".\src\master\acl_master_proto.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
     <ClCompile Include=".\src\master\template\acl_aio_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\master_log.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_multi_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\acl_single_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
@@ -797,51 +779,6 @@
     <ClCompile Include=".\src\master\template\acl_udp_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_avail.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_conf.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_ent.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_listen.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_pathname.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_service.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_sig.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_spawn.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_status.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_wakeup.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\daemon\master.c">
-      <Filter>Source Files\master\daemon</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\proctl\acl_proctl.c">
       <Filter>Source Files\proctl</Filter>
     </ClCompile>
@@ -1047,27 +984,9 @@
     <ClInclude Include=".\src\db\zdb\zdb_private.h">
       <Filter>Source Files\db\zdb</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\master_flow.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_params.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_proto.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\master\template\master_log.h">
       <Filter>Source Files\master\template</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\framework\master.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\master_pathname.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\proctl\proctl_internal.h">
       <Filter>Source Files\proctl</Filter>
     </ClInclude>
@@ -1485,19 +1404,19 @@
     <ClInclude Include=".\include\master\acl_aio_params.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_ioctl_params.h">
-      <Filter>Header Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\include\master\acl_master.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_master_conf.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_master_type.h">
+    <ClInclude Include=".\include\master\acl_master_flow.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_multi_params.h">
+    <ClInclude Include=".\include\master\acl_master_proto.h">
+      <Filter>Header Files\master</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\master\acl_master_type.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_server_api.h">
diff --git a/lib_acl/lib_acl_vc2012.vcxproj b/lib_acl/lib_acl_vc2012.vcxproj
index 7264c8e1d..72fcbff9a 100644
--- a/lib_acl/lib_acl_vc2012.vcxproj
+++ b/lib_acl/lib_acl_vc2012.vcxproj
@@ -620,32 +620,16 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClCompile Include=".\src\unit_test\acl_test_outer.c" />
     <ClCompile Include=".\src\unit_test\acl_test_runner.c" />
     <ClCompile Include=".\src\unit_test\acl_test_token.c" />
-    <ClCompile Include=".\src\master\master_flow.c" />
-    <ClCompile Include=".\src\master\master_params.c" />
-    <ClCompile Include=".\src\master\master_proto.c" />
-    <ClCompile Include=".\src\master\master_vars.c" />
+    <ClCompile Include=".\src\master\acl_master_flow.c" />
+    <ClCompile Include=".\src\master\acl_master_params.c" />
+    <ClCompile Include=".\src\master\acl_master_proto.c" />
     <ClCompile Include=".\src\master\template\acl_aio_server.c" />
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c" />
-    <ClCompile Include=".\src\master\template\master_log.c" />
-    <ClCompile Include=".\src\master\template\acl_multi_server.c" />
     <ClCompile Include=".\src\master\template\acl_single_server.c" />
     <ClCompile Include=".\src\master\template\acl_threads_server.c" />
     <ClCompile Include=".\src\master\template\acl_trigger_server.c" />
-    <ClCompile Include=".\src\master\framework\master_avail.c" />
-    <ClCompile Include=".\src\master\framework\master_conf.c" />
-    <ClCompile Include=".\src\master\framework\master_ent.c" />
-    <ClCompile Include=".\src\master\framework\master_listen.c" />
-    <ClCompile Include=".\src\master\framework\master_pathname.c" />
-    <ClCompile Include=".\src\master\framework\master_service.c" />
-    <ClCompile Include=".\src\master\framework\master_sig.c" />
-    <ClCompile Include=".\src\master\framework\master_spawn.c" />
-    <ClCompile Include=".\src\master\framework\master_status.c" />
-    <ClCompile Include=".\src\master\framework\master_wakeup.c" />
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c" />
-    <ClCompile Include=".\src\master\daemon\master.c" />
+    <ClCompile Include=".\src\master\template\acl_udp_server.c" />
+    <ClCompile Include=".\src\master\template\master_log.c" />
+    <ClInclude Include=".\src\master\template\master_log.h" />
     <ClCompile Include=".\src\proctl\acl_proctl.c" />
     <ClCompile Include=".\src\proctl\proctl_child.c" />
     <ClCompile Include=".\src\proctl\proctl_monitor.c" />
@@ -660,19 +644,18 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClCompile Include=".\src\json\acl_json.c" />
     <ClCompile Include=".\src\json\acl_json_parse.c" />
     <ClCompile Include=".\src\json\acl_json_util.c" />
-    <ClCompile Include="src\event\events_epoll_thr.c" />
-    <ClCompile Include="src\master\template\acl_udp_server.c" />
-    <ClCompile Include="src\stdlib\acl_atomic.c" />
-    <ClCompile Include="src\stdlib\common\acl_ypipe.c" />
-    <ClCompile Include="src\stdlib\common\acl_yqueue.c" />
-    <ClCompile Include="src\stdlib\sys\acl_sane_socketpair.c" />
-    <ClCompile Include="src\stdlib\sys\unix\acl_trace.c" />
-    <ClCompile Include="src\xml\acl_xml2.c" />
-    <ClCompile Include="src\xml\acl_xml2_parse.c" />
-    <ClCompile Include="src\xml\acl_xml2_util.c" />
-    <ClCompile Include="src\xml\acl_xml3.c" />
-    <ClCompile Include="src\xml\acl_xml3_parse.c" />
-    <ClCompile Include="src\xml\acl_xml3_util.c" />
+    <ClCompile Include=".\src\event\events_epoll_thr.c" />
+    <ClCompile Include=".\src\stdlib\acl_atomic.c" />
+    <ClCompile Include=".\src\stdlib\common\acl_ypipe.c" />
+    <ClCompile Include=".\src\stdlib\common\acl_yqueue.c" />
+    <ClCompile Include=".\src\stdlib\sys\acl_sane_socketpair.c" />
+    <ClCompile Include=".\src\stdlib\sys\unix\acl_trace.c" />
+    <ClCompile Include=".\src\xml\acl_xml2.c" />
+    <ClCompile Include=".\src\xml\acl_xml2_parse.c" />
+    <ClCompile Include=".\src\xml\acl_xml2_util.c" />
+    <ClCompile Include=".\src\xml\acl_xml3.c" />
+    <ClCompile Include=".\src\xml\acl_xml3_parse.c" />
+    <ClCompile Include=".\src\xml\acl_xml3_util.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="lib_acl.rc" />
@@ -716,13 +699,6 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClInclude Include=".\src\db\null\acl_dbnull.h" />
     <ClInclude Include=".\src\db\null\acl_dbpool_null.h" />
     <ClInclude Include=".\src\db\zdb\zdb_private.h" />
-    <ClInclude Include=".\src\master\master_flow.h" />
-    <ClInclude Include=".\src\master\master_params.h" />
-    <ClInclude Include=".\src\master\master_proto.h" />
-    <ClInclude Include=".\src\master\template\master_log.h" />
-    <ClInclude Include=".\src\master\framework\master.h" />
-    <ClInclude Include=".\src\master\framework\master_pathname.h" />
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h" />
     <ClInclude Include=".\src\proctl\proctl_internal.h" />
     <ClInclude Include=".\src\init\init.h" />
     <ClInclude Include=".\src\private\private.h" />
@@ -870,11 +846,11 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClInclude Include=".\include\code\acl_urlcode.h" />
     <ClInclude Include=".\include\code\acl_vstring_base64.h" />
     <ClInclude Include=".\include\master\acl_aio_params.h" />
-    <ClInclude Include=".\include\master\acl_ioctl_params.h" />
     <ClInclude Include=".\include\master\acl_master.h" />
     <ClInclude Include=".\include\master\acl_master_conf.h" />
+    <ClInclude Include=".\include\master\acl_master_flow.h" />
+    <ClInclude Include=".\include\master\acl_master_proto.h" />
     <ClInclude Include=".\include\master\acl_master_type.h" />
-    <ClInclude Include=".\include\master\acl_multi_params.h" />
     <ClInclude Include=".\include\master\acl_server_api.h" />
     <ClInclude Include=".\include\master\acl_single_params.h" />
     <ClInclude Include=".\include\master\acl_threads_params.h" />
@@ -894,4 +870,4 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib_acl/lib_acl_vc2012.vcxproj.filters b/lib_acl/lib_acl_vc2012.vcxproj.filters
index 7de61f58e..b3f78b0f0 100644
--- a/lib_acl/lib_acl_vc2012.vcxproj.filters
+++ b/lib_acl/lib_acl_vc2012.vcxproj.filters
@@ -92,15 +92,6 @@
     <Filter Include="Source Files\master\template">
       <UniqueIdentifier>{01684461-568d-4c09-b1c0-1c4df0e12ae6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\master\framework">
-      <UniqueIdentifier>{9b13391b-9bed-4d58-9e22-bc169844986e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\master\framework\trigger">
-      <UniqueIdentifier>{35b92483-33d0-43ee-b8af-f8f93b8dcd3b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\master\daemon">
-      <UniqueIdentifier>{d249f3dc-3b3d-4453-96fd-87ceced12484}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\proctl">
       <UniqueIdentifier>{f721cf19-6c42-4e35-9e10-e1a681d6daed}</UniqueIdentifier>
     </Filter>
@@ -758,30 +749,21 @@
     <ClCompile Include=".\src\unit_test\acl_test_token.c">
       <Filter>Source Files\unit_test</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_flow.c">
+    <ClCompile Include=".\src\master\acl_master_flow.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_params.c">
+    <ClCompile Include=".\src\master\acl_master_params.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_proto.c">
-      <Filter>Source Files\master</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\master_vars.c">
+    <ClCompile Include=".\src\master\acl_master_proto.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
     <ClCompile Include=".\src\master\template\acl_aio_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\master_log.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_multi_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\acl_single_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
@@ -791,50 +773,8 @@
     <ClCompile Include=".\src\master\template\acl_trigger_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_avail.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_conf.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_ent.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_listen.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_pathname.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_service.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_sig.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_spawn.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_status.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_wakeup.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\daemon\master.c">
-      <Filter>Source Files\master\daemon</Filter>
+    <ClCompile Include=".\src\master\template\acl_udp_server.c">
+      <Filter>Source Files\master\template</Filter>
     </ClCompile>
     <ClCompile Include=".\src\proctl\acl_proctl.c">
       <Filter>Source Files\proctl</Filter>
@@ -899,9 +839,6 @@
     <ClCompile Include=".\src\code\uni2utf8.c">
       <Filter>Source Files\code</Filter>
     </ClCompile>
-    <ClCompile Include="src\master\template\acl_udp_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include="src\event\events_epoll_thr.c">
       <Filter>Source Files\event</Filter>
     </ClCompile>
@@ -1047,27 +984,9 @@
     <ClInclude Include=".\src\db\zdb\zdb_private.h">
       <Filter>Source Files\db\zdb</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\master_flow.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_params.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_proto.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\master\template\master_log.h">
       <Filter>Source Files\master\template</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\framework\master.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\master_pathname.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\proctl\proctl_internal.h">
       <Filter>Source Files\proctl</Filter>
     </ClInclude>
@@ -1485,19 +1404,19 @@
     <ClInclude Include=".\include\master\acl_aio_params.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_ioctl_params.h">
-      <Filter>Header Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\include\master\acl_master.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_master_conf.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_master_type.h">
+    <ClInclude Include=".\include\master\acl_master_flow.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_multi_params.h">
+    <ClInclude Include=".\include\master\acl_master_proto.h">
+      <Filter>Header Files\master</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\master\acl_master_type.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_server_api.h">
@@ -1572,4 +1491,4 @@
       <Filter>doc</Filter>
     </Text>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib_acl/lib_acl_vc2013.vcxproj b/lib_acl/lib_acl_vc2013.vcxproj
index c7ad8d87c..85bea1041 100644
--- a/lib_acl/lib_acl_vc2013.vcxproj
+++ b/lib_acl/lib_acl_vc2013.vcxproj
@@ -620,32 +620,15 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClCompile Include=".\src\unit_test\acl_test_outer.c" />
     <ClCompile Include=".\src\unit_test\acl_test_runner.c" />
     <ClCompile Include=".\src\unit_test\acl_test_token.c" />
-    <ClCompile Include=".\src\master\master_flow.c" />
-    <ClCompile Include=".\src\master\master_params.c" />
-    <ClCompile Include=".\src\master\master_proto.c" />
-    <ClCompile Include=".\src\master\master_vars.c" />
+    <ClCompile Include=".\src\master\acl_master_flow.c" />
+    <ClCompile Include=".\src\master\acl_master_params.c" />
+    <ClCompile Include=".\src\master\acl_master_proto.c" />
     <ClCompile Include=".\src\master\template\acl_aio_server.c" />
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c" />
     <ClCompile Include=".\src\master\template\master_log.c" />
-    <ClCompile Include=".\src\master\template\acl_multi_server.c" />
     <ClCompile Include=".\src\master\template\acl_single_server.c" />
     <ClCompile Include=".\src\master\template\acl_threads_server.c" />
     <ClCompile Include=".\src\master\template\acl_trigger_server.c" />
-    <ClCompile Include=".\src\master\framework\master_avail.c" />
-    <ClCompile Include=".\src\master\framework\master_conf.c" />
-    <ClCompile Include=".\src\master\framework\master_ent.c" />
-    <ClCompile Include=".\src\master\framework\master_listen.c" />
-    <ClCompile Include=".\src\master\framework\master_pathname.c" />
-    <ClCompile Include=".\src\master\framework\master_service.c" />
-    <ClCompile Include=".\src\master\framework\master_sig.c" />
-    <ClCompile Include=".\src\master\framework\master_spawn.c" />
-    <ClCompile Include=".\src\master\framework\master_status.c" />
-    <ClCompile Include=".\src\master\framework\master_wakeup.c" />
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c" />
-    <ClCompile Include=".\src\master\daemon\master.c" />
+    <ClCompile Include=".\src\master\template\acl_udp_server.c" />
     <ClCompile Include=".\src\proctl\acl_proctl.c" />
     <ClCompile Include=".\src\proctl\proctl_child.c" />
     <ClCompile Include=".\src\proctl\proctl_monitor.c" />
@@ -660,19 +643,18 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClCompile Include=".\src\json\acl_json.c" />
     <ClCompile Include=".\src\json\acl_json_parse.c" />
     <ClCompile Include=".\src\json\acl_json_util.c" />
-    <ClCompile Include="src\event\events_epoll_thr.c" />
-    <ClCompile Include="src\master\template\acl_udp_server.c" />
-    <ClCompile Include="src\stdlib\acl_atomic.c" />
-    <ClCompile Include="src\stdlib\common\acl_ypipe.c" />
-    <ClCompile Include="src\stdlib\common\acl_yqueue.c" />
-    <ClCompile Include="src\stdlib\sys\acl_sane_socketpair.c" />
-    <ClCompile Include="src\stdlib\sys\unix\acl_trace.c" />
-    <ClCompile Include="src\xml\acl_xml2.c" />
-    <ClCompile Include="src\xml\acl_xml2_parse.c" />
-    <ClCompile Include="src\xml\acl_xml2_util.c" />
-    <ClCompile Include="src\xml\acl_xml3.c" />
-    <ClCompile Include="src\xml\acl_xml3_parse.c" />
-    <ClCompile Include="src\xml\acl_xml3_util.c" />
+    <ClCompile Include=".\src\event\events_epoll_thr.c" />
+    <ClCompile Include=".\src\stdlib\acl_atomic.c" />
+    <ClCompile Include=".\src\stdlib\common\acl_ypipe.c" />
+    <ClCompile Include=".\src\stdlib\common\acl_yqueue.c" />
+    <ClCompile Include=".\src\stdlib\sys\acl_sane_socketpair.c" />
+    <ClCompile Include=".\src\stdlib\sys\unix\acl_trace.c" />
+    <ClCompile Include=".\src\xml\acl_xml2.c" />
+    <ClCompile Include=".\src\xml\acl_xml2_parse.c" />
+    <ClCompile Include=".\src\xml\acl_xml2_util.c" />
+    <ClCompile Include=".\src\xml\acl_xml3.c" />
+    <ClCompile Include=".\src\xml\acl_xml3_parse.c" />
+    <ClCompile Include=".\src\xml\acl_xml3_util.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="lib_acl.rc" />
@@ -716,13 +698,6 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClInclude Include=".\src\db\null\acl_dbnull.h" />
     <ClInclude Include=".\src\db\null\acl_dbpool_null.h" />
     <ClInclude Include=".\src\db\zdb\zdb_private.h" />
-    <ClInclude Include=".\src\master\master_flow.h" />
-    <ClInclude Include=".\src\master\master_params.h" />
-    <ClInclude Include=".\src\master\master_proto.h" />
-    <ClInclude Include=".\src\master\template\master_log.h" />
-    <ClInclude Include=".\src\master\framework\master.h" />
-    <ClInclude Include=".\src\master\framework\master_pathname.h" />
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h" />
     <ClInclude Include=".\src\proctl\proctl_internal.h" />
     <ClInclude Include=".\src\init\init.h" />
     <ClInclude Include=".\src\private\private.h" />
@@ -733,15 +708,15 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClInclude Include=".\src\private\sem.h" />
     <ClInclude Include=".\src\private\thread.h" />
     <ClInclude Include=".\include\lib_acl.h" />
-    <ClInclude Include="include\code\acl_xmlcode.h" />
-    <ClInclude Include="include\stdlib\acl_atomic.h" />
-    <ClInclude Include="include\stdlib\acl_sane_socketpair.h" />
-    <ClInclude Include="include\stdlib\acl_ypipe.h" />
-    <ClInclude Include="include\stdlib\acl_yqueue.h" />
-    <ClInclude Include="include\stdlib\unix\acl_trace.h" />
-    <ClInclude Include="include\xml\acl_xml2.h" />
-    <ClInclude Include="include\xml\acl_xml3.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include=".\include\code\acl_xmlcode.h" />
+    <ClInclude Include=".\include\stdlib\acl_atomic.h" />
+    <ClInclude Include=".\include\stdlib\acl_sane_socketpair.h" />
+    <ClInclude Include=".\include\stdlib\acl_ypipe.h" />
+    <ClInclude Include=".\include\stdlib\acl_yqueue.h" />
+    <ClInclude Include=".\include\stdlib\unix\acl_trace.h" />
+    <ClInclude Include=".\include\xml\acl_xml2.h" />
+    <ClInclude Include=".\include\xml\acl_xml3.h" />
+    <ClInclude Include=".\resource.h" />
     <ClInclude Include=".\include\stdlib\acl_allocator.h" />
     <ClInclude Include=".\include\stdlib\acl_argv.h" />
     <ClInclude Include=".\include\stdlib\acl_array.h" />
@@ -870,15 +845,16 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClInclude Include=".\include\code\acl_urlcode.h" />
     <ClInclude Include=".\include\code\acl_vstring_base64.h" />
     <ClInclude Include=".\include\master\acl_aio_params.h" />
-    <ClInclude Include=".\include\master\acl_ioctl_params.h" />
     <ClInclude Include=".\include\master\acl_master.h" />
     <ClInclude Include=".\include\master\acl_master_conf.h" />
+    <ClInclude Include=".\include\master\acl_master_flow.h" />
+    <ClInclude Include=".\include\master\acl_master_proto.h" />
     <ClInclude Include=".\include\master\acl_master_type.h" />
-    <ClInclude Include=".\include\master\acl_multi_params.h" />
     <ClInclude Include=".\include\master\acl_server_api.h" />
     <ClInclude Include=".\include\master\acl_single_params.h" />
     <ClInclude Include=".\include\master\acl_threads_params.h" />
     <ClInclude Include=".\include\master\acl_trigger_params.h" />
+    <ClInclude Include=".\src\master\template\master_log.h" />
     <ClInclude Include=".\include\proctl\acl_proctl.h" />
     <ClInclude Include=".\include\experiment\experiment.h" />
     <ClInclude Include=".\include\init\acl_init.h" />
@@ -894,4 +870,4 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib_acl/lib_acl_vc2013.vcxproj.filters b/lib_acl/lib_acl_vc2013.vcxproj.filters
index 87370bc3a..fe25237fe 100644
--- a/lib_acl/lib_acl_vc2013.vcxproj.filters
+++ b/lib_acl/lib_acl_vc2013.vcxproj.filters
@@ -92,12 +92,6 @@
     <Filter Include="Source Files\master\template">
       <UniqueIdentifier>{01684461-568d-4c09-b1c0-1c4df0e12ae6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\master\framework">
-      <UniqueIdentifier>{9b13391b-9bed-4d58-9e22-bc169844986e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\master\framework\trigger">
-      <UniqueIdentifier>{35b92483-33d0-43ee-b8af-f8f93b8dcd3b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\master\daemon">
       <UniqueIdentifier>{d249f3dc-3b3d-4453-96fd-87ceced12484}</UniqueIdentifier>
     </Filter>
@@ -758,30 +752,21 @@
     <ClCompile Include=".\src\unit_test\acl_test_token.c">
       <Filter>Source Files\unit_test</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_flow.c">
+    <ClCompile Include=".\src\master\acl_master_flow.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_params.c">
+    <ClCompile Include=".\src\master\acl_master_params.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_proto.c">
-      <Filter>Source Files\master</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\master_vars.c">
+    <ClCompile Include=".\src\master\acl_master_proto.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
     <ClCompile Include=".\src\master\template\acl_aio_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\master_log.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_multi_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\acl_single_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
@@ -791,51 +776,6 @@
     <ClCompile Include=".\src\master\template\acl_trigger_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_avail.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_conf.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_ent.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_listen.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_pathname.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_service.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_sig.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_spawn.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_status.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_wakeup.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\daemon\master.c">
-      <Filter>Source Files\master\daemon</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\proctl\acl_proctl.c">
       <Filter>Source Files\proctl</Filter>
     </ClCompile>
@@ -1047,27 +987,9 @@
     <ClInclude Include=".\src\db\zdb\zdb_private.h">
       <Filter>Source Files\db\zdb</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\master_flow.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_params.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_proto.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\master\template\master_log.h">
       <Filter>Source Files\master\template</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\framework\master.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\master_pathname.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\proctl\proctl_internal.h">
       <Filter>Source Files\proctl</Filter>
     </ClInclude>
@@ -1485,19 +1407,19 @@
     <ClInclude Include=".\include\master\acl_aio_params.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_ioctl_params.h">
-      <Filter>Header Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\include\master\acl_master.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_master_conf.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_master_type.h">
+    <ClInclude Include=".\include\master\acl_master_flow.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_multi_params.h">
+    <ClInclude Include=".\include\master\acl_master_proto.h">
+      <Filter>Header Files\master</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\master\acl_master_type.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_server_api.h">
@@ -1572,4 +1494,4 @@
       <Filter>doc</Filter>
     </Text>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib_acl/lib_acl_vc2015.vcxproj b/lib_acl/lib_acl_vc2015.vcxproj
index eedf8a7eb..d92a34fe4 100644
--- a/lib_acl/lib_acl_vc2015.vcxproj
+++ b/lib_acl/lib_acl_vc2015.vcxproj
@@ -623,32 +623,15 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClCompile Include=".\src\unit_test\acl_test_outer.c" />
     <ClCompile Include=".\src\unit_test\acl_test_runner.c" />
     <ClCompile Include=".\src\unit_test\acl_test_token.c" />
-    <ClCompile Include=".\src\master\master_flow.c" />
-    <ClCompile Include=".\src\master\master_params.c" />
-    <ClCompile Include=".\src\master\master_proto.c" />
-    <ClCompile Include=".\src\master\master_vars.c" />
+    <ClCompile Include=".\src\master\acl_master_flow.c" />
+    <ClCompile Include=".\src\master\acl_master_params.c" />
+    <ClCompile Include=".\src\master\acl_master_proto.c" />
     <ClCompile Include=".\src\master\template\acl_aio_server.c" />
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c" />
     <ClCompile Include=".\src\master\template\master_log.c" />
-    <ClCompile Include=".\src\master\template\acl_multi_server.c" />
     <ClCompile Include=".\src\master\template\acl_single_server.c" />
     <ClCompile Include=".\src\master\template\acl_threads_server.c" />
     <ClCompile Include=".\src\master\template\acl_trigger_server.c" />
-    <ClCompile Include=".\src\master\framework\master_avail.c" />
-    <ClCompile Include=".\src\master\framework\master_conf.c" />
-    <ClCompile Include=".\src\master\framework\master_ent.c" />
-    <ClCompile Include=".\src\master\framework\master_listen.c" />
-    <ClCompile Include=".\src\master\framework\master_pathname.c" />
-    <ClCompile Include=".\src\master\framework\master_service.c" />
-    <ClCompile Include=".\src\master\framework\master_sig.c" />
-    <ClCompile Include=".\src\master\framework\master_spawn.c" />
-    <ClCompile Include=".\src\master\framework\master_status.c" />
-    <ClCompile Include=".\src\master\framework\master_wakeup.c" />
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c" />
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c" />
-    <ClCompile Include=".\src\master\daemon\master.c" />
+    <ClCompile Include=".\src\master\template\acl_udp_server.c" />
     <ClCompile Include=".\src\proctl\acl_proctl.c" />
     <ClCompile Include=".\src\proctl\proctl_child.c" />
     <ClCompile Include=".\src\proctl\proctl_monitor.c" />
@@ -663,16 +646,15 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClCompile Include=".\src\json\acl_json.c" />
     <ClCompile Include=".\src\json\acl_json_parse.c" />
     <ClCompile Include=".\src\json\acl_json_util.c" />
-    <ClCompile Include="src\event\events_epoll_thr.c" />
-    <ClCompile Include="src\master\template\acl_udp_server.c" />
-    <ClCompile Include="src\stdlib\acl_atomic.c" />
-    <ClCompile Include="src\stdlib\sys\unix\acl_trace.c" />
-    <ClCompile Include="src\xml\acl_xml2.c" />
-    <ClCompile Include="src\xml\acl_xml2_parse.c" />
-    <ClCompile Include="src\xml\acl_xml2_util.c" />
-    <ClCompile Include="src\xml\acl_xml3.c" />
-    <ClCompile Include="src\xml\acl_xml3_parse.c" />
-    <ClCompile Include="src\xml\acl_xml3_util.c" />
+    <ClCompile Include=".\src\event\events_epoll_thr.c" />
+    <ClCompile Include=".\src\stdlib\acl_atomic.c" />
+    <ClCompile Include=".\src\stdlib\sys\unix\acl_trace.c" />
+    <ClCompile Include=".\src\xml\acl_xml2.c" />
+    <ClCompile Include=".\src\xml\acl_xml2_parse.c" />
+    <ClCompile Include=".\src\xml\acl_xml2_util.c" />
+    <ClCompile Include=".\src\xml\acl_xml3.c" />
+    <ClCompile Include=".\src\xml\acl_xml3_parse.c" />
+    <ClCompile Include=".\src\xml\acl_xml3_util.c" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="lib_acl.rc" />
@@ -716,13 +698,7 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClInclude Include=".\src\db\null\acl_dbnull.h" />
     <ClInclude Include=".\src\db\null\acl_dbpool_null.h" />
     <ClInclude Include=".\src\db\zdb\zdb_private.h" />
-    <ClInclude Include=".\src\master\master_flow.h" />
-    <ClInclude Include=".\src\master\master_params.h" />
-    <ClInclude Include=".\src\master\master_proto.h" />
     <ClInclude Include=".\src\master\template\master_log.h" />
-    <ClInclude Include=".\src\master\framework\master.h" />
-    <ClInclude Include=".\src\master\framework\master_pathname.h" />
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h" />
     <ClInclude Include=".\src\proctl\proctl_internal.h" />
     <ClInclude Include=".\src\init\init.h" />
     <ClInclude Include=".\src\private\private.h" />
@@ -869,11 +845,11 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
     <ClInclude Include=".\include\code\acl_urlcode.h" />
     <ClInclude Include=".\include\code\acl_vstring_base64.h" />
     <ClInclude Include=".\include\master\acl_aio_params.h" />
-    <ClInclude Include=".\include\master\acl_ioctl_params.h" />
     <ClInclude Include=".\include\master\acl_master.h" />
     <ClInclude Include=".\include\master\acl_master_conf.h" />
+    <ClInclude Include=".\include\master\acl_master_flow.h" />
+    <ClInclude Include=".\include\master\acl_master_proto.h" />
     <ClInclude Include=".\include\master\acl_master_type.h" />
-    <ClInclude Include=".\include\master\acl_multi_params.h" />
     <ClInclude Include=".\include\master\acl_server_api.h" />
     <ClInclude Include=".\include\master\acl_single_params.h" />
     <ClInclude Include=".\include\master\acl_threads_params.h" />
@@ -893,4 +869,4 @@ copy $(TargetName).pdb ..\dist\lib\win64\$(TargetName).pdb /Y
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib_acl/lib_acl_vc2015.vcxproj.filters b/lib_acl/lib_acl_vc2015.vcxproj.filters
index 250d9f134..c1388b0c9 100644
--- a/lib_acl/lib_acl_vc2015.vcxproj.filters
+++ b/lib_acl/lib_acl_vc2015.vcxproj.filters
@@ -92,15 +92,6 @@
     <Filter Include="Source Files\master\template">
       <UniqueIdentifier>{01684461-568d-4c09-b1c0-1c4df0e12ae6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\master\framework">
-      <UniqueIdentifier>{9b13391b-9bed-4d58-9e22-bc169844986e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\master\framework\trigger">
-      <UniqueIdentifier>{35b92483-33d0-43ee-b8af-f8f93b8dcd3b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\master\daemon">
-      <UniqueIdentifier>{d249f3dc-3b3d-4453-96fd-87ceced12484}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source Files\proctl">
       <UniqueIdentifier>{f721cf19-6c42-4e35-9e10-e1a681d6daed}</UniqueIdentifier>
     </Filter>
@@ -767,30 +758,21 @@
     <ClCompile Include=".\src\unit_test\acl_test_token.c">
       <Filter>Source Files\unit_test</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_flow.c">
+    <ClCompile Include=".\src\master\acl_master_flow.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_params.c">
+    <ClCompile Include=".\src\master\acl_master_params.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\master_proto.c">
-      <Filter>Source Files\master</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\master_vars.c">
+    <ClCompile Include=".\src\master\acl_master_proto.c">
       <Filter>Source Files\master</Filter>
     </ClCompile>
     <ClCompile Include=".\src\master\template\acl_aio_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_ioctl_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\master_log.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\template\acl_multi_server.c">
-      <Filter>Source Files\master\template</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\master\template\acl_single_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
@@ -800,51 +782,6 @@
     <ClCompile Include=".\src\master\template\acl_trigger_server.c">
       <Filter>Source Files\master\template</Filter>
     </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_avail.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_conf.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_ent.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_listen.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_pathname.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_service.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_sig.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_spawn.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_status.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\master_wakeup.c">
-      <Filter>Source Files\master\framework</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\fifo_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\inet_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\stream_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\framework\trigger\unix_trigger.c">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClCompile>
-    <ClCompile Include=".\src\master\daemon\master.c">
-      <Filter>Source Files\master\daemon</Filter>
-    </ClCompile>
     <ClCompile Include=".\src\proctl\acl_proctl.c">
       <Filter>Source Files\proctl</Filter>
     </ClCompile>
@@ -1047,27 +984,9 @@
     <ClInclude Include=".\src\db\zdb\zdb_private.h">
       <Filter>Source Files\db\zdb</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\master_flow.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_params.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\master_proto.h">
-      <Filter>Source Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\master\template\master_log.h">
       <Filter>Source Files\master\template</Filter>
     </ClInclude>
-    <ClInclude Include=".\src\master\framework\master.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\master_pathname.h">
-      <Filter>Source Files\master\framework</Filter>
-    </ClInclude>
-    <ClInclude Include=".\src\master\framework\trigger\trigger.h">
-      <Filter>Source Files\master\framework\trigger</Filter>
-    </ClInclude>
     <ClInclude Include=".\src\proctl\proctl_internal.h">
       <Filter>Source Files\proctl</Filter>
     </ClInclude>
@@ -1491,19 +1410,19 @@
     <ClInclude Include=".\include\master\acl_aio_params.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_ioctl_params.h">
-      <Filter>Header Files\master</Filter>
-    </ClInclude>
     <ClInclude Include=".\include\master\acl_master.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_master_conf.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_master_type.h">
+    <ClInclude Include=".\include\master\acl_master_flow.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
-    <ClInclude Include=".\include\master\acl_multi_params.h">
+    <ClInclude Include=".\include\master\acl_master_proto.h">
+      <Filter>Header Files\master</Filter>
+    </ClInclude>
+    <ClInclude Include=".\include\master\acl_master_type.h">
       <Filter>Header Files\master</Filter>
     </ClInclude>
     <ClInclude Include=".\include\master\acl_server_api.h">
@@ -1569,4 +1488,4 @@
       <Filter>doc</Filter>
     </Text>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>