diff --git a/library/server/request/router/src/utility/request_format_utility.e b/library/server/request/router/src/misc/request_format_utility.e
similarity index 100%
rename from library/server/request/router/src/utility/request_format_utility.e
rename to library/server/request/router/src/misc/request_format_utility.e
diff --git a/library/server/request/router/src/helper/routed_application_helper.e b/library/server/request/router/src/misc/routed_application_helper.e
similarity index 100%
rename from library/server/request/router/src/helper/routed_application_helper.e
rename to library/server/request/router/src/misc/routed_application_helper.e
diff --git a/library/server/request/router/src/handler/request_agent_handler.e b/library/server/request/router/src/request_agent_handler.e
similarity index 100%
rename from library/server/request/router/src/handler/request_agent_handler.e
rename to library/server/request/router/src/request_agent_handler.e
diff --git a/library/server/request/router/src/handler/request_handler.e b/library/server/request/router/src/request_handler.e
similarity index 100%
rename from library/server/request/router/src/handler/request_handler.e
rename to library/server/request/router/src/request_handler.e
diff --git a/library/server/request/router/src/context/request_handler_context.e b/library/server/request/router/src/request_handler_context.e
similarity index 100%
rename from library/server/request/router/src/context/request_handler_context.e
rename to library/server/request/router/src/request_handler_context.e
diff --git a/library/server/request/router/src/router/request_router.e b/library/server/request/router/src/request_router.e
similarity index 100%
rename from library/server/request/router/src/router/request_router.e
rename to library/server/request/router/src/request_router.e
diff --git a/library/server/request/router/src/handler/request_routing_handler.e b/library/server/request/router/src/request_routing_handler.e
similarity index 100%
rename from library/server/request/router/src/handler/request_routing_handler.e
rename to library/server/request/router/src/request_routing_handler.e
diff --git a/library/server/request/router/src/application/routed_application.e b/library/server/request/router/src/routed_application.e
similarity index 100%
rename from library/server/request/router/src/application/routed_application.e
rename to library/server/request/router/src/routed_application.e
diff --git a/library/server/request/router/src/context/request_uri_handler_context.e b/library/server/request/router/src/uri/request_uri_handler_context.e
similarity index 100%
rename from library/server/request/router/src/context/request_uri_handler_context.e
rename to library/server/request/router/src/uri/request_uri_handler_context.e
diff --git a/library/server/request/router/src/router/request_uri_router.e b/library/server/request/router/src/uri/request_uri_router.e
similarity index 100%
rename from library/server/request/router/src/router/request_uri_router.e
rename to library/server/request/router/src/uri/request_uri_router.e
diff --git a/library/server/request/router/src/handler/request_uri_routing_handler.e b/library/server/request/router/src/uri/request_uri_routing_handler.e
similarity index 100%
rename from library/server/request/router/src/handler/request_uri_routing_handler.e
rename to library/server/request/router/src/uri/request_uri_routing_handler.e
diff --git a/library/server/request/router/src/context/request_uri_template_handler_context.e b/library/server/request/router/src/uri_template/request_uri_template_handler_context.e
similarity index 100%
rename from library/server/request/router/src/context/request_uri_template_handler_context.e
rename to library/server/request/router/src/uri_template/request_uri_template_handler_context.e
diff --git a/library/server/request/router/src/router/request_uri_template_router.e b/library/server/request/router/src/uri_template/request_uri_template_router.e
similarity index 100%
rename from library/server/request/router/src/router/request_uri_template_router.e
rename to library/server/request/router/src/uri_template/request_uri_template_router.e
diff --git a/library/server/request/router/src/handler/request_uri_template_routing_handler.e b/library/server/request/router/src/uri_template/request_uri_template_routing_handler.e
similarity index 100%
rename from library/server/request/router/src/handler/request_uri_template_routing_handler.e
rename to library/server/request/router/src/uri_template/request_uri_template_routing_handler.e