diff --git a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
index 84514c66..7d2dcfaa 100644
--- a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
@@ -16,7 +16,8 @@
 		<library name="encoder" location="..\..\..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\network\protocol\http\http-safe.ecf"/>
-		<library name="httpd" location="lib\httpd\httpd-safe.ecf" readonly="false"/>
+		<library name="http_network" location="..\..\..\httpd\http_network-safe.ecf" readonly="false"/>
+		<library name="httpd" location="..\..\..\httpd\httpd-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\">
 			<cluster name="implementation" location="$|implementation\" hidden="true"/>
 		</cluster>
diff --git a/library/server/ewsgi/connectors/standalone/standalone.ecf b/library/server/ewsgi/connectors/standalone/standalone.ecf
index 89c4189e..5a766114 100644
--- a/library/server/ewsgi/connectors/standalone/standalone.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone.ecf
@@ -15,7 +15,8 @@
 		<library name="encoder" location="..\..\..\..\text\encoder\encoder.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\network\protocol\http\http.ecf"/>
-		<library name="httpd" location="lib\httpd\httpd.ecf" readonly="false"/>
+		<library name="http_network" location="..\..\..\httpd\http_network.ecf" readonly="false"/>
+		<library name="httpd" location="..\..\..\httpd\httpd.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\">
 			<cluster name="implementation" location="$|implementation\" hidden="true"/>
 		</cluster>
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_connection_handler.e b/library/server/httpd/concurrency/none/httpd_connection_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_connection_handler.e
rename to library/server/httpd/concurrency/none/httpd_connection_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler.e b/library/server/httpd/concurrency/none/httpd_request_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler.e
rename to library/server/httpd/concurrency/none/httpd_request_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler_factory.e b/library/server/httpd/concurrency/none/httpd_request_handler_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler_factory.e
rename to library/server/httpd/concurrency/none/httpd_request_handler_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_connection_handler.e b/library/server/httpd/concurrency/scoop/httpd_connection_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_connection_handler.e
rename to library/server/httpd/concurrency/scoop/httpd_connection_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler.e b/library/server/httpd/concurrency/scoop/httpd_request_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler.e
rename to library/server/httpd/concurrency/scoop/httpd_request_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler_factory.e b/library/server/httpd/concurrency/scoop/httpd_request_handler_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler_factory.e
rename to library/server/httpd/concurrency/scoop/httpd_request_handler_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool.e b/library/server/httpd/concurrency/scoop/pool/concurrent_pool.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool.e
rename to library/server/httpd/concurrency/scoop/pool/concurrent_pool.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_factory.e b/library/server/httpd/concurrency/scoop/pool/concurrent_pool_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_factory.e
rename to library/server/httpd/concurrency/scoop/pool/concurrent_pool_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_item.e b/library/server/httpd/concurrency/scoop/pool/concurrent_pool_item.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_item.e
rename to library/server/httpd/concurrency/scoop/pool/concurrent_pool_item.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_connection_handler.e b/library/server/httpd/concurrency/thread/httpd_connection_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_connection_handler.e
rename to library/server/httpd/concurrency/thread/httpd_connection_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler.e b/library/server/httpd/concurrency/thread/httpd_request_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler.e
rename to library/server/httpd/concurrency/thread/httpd_request_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler_factory.e b/library/server/httpd/concurrency/thread/httpd_request_handler_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler_factory.e
rename to library/server/httpd/concurrency/thread/httpd_request_handler_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/pooled_thread.e b/library/server/httpd/concurrency/thread/pool/pooled_thread.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/pooled_thread.e
rename to library/server/httpd/concurrency/thread/pool/pooled_thread.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/thread_pool.e b/library/server/httpd/concurrency/thread/pool/thread_pool.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/thread_pool.e
rename to library/server/httpd/concurrency/thread/pool/thread_pool.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_configuration_i.e b/library/server/httpd/configuration/httpd_configuration_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_configuration_i.e
rename to library/server/httpd/configuration/httpd_configuration_i.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_constants.e b/library/server/httpd/configuration/httpd_constants.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_constants.e
rename to library/server/httpd/configuration/httpd_constants.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_request_settings.e b/library/server/httpd/configuration/httpd_request_settings.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_request_settings.e
rename to library/server/httpd/configuration/httpd_request_settings.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf b/library/server/httpd/http_network-safe.ecf
similarity index 71%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf
rename to library/server/httpd/http_network-safe.ecf
index 68edf7df..66d8878c 100644
--- a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network-safe.ecf
+++ b/library/server/httpd/http_network-safe.ecf
@@ -10,12 +10,19 @@
 		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="standard">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
+		<setting name="concurrency" value="scoop"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf" readonly="false"/>
 		<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl-safe.ecf">
+			<condition>
+				<custom name="ssl_enabled" value="true"/>
+			</condition>
 			<condition>
 				<custom name="net_ssl_enabled" value="true"/>
 			</condition>
+			<condition>
+				<custom name="httpd_ssl_enabled" value="true"/>
+			</condition>
 		</library>
 		<cluster name="network" location=".\network\">
 			<file_rule>
@@ -25,11 +32,25 @@
 				</condition>
 			</file_rule>
 			<cluster name="ssl_network" location="$|ssl\" recursive="true">
+				<condition>
+					<custom name="ssl_enabled" value="true"/>
+				</condition>
+				<condition>
+					<custom name="net_ssl_enabled" value="true"/>
+				</condition>
 				<condition>
 					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
 				<file_rule>
 					<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
+					<condition>
+						<version type="compiler" max="16.11.0.0"/>
+						<custom name="ssl_enabled" value="true"/>
+					</condition>
+					<condition>
+						<version type="compiler" max="16.11.0.0"/>
+						<custom name="net_ssl_enabled" value="true"/>
+					</condition>
 					<condition>
 						<version type="compiler" max="16.11.0.0"/>
 						<custom name="httpd_ssl_enabled" value="true"/>
@@ -42,6 +63,14 @@
 				<version type="compiler" max="16.11.0.0"/>
 			</condition>
 			<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
+				<condition>
+					<custom name="ssl_enabled" value="true"/>
+					<version type="compiler" max="16.11.0.0"/>
+				</condition>
+				<condition>
+					<custom name="net_ssl_enabled" value="true"/>
+					<version type="compiler" max="16.11.0.0"/>
+				</condition>
 				<condition>
 					<custom name="httpd_ssl_enabled" value="true"/>
 					<version type="compiler" max="16.11.0.0"/>
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf b/library/server/httpd/http_network.ecf
similarity index 72%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf
rename to library/server/httpd/http_network.ecf
index 9f4067ec..b90cf5d9 100644
--- a/library/server/ewsgi/connectors/standalone/lib/httpd/http_network.ecf
+++ b/library/server/httpd/http_network.ecf
@@ -14,9 +14,15 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl.ecf">
+			<condition>
+				<custom name="ssl_enabled" value="true"/>
+			</condition>
 			<condition>
 				<custom name="net_ssl_enabled" value="true"/>
 			</condition>
+			<condition>
+				<custom name="httpd_ssl_enabled" value="true"/>
+			</condition>
 		</library>
 		<cluster name="network" location=".\network\">
 			<file_rule>
@@ -26,11 +32,25 @@
 				</condition>
 			</file_rule>
 			<cluster name="ssl_network" location="$|ssl\" recursive="true">
+				<condition>
+					<custom name="ssl_enabled" value="true"/>
+				</condition>
+				<condition>
+					<custom name="net_ssl_enabled" value="true"/>
+				</condition>
 				<condition>
 					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
 				<file_rule>
 					<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
+					<condition>
+						<version type="compiler" max="16.11.0.0"/>
+						<custom name="ssl_enabled" value="true"/>
+					</condition>
+					<condition>
+						<version type="compiler" max="16.11.0.0"/>
+						<custom name="net_ssl_enabled" value="true"/>
+					</condition>
 					<condition>
 						<version type="compiler" max="16.11.0.0"/>
 						<custom name="httpd_ssl_enabled" value="true"/>
@@ -43,6 +63,14 @@
 				<version type="compiler" max="16.11.0.0"/>
 			</condition>
 			<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
+				<condition>
+					<custom name="ssl_enabled" value="true"/>
+					<version type="compiler" max="16.11.0.0"/>
+				</condition>
+				<condition>
+					<custom name="net_ssl_enabled" value="true"/>
+					<version type="compiler" max="16.11.0.0"/>
+				</condition>
 				<condition>
 					<custom name="httpd_ssl_enabled" value="true"/>
 					<version type="compiler" max="16.11.0.0"/>
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd-safe.ecf b/library/server/httpd/httpd-safe.ecf
similarity index 75%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd-safe.ecf
rename to library/server/httpd/httpd-safe.ecf
index 7f1b6694..077126be 100644
--- a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd-safe.ecf
+++ b/library/server/httpd/httpd-safe.ecf
@@ -22,8 +22,12 @@
 			</condition>
 		</external_include>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="http_network" location="http_network-safe.ecf" readonly="false"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl-safe.ecf">
+			<condition>
+				<custom name="ssl_enabled" value="true"/>
+			</condition>
 			<condition>
 				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
@@ -43,10 +47,14 @@
 			</file_rule>
 			<cluster name="no_ssl" location="$|no_ssl\" recursive="true">
 				<condition>
+					<custom name="ssl_enabled" excluded_value="true"/>
 					<custom name="httpd_ssl_enabled" excluded_value="true"/>
 				</condition>
 			</cluster>
 			<cluster name="ssl" location="$|ssl\" recursive="true">
+				<condition>
+					<custom name="ssl_enabled" value="true"/>
+				</condition>
 				<condition>
 					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
@@ -67,36 +75,5 @@
 				</condition>
 			</cluster>
 		</cluster>
-		<cluster name="network" location=".\network\">
-			<file_rule>
-				<exclude>/httpd_stream_socket_ext.e$</exclude>
-				<condition>
-					<version type="compiler" max="16.11.0.0"/>
-				</condition>
-			</file_rule>
-			<cluster name="ssl_network" location="$|ssl\" recursive="true">
-				<condition>
-					<custom name="httpd_ssl_enabled" value="true"/>
-				</condition>
-				<file_rule>
-					<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
-					<condition>
-						<version type="compiler" max="16.11.0.0"/>
-						<custom name="httpd_ssl_enabled" value="true"/>
-					</condition>
-				</file_rule>
-			</cluster>
-		</cluster>
-		<cluster name="network_until_16_05" location=".\network\until_16_05\" recursive="false">
-			<condition>
-				<version type="compiler" max="16.11.0.0"/>
-			</condition>
-			<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
-				<condition>
-					<custom name="httpd_ssl_enabled" value="true"/>
-					<version type="compiler" max="16.11.0.0"/>
-				</condition>
-			</cluster>
-		</cluster>
 	</target>
 </system>
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf b/library/server/httpd/httpd.ecf
similarity index 71%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf
rename to library/server/httpd/httpd.ecf
index e6e87f66..8d357c2b 100644
--- a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf
+++ b/library/server/httpd/httpd.ecf
@@ -11,8 +11,12 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="http_network" location="http_network.ecf" readonly="false"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<library name="net_ssl" location="$ISE_LIBRARY\unstable\library\network\socket\netssl\net_ssl.ecf">
+			<condition>
+				<custom name="ssl_enabled" value="true"/>
+			</condition>
 			<condition>
 				<custom name="httpd_ssl_enabled" value="true"/>
 			</condition>
@@ -23,37 +27,6 @@
 			</condition>
 		</library>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="network" location=".\network\">
-			<file_rule>
-				<exclude>/httpd_stream_socket_ext.e$</exclude>
-				<condition>
-					<version type="compiler" max="16.11.0.0"/>
-				</condition>
-			</file_rule>
-			<cluster name="ssl_network" location="$|ssl\" recursive="true">
-				<condition>
-					<custom name="httpd_ssl_enabled" value="true"/>
-				</condition>
-				<file_rule>
-					<exclude>/httpd_stream_ssl_socket_ext.e$</exclude>
-					<condition>
-						<version type="compiler" max="16.11.0.0"/>
-						<custom name="httpd_ssl_enabled" value="true"/>
-					</condition>
-				</file_rule>
-			</cluster>
-		</cluster>
-		<cluster name="network_until_16_05" location=".\network\until_16_05\" recursive="false">
-			<condition>
-				<version type="compiler" max="16.11.0.0"/>
-			</condition>
-			<cluster name="ssl_network_until_16_05" location="$|ssl\" recursive="true">
-				<condition>
-					<custom name="httpd_ssl_enabled" value="true"/>
-					<version type="compiler" max="16.11.0.0"/>
-				</condition>
-			</cluster>
-		</cluster>
 		<cluster name="httpd_server" location=".\" recursive="true">
 			<file_rule>
 				<exclude>/concurrency$</exclude>
@@ -63,10 +36,14 @@
 			</file_rule>
 			<cluster name="no_ssl" location="$|no_ssl\" recursive="true">
 				<condition>
+					<custom name="ssl_enabled" excluded_value="true"/>
 					<custom name="httpd_ssl_enabled" excluded_value="true"/>
 				</condition>
 			</cluster>
 			<cluster name="ssl" location="$|ssl\" recursive="true">
+				<condition>
+					<custom name="ssl_enabled" value="true"/>
+				</condition>
 				<condition>
 					<custom name="httpd_ssl_enabled" value="true"/>
 				</condition>
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_connection_handler_i.e b/library/server/httpd/httpd_connection_handler_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_connection_handler_i.e
rename to library/server/httpd/httpd_connection_handler_i.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_controller.e b/library/server/httpd/httpd_controller.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_controller.e
rename to library/server/httpd/httpd_controller.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_debug_facilities.e b/library/server/httpd/httpd_debug_facilities.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_debug_facilities.e
rename to library/server/httpd/httpd_debug_facilities.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger.e b/library/server/httpd/httpd_logger.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger.e
rename to library/server/httpd/httpd_logger.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger_constants.e b/library/server/httpd/httpd_logger_constants.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger_constants.e
rename to library/server/httpd/httpd_logger_constants.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_factory_i.e b/library/server/httpd/httpd_request_handler_factory_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_factory_i.e
rename to library/server/httpd/httpd_request_handler_factory_i.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_i.e b/library/server/httpd/httpd_request_handler_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_i.e
rename to library/server/httpd/httpd_request_handler_i.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_i.e b/library/server/httpd/httpd_server_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_i.e
rename to library/server/httpd/httpd_server_i.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_observer.e b/library/server/httpd/httpd_server_observer.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_observer.e
rename to library/server/httpd/httpd_server_observer.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket.e b/library/server/httpd/network/httpd_stream_socket.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket.e
rename to library/server/httpd/network/httpd_stream_socket.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket_ext.e b/library/server/httpd/network/httpd_stream_socket_ext.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket_ext.e
rename to library/server/httpd/network/httpd_stream_socket_ext.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/network/ssl/httpd_stream_ssl_socket.e b/library/server/httpd/network/ssl/httpd_stream_ssl_socket.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/network/ssl/httpd_stream_ssl_socket.e
rename to library/server/httpd/network/ssl/httpd_stream_ssl_socket.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/network/ssl/httpd_stream_ssl_socket_ext.e b/library/server/httpd/network/ssl/httpd_stream_ssl_socket_ext.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/network/ssl/httpd_stream_ssl_socket_ext.e
rename to library/server/httpd/network/ssl/httpd_stream_ssl_socket_ext.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/network/until_16_05/httpd_stream_socket_ext.e b/library/server/httpd/network/until_16_05/httpd_stream_socket_ext.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/network/until_16_05/httpd_stream_socket_ext.e
rename to library/server/httpd/network/until_16_05/httpd_stream_socket_ext.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e b/library/server/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e
rename to library/server/httpd/network/until_16_05/ssl/httpd_stream_ssl_socket_ext.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_configuration.e b/library/server/httpd/no_ssl/httpd_configuration.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_configuration.e
rename to library/server/httpd/no_ssl/httpd_configuration.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_server.e b/library/server/httpd/no_ssl/httpd_server.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_server.e
rename to library/server/httpd/no_ssl/httpd_server.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_socket_factory.e b/library/server/httpd/no_ssl/httpd_socket_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_socket_factory.e
rename to library/server/httpd/no_ssl/httpd_socket_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/package.iron b/library/server/httpd/package.iron
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/package.iron
rename to library/server/httpd/package.iron
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/spec/include_until_16_05/ew_httpd_net.h b/library/server/httpd/spec/include_until_16_05/ew_httpd_net.h
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/spec/include_until_16_05/ew_httpd_net.h
rename to library/server/httpd/spec/include_until_16_05/ew_httpd_net.h
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_configuration.e b/library/server/httpd/ssl/httpd_configuration.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_configuration.e
rename to library/server/httpd/ssl/httpd_configuration.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_server.e b/library/server/httpd/ssl/httpd_server.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_server.e
rename to library/server/httpd/ssl/httpd_server.e
diff --git a/library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_socket_factory.e b/library/server/httpd/ssl/httpd_socket_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_socket_factory.e
rename to library/server/httpd/ssl/httpd_socket_factory.e
diff --git a/library/server/wsf/connector/standalone-safe.ecf b/library/server/wsf/connector/standalone-safe.ecf
index 7ad62d20..384c08b6 100644
--- a/library/server/wsf/connector/standalone-safe.ecf
+++ b/library/server/wsf/connector/standalone-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="wsf_standalone" uuid="9BF2D71A-0986-4025-9C97-15B65F07C568" library_target="wsf_standalone">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="wsf_standalone" uuid="9BF2D71A-0986-4025-9C97-15B65F07C568" library_target="wsf_standalone">
 	<target name="wsf_standalone">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,16 +7,16 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option concurrency="none" warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone-safe.ecf"/>
+		<library name="connector_standalone" location="..\..\ewsgi\connectors\standalone\standalone-safe.ecf" use_application_options="true"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="error" location="..\..\..\utility\general\error\error-safe.ecf"/>
-		<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf"/>
+		<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf" use_application_options="true"/>
 		<library name="http" location="..\..\..\network\protocol\http\http-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="wsf" location="..\wsf-safe.ecf"/>
+		<library name="wsf" location="..\wsf-safe.ecf" use_application_options="true"/>
 		<cluster name="wsf_standalone" location=".\standalone\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf/default/standalone-safe.ecf b/library/server/wsf/default/standalone-safe.ecf
index 9716756e..845a0a9d 100644
--- a/library/server/wsf/default/standalone-safe.ecf
+++ b/library/server/wsf/default/standalone-safe.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="default_standalone" uuid="5CBA8C5A-3191-434A-8DE1-C0C3CAC9C4F4" library_target="default_standalone">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-16-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-16-0 http://www.eiffel.com/developers/xml/configuration-1-16-0.xsd" name="default_standalone" uuid="5CBA8C5A-3191-434A-8DE1-C0C3CAC9C4F4" library_target="default_standalone">
 	<target name="default_standalone">
 		<root all_classes="true"/>
 		<file_rule>
@@ -7,11 +7,11 @@
 			<exclude>/\.git$</exclude>
 			<exclude>/\.svn$</exclude>
 		</file_rule>
-		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
+		<option concurrency="none" warning="true" full_class_checking="true" is_attached_by_default="true" is_obsolete_routine_type="true" void_safety="all" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="wsf" location="..\wsf-safe.ecf"/>
-		<library name="wsf_standalone" location="..\connector\standalone-safe.ecf"/>
+		<library name="wsf" location="..\wsf-safe.ecf" use_application_options="true"/>
+		<library name="wsf_standalone" location="..\connector\standalone-safe.ecf" use_application_options="true"/>
 		<cluster name="default_standalone" location=".\standalone\" recursive="true"/>
 	</target>
 </system>