diff --git a/library/server/request/rest/src/default/rest_application.e b/library/server/request/rest/src/rest_application.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_application.e
rename to library/server/request/rest/src/rest_application.e
diff --git a/library/server/request/rest/src/application/rest_application_i.e b/library/server/request/rest/src/rest_application_i.e
similarity index 100%
rename from library/server/request/rest/src/application/rest_application_i.e
rename to library/server/request/rest/src/rest_application_i.e
diff --git a/library/server/request/rest/src/handler/rest_request_agent_handler.e b/library/server/request/rest/src/rest_request_agent_handler.e
similarity index 100%
rename from library/server/request/rest/src/handler/rest_request_agent_handler.e
rename to library/server/request/rest/src/rest_request_agent_handler.e
diff --git a/library/server/request/rest/src/handler/rest_request_handler.e b/library/server/request/rest/src/rest_request_handler.e
similarity index 100%
rename from library/server/request/rest/src/handler/rest_request_handler.e
rename to library/server/request/rest/src/rest_request_handler.e
diff --git a/library/server/request/rest/src/context/rest_request_handler_context.e b/library/server/request/rest/src/rest_request_handler_context.e
similarity index 100%
rename from library/server/request/rest/src/context/rest_request_handler_context.e
rename to library/server/request/rest/src/rest_request_handler_context.e
diff --git a/library/server/request/rest/src/router/rest_request_router.e b/library/server/request/rest/src/rest_request_router.e
similarity index 100%
rename from library/server/request/rest/src/router/rest_request_router.e
rename to library/server/request/rest/src/rest_request_router.e
diff --git a/library/server/request/rest/src/default/rest_request_uri_handler.e b/library/server/request/rest/src/uri/rest_request_uri_handler.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_request_uri_handler.e
rename to library/server/request/rest/src/uri/rest_request_uri_handler.e
diff --git a/library/server/request/rest/src/context/rest_request_uri_handler_context.e b/library/server/request/rest/src/uri/rest_request_uri_handler_context.e
similarity index 100%
rename from library/server/request/rest/src/context/rest_request_uri_handler_context.e
rename to library/server/request/rest/src/uri/rest_request_uri_handler_context.e
diff --git a/library/server/request/rest/src/default/rest_request_uri_router.e b/library/server/request/rest/src/uri/rest_request_uri_router.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_request_uri_router.e
rename to library/server/request/rest/src/uri/rest_request_uri_router.e
diff --git a/library/server/request/rest/src/router/rest_request_uri_router_i.e b/library/server/request/rest/src/uri/rest_request_uri_router_i.e
similarity index 100%
rename from library/server/request/rest/src/router/rest_request_uri_router_i.e
rename to library/server/request/rest/src/uri/rest_request_uri_router_i.e
diff --git a/library/server/request/rest/src/uri/rest_request_uri_routing_handler.e b/library/server/request/rest/src/uri/rest_request_uri_routing_handler.e
new file mode 100644
index 00000000..374df903
--- /dev/null
+++ b/library/server/request/rest/src/uri/rest_request_uri_routing_handler.e
@@ -0,0 +1,33 @@
+note
+	description: "Summary description for {DEFAULT_REST_REQUEST_URI_ROUTING_HANDLER}."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	REST_REQUEST_URI_ROUTING_HANDLER
+
+inherit
+	REST_REQUEST_URI_ROUTING_HANDLER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT]
+		redefine
+			router
+		end
+
+create
+	make
+
+feature {NONE} -- Routing
+
+	router: REST_REQUEST_URI_ROUTER
+
+;note
+	copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+	source: "[
+			Eiffel Software
+			5949 Hollister Ave., Goleta, CA 93117 USA
+			Telephone 805-685-1006, Fax 805-685-6869
+			Website http://www.eiffel.com
+			Customer support http://support.eiffel.com
+		]"
+end
diff --git a/library/server/request/rest/src/handler/rest_request_uri_routing_handler_i.e b/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e
similarity index 100%
rename from library/server/request/rest/src/handler/rest_request_uri_routing_handler_i.e
rename to library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e
diff --git a/library/server/request/rest/src/default/rest_uri_application.e b/library/server/request/rest/src/uri/rest_uri_application.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_uri_application.e
rename to library/server/request/rest/src/uri/rest_uri_application.e
diff --git a/library/server/request/rest/src/default/rest_request_uri_template_handler.e b/library/server/request/rest/src/uri_template/rest_request_uri_template_handler.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_request_uri_template_handler.e
rename to library/server/request/rest/src/uri_template/rest_request_uri_template_handler.e
diff --git a/library/server/request/rest/src/context/rest_request_uri_template_handler_context.e b/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e
similarity index 100%
rename from library/server/request/rest/src/context/rest_request_uri_template_handler_context.e
rename to library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e
diff --git a/library/server/request/rest/src/default/rest_request_uri_template_router.e b/library/server/request/rest/src/uri_template/rest_request_uri_template_router.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_request_uri_template_router.e
rename to library/server/request/rest/src/uri_template/rest_request_uri_template_router.e
diff --git a/library/server/request/rest/src/router/rest_request_uri_template_router_i.e b/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e
similarity index 100%
rename from library/server/request/rest/src/router/rest_request_uri_template_router_i.e
rename to library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e
diff --git a/library/server/request/rest/src/default/rest_request_uri_template_routing_handler.e b/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_request_uri_template_routing_handler.e
rename to library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler.e
diff --git a/library/server/request/rest/src/handler/rest_request_uri_template_routing_handler_i.e b/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e
similarity index 100%
rename from library/server/request/rest/src/handler/rest_request_uri_template_routing_handler_i.e
rename to library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e
diff --git a/library/server/request/rest/src/default/rest_uri_template_application.e b/library/server/request/rest/src/uri_template/rest_uri_template_application.e
similarity index 100%
rename from library/server/request/rest/src/default/rest_uri_template_application.e
rename to library/server/request/rest/src/uri_template/rest_uri_template_application.e