diff --git a/library/library.index b/library/library.index
index 4a0d084a..81d9a4f3 100644
--- a/library/library.index
+++ b/library/library.index
@@ -7,24 +7,20 @@ error-safe : c:\_dev\Dev-Process\web-framework\library\error\error-safe.ecf
 error : c:\_dev\Dev-Process\web-framework\library\error\error.ecf  
 http-safe : c:\_dev\Dev-Process\web-framework\library\protocol\http\http-safe.ecf  
 http : c:\_dev\Dev-Process\web-framework\library\protocol\http\http.ecf  
-uri_template-safe : c:\_dev\Dev-Process\web-framework\library\protocol\uri_template\uri_template-safe.ecf  
-uri_template : c:\_dev\Dev-Process\web-framework\library\protocol\uri_template\uri_template.ecf  
 http_authorization-safe : c:\_dev\Dev-Process\web-framework\library\server\authentication\http_authorization\http_authorization-safe.ecf  
 http_authorization : c:\_dev\Dev-Process\web-framework\library\server\authentication\http_authorization\http_authorization.ecf  
 ewsgi-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi-safe.ecf  
 ewsgi : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi.ecf  
 ewsgi_spec-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi_spec-safe.ecf  
 ewsgi_spec : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\ewsgi_spec.ecf  
+connector-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\connector-safe.ecf  
+connector : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\connector.ecf  
 cgi-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\cgi\cgi-safe.ecf  
 cgi : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\cgi\cgi.ecf  
 libfcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf  
 libfcgi : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\libfcgi\libfcgi.ecf  
 nino-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\nino\nino-safe.ecf  
 nino : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\connectors\nino\nino.ecf  
-ewsgi_cgi-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\default\ewsgi_cgi-safe.ecf  
-ewsgi_cgi : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\default\ewsgi_cgi.ecf  
-ewsgi_nino-safe : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\default\ewsgi_nino-safe.ecf  
-ewsgi_nino : c:\_dev\Dev-Process\web-framework\library\server\ewsgi\default\ewsgi_nino.ecf  
 fcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\fcgi-safe.ecf  
 fcgi : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\fcgi.ecf  
 libfcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\libfcgi-safe.ecf  
@@ -33,6 +29,12 @@ rest-safe : c:\_dev\Dev-Process\web-framework\library\server\request\rest\rest-s
 rest : c:\_dev\Dev-Process\web-framework\library\server\request\rest\rest.ecf  
 router-safe : c:\_dev\Dev-Process\web-framework\library\server\request\router\router-safe.ecf  
 router : c:\_dev\Dev-Process\web-framework\library\server\request\router\router.ecf  
+wsf-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\wsf-safe.ecf  
+wsf : c:\_dev\Dev-Process\web-framework\library\server\wsf\wsf.ecf  
+cgi-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\cgi-safe.ecf  
+cgi : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\cgi.ecf  
+nino-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\nino-safe.ecf  
+nino : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\nino.ecf  
 encoder-safe : c:\_dev\Dev-Process\web-framework\library\text\encoder\encoder-safe.ecf  
 encoder : c:\_dev\Dev-Process\web-framework\library\text\encoder\encoder.ecf  
   
diff --git a/library/server/ewsgi/tests/ewsgi-full-safe.ecf b/library/server/ewsgi/tests/ewsgi-full-safe.ecf
deleted file mode 100644
index bdb8b5f4..00000000
--- a/library/server/ewsgi/tests/ewsgi-full-safe.ecf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="ewsgi-full" uuid="663191A1-53D8-4974-AB46-7359C7377AD2" library_target="ewsgi-full">
-	<target name="ewsgi-full">
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<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>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
-		<library name="error" location="..\..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
-		<library name="libfcgi" location="..\..\libfcgi\libfcgi-safe.ecf"/>
-		<library name="nino" location="..\..\..\..\ext\server\nino\nino-safe.ecf" readonly="false">
-			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
-		</library>
-		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<cluster name="connectors" location="..\connectors\" recursive="true"/>
-		<cluster name="interface" location="..\src\" recursive="true"/>
-		<cluster name="specification_request" location="..\specification\request" recursive="true"/>
-		<cluster name="specification_response" location="..\specification\response" recursive="true"/>
-		
-	</target>
-</system>
diff --git a/library/server/ewsgi/tests/ewsgi-full.ecf b/library/server/ewsgi/tests/ewsgi-full.ecf
deleted file mode 100644
index 64e31420..00000000
--- a/library/server/ewsgi/tests/ewsgi-full.ecf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="ewsgi-full" uuid="663191A1-53D8-4974-AB46-7359C7377AD2" library_target="ewsgi-full">
-	<target name="ewsgi-full">
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/EIFGENs$</exclude>
-			<exclude>/\.git$</exclude>
-			<exclude>/\.svn$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true" syntax="provisional">
-		</option>
-		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="encoder" location="..\..\..\text\encoder\encoder.ecf" readonly="false"/>
-		<library name="error" location="..\..\..\error\error.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http.ecf"/>
-		<library name="libfcgi" location="..\..\libfcgi\libfcgi.ecf"/>
-		<library name="nino" location="..\..\..\..\ext\server\nino\nino.ecf" readonly="false">
-			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
-		</library>
-		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<cluster name="connectors" location="..\connectors\" recursive="true"/>
-		<cluster name="interface" location="..\src\" recursive="true"/>
-		<cluster name="specification_request" location="..\specification\request" recursive="true"/>
-		<cluster name="specification_response" location="..\specification\response" recursive="true"/>
-	</target>
-</system>