diff --git a/examples/filter/filter-safe.ecf b/examples/filter/filter-safe.ecf
index 8edae596..0495befc 100644
--- a/examples/filter/filter-safe.ecf
+++ b/examples/filter/filter-safe.ecf
@@ -18,6 +18,7 @@
 		<library name="http" location="../../library/network/protocol/http/http-safe.ecf" readonly="true"/>
 		<library name="json" location="..\..\contrib\library\text\parser\json\library\json-safe.ecf" readonly="true"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="true"/>
+		<library name="wsf_router_context" location="..\..\library\server\wsf\wsf_router_context-safe.ecf" readonly="true"/>
 		<library name="wsf_extension" location="..\..\library\server\wsf\wsf_extension-safe.ecf" readonly="true"/>
 		<library name="http_authorization" location="..\..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="true"/>
 		<cluster name="src" location="src\" recursive="true"/>
diff --git a/library/server/wsf/router/support/starts_with/context_helpers/wsf_starts_with_agent_context_handler.e b/library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_agent_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/starts_with/context_helpers/wsf_starts_with_agent_context_handler.e
rename to library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_agent_context_handler.e
diff --git a/library/server/wsf/router/support/starts_with/context_helpers/wsf_starts_with_context_routed_service.e b/library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_context_routed_service.e
similarity index 100%
rename from library/server/wsf/router/support/starts_with/context_helpers/wsf_starts_with_context_routed_service.e
rename to library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_context_routed_service.e
diff --git a/library/server/wsf/router/support/starts_with/context_helpers/wsf_starts_with_routing_context_handler.e b/library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_routing_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/starts_with/context_helpers/wsf_starts_with_routing_context_handler.e
rename to library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_routing_context_handler.e
diff --git a/library/server/wsf/router/support/starts_with/wsf_starts_with_context_handler.e b/library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/starts_with/wsf_starts_with_context_handler.e
rename to library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_handler.e
diff --git a/library/server/wsf/router/support/starts_with/wsf_starts_with_context_mapping.e b/library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_mapping.e
similarity index 100%
rename from library/server/wsf/router/support/starts_with/wsf_starts_with_context_mapping.e
rename to library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_mapping.e
diff --git a/library/server/wsf/router/support/uri/context_helpers/wsf_uri_agent_context_handler.e b/library/server/wsf/router_context/support/uri/helpers/wsf_uri_agent_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/uri/context_helpers/wsf_uri_agent_context_handler.e
rename to library/server/wsf/router_context/support/uri/helpers/wsf_uri_agent_context_handler.e
diff --git a/library/server/wsf/router/support/uri/context_helpers/wsf_uri_context_routed_service.e b/library/server/wsf/router_context/support/uri/helpers/wsf_uri_context_routed_service.e
similarity index 100%
rename from library/server/wsf/router/support/uri/context_helpers/wsf_uri_context_routed_service.e
rename to library/server/wsf/router_context/support/uri/helpers/wsf_uri_context_routed_service.e
diff --git a/library/server/wsf/router/support/uri/context_helpers/wsf_uri_routing_context_handler.e b/library/server/wsf/router_context/support/uri/helpers/wsf_uri_routing_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/uri/context_helpers/wsf_uri_routing_context_handler.e
rename to library/server/wsf/router_context/support/uri/helpers/wsf_uri_routing_context_handler.e
diff --git a/library/server/wsf/router/support/uri/wsf_uri_context_handler.e b/library/server/wsf/router_context/support/uri/wsf_uri_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/uri/wsf_uri_context_handler.e
rename to library/server/wsf/router_context/support/uri/wsf_uri_context_handler.e
diff --git a/library/server/wsf/router/support/uri/wsf_uri_context_mapping.e b/library/server/wsf/router_context/support/uri/wsf_uri_context_mapping.e
similarity index 100%
rename from library/server/wsf/router/support/uri/wsf_uri_context_mapping.e
rename to library/server/wsf/router_context/support/uri/wsf_uri_context_mapping.e
diff --git a/library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_agent_context_handler.e b/library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_agent_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_agent_context_handler.e
rename to library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_agent_context_handler.e
diff --git a/library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_context_routed_service.e b/library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_context_routed_service.e
similarity index 100%
rename from library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_context_routed_service.e
rename to library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_context_routed_service.e
diff --git a/library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_filter_context_handler.e- b/library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_filter_context_handler.e-
similarity index 100%
rename from library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_filter_context_handler.e-
rename to library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_filter_context_handler.e-
diff --git a/library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_routing_context_handler.e b/library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_routing_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/uri_template/context_helpers/wsf_uri_template_routing_context_handler.e
rename to library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_routing_context_handler.e
diff --git a/library/server/wsf/router/support/uri_template/wsf_uri_template_context_handler.e b/library/server/wsf/router_context/support/uri_template/wsf_uri_template_context_handler.e
similarity index 100%
rename from library/server/wsf/router/support/uri_template/wsf_uri_template_context_handler.e
rename to library/server/wsf/router_context/support/uri_template/wsf_uri_template_context_handler.e
diff --git a/library/server/wsf/router/support/uri_template/wsf_uri_template_context_mapping.e b/library/server/wsf/router_context/support/uri_template/wsf_uri_template_context_mapping.e
similarity index 100%
rename from library/server/wsf/router/support/uri_template/wsf_uri_template_context_mapping.e
rename to library/server/wsf/router_context/support/uri_template/wsf_uri_template_context_mapping.e
diff --git a/library/server/wsf/router/context/wsf_agent_context_handler.e b/library/server/wsf/router_context/wsf_agent_context_handler.e
similarity index 100%
rename from library/server/wsf/router/context/wsf_agent_context_handler.e
rename to library/server/wsf/router_context/wsf_agent_context_handler.e
diff --git a/library/server/wsf/router/context/wsf_context_handler.e b/library/server/wsf/router_context/wsf_context_handler.e
similarity index 100%
rename from library/server/wsf/router/context/wsf_context_handler.e
rename to library/server/wsf/router_context/wsf_context_handler.e
diff --git a/library/server/wsf/router/context/wsf_filter_context_handler.e b/library/server/wsf/router_context/wsf_filter_context_handler.e
similarity index 100%
rename from library/server/wsf/router/context/wsf_filter_context_handler.e
rename to library/server/wsf/router_context/wsf_filter_context_handler.e
diff --git a/library/server/wsf/router/context/wsf_handler_context.e b/library/server/wsf/router_context/wsf_handler_context.e
similarity index 93%
rename from library/server/wsf/router/context/wsf_handler_context.e
rename to library/server/wsf/router_context/wsf_handler_context.e
index 7babdb27..91eaf745 100644
--- a/library/server/wsf/router/context/wsf_handler_context.e
+++ b/library/server/wsf/router_context/wsf_handler_context.e
@@ -31,7 +31,7 @@ feature -- Access
 			-- Associated mapping
 
 ;note
-	copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
+	copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 	source: "[
 			Eiffel Software
diff --git a/library/server/wsf/router/context/wsf_router_context_mapping.e b/library/server/wsf/router_context/wsf_router_context_mapping.e
similarity index 100%
rename from library/server/wsf/router/context/wsf_router_context_mapping.e
rename to library/server/wsf/router_context/wsf_router_context_mapping.e
diff --git a/library/server/wsf/router/context/wsf_routing_context_handler.e b/library/server/wsf/router_context/wsf_routing_context_handler.e
similarity index 100%
rename from library/server/wsf/router/context/wsf_routing_context_handler.e
rename to library/server/wsf/router_context/wsf_routing_context_handler.e
diff --git a/library/server/wsf/wsf_extension-safe.ecf b/library/server/wsf/wsf_extension-safe.ecf
index 7bfa4489..5a46b2b5 100644
--- a/library/server/wsf/wsf_extension-safe.ecf
+++ b/library/server/wsf/wsf_extension-safe.ecf
@@ -12,7 +12,8 @@
 		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
 		<library name="http" location="../../network/protocol/http/http-safe.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
-		<library name="wsf-safe" location="wsf-safe.ecf"/>
+		<library name="wsf" location="wsf-safe.ecf"/>
+		<library name="wsf_router_context" location="wsf_router_context-safe.ecf" readonly="true"/>
 		<cluster name="extension" location="./extension" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf/wsf_extension.ecf b/library/server/wsf/wsf_extension.ecf
index cef881de..b9ce417f 100644
--- a/library/server/wsf/wsf_extension.ecf
+++ b/library/server/wsf/wsf_extension.ecf
@@ -13,6 +13,7 @@
 		<library name="http" location="../../network/protocol/http/http.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
 		<library name="wsf" location="wsf.ecf"/>
+		<library name="wsf_router_context" location="wsf_router_context.ecf" readonly="true"/>
 		<cluster name="extension" location="./extension" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/wsf/wsf_router_context-safe.ecf b/library/server/wsf/wsf_router_context-safe.ecf
new file mode 100644
index 00000000..91b84d36
--- /dev/null
+++ b/library/server/wsf/wsf_router_context-safe.ecf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="wsf_router_context" uuid="1A0F9B0E-26CE-4DE0-BE47-C74D1AB2B389" library_target="wsf_router_context">
+	<target name="wsf_router_context">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="wsf" location="wsf-safe.ecf"/>
+		<cluster name="router_context" location=".\router_context" recursive="true"/>
+	</target>
+</system>
diff --git a/library/server/wsf/wsf_router_context.ecf b/library/server/wsf/wsf_router_context.ecf
new file mode 100644
index 00000000..7dd0f8de
--- /dev/null
+++ b/library/server/wsf/wsf_router_context.ecf
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-9-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-9-0 http://www.eiffel.com/developers/xml/configuration-1-9-0.xsd" name="wsf_router_context" uuid="1A0F9B0E-26CE-4DE0-BE47-C74D1AB2B389" library_target="wsf_router_context">
+	
+	<target name="wsf_router_context">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true">
+		</option>
+		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="wsf" location="wsf.ecf"/>
+		<cluster name="router_context" location=".\router_context" recursive="true"/>
+	</target>
+</system>
diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf
index 16747e1a..c7d6efe5 100644
--- a/tests/all-safe.ecf
+++ b/tests/all-safe.ecf
@@ -31,6 +31,7 @@
 		<library name="ewf_support" location="..\library\server\ewf_support\ewf_support-safe.ecf" readonly="false"/>
 		<library name="wsf_extension" location="..\library\server\wsf\wsf_extension-safe.ecf" readonly="false"/>
 		<library name="wsf_session" location="..\library\server\wsf\wsf_session-safe.ecf" readonly="false"/>
+		<library name="wsf_router_context" location="..\library\server\wsf\wsf_router_context-safe.ecf" readonly="false"/>
 		<library name="ex_restbuck" location="..\examples\restbucksCRUD\restbucks-safe.ecf" readonly="false"/>
 		<library name="ex_simple" location="..\examples\simple\simple.ecf" readonly="false"/>
 		<library name="ex_filter" location="..\examples\filter\filter-safe.ecf" readonly="false"/>