diff --git a/library/server/request/rest/license.lic b/draft/library/server/request/rest/license.lic
similarity index 100%
rename from library/server/request/rest/license.lic
rename to draft/library/server/request/rest/license.lic
diff --git a/library/server/request/rest/rest-safe.ecf b/draft/library/server/request/rest/rest-safe.ecf
similarity index 100%
rename from library/server/request/rest/rest-safe.ecf
rename to draft/library/server/request/rest/rest-safe.ecf
diff --git a/library/server/request/rest/rest.ecf b/draft/library/server/request/rest/rest.ecf
similarity index 100%
rename from library/server/request/rest/rest.ecf
rename to draft/library/server/request/rest/rest.ecf
diff --git a/library/server/request/rest/src/contrib/doc/html/html_page.e b/draft/library/server/request/rest/src/contrib/doc/html/html_page.e
similarity index 100%
rename from library/server/request/rest/src/contrib/doc/html/html_page.e
rename to draft/library/server/request/rest/src/contrib/doc/html/html_page.e
diff --git a/library/server/request/rest/src/contrib/doc/html/html_page_head.e b/draft/library/server/request/rest/src/contrib/doc/html/html_page_head.e
similarity index 100%
rename from library/server/request/rest/src/contrib/doc/html/html_page_head.e
rename to draft/library/server/request/rest/src/contrib/doc/html/html_page_head.e
diff --git a/library/server/request/rest/src/contrib/doc/html/html_utilities.e b/draft/library/server/request/rest/src/contrib/doc/html/html_utilities.e
similarity index 100%
rename from library/server/request/rest/src/contrib/doc/html/html_utilities.e
rename to draft/library/server/request/rest/src/contrib/doc/html/html_utilities.e
diff --git a/library/server/request/rest/src/contrib/doc/rest_api_documentation.e b/draft/library/server/request/rest/src/contrib/doc/rest_api_documentation.e
similarity index 100%
rename from library/server/request/rest/src/contrib/doc/rest_api_documentation.e
rename to draft/library/server/request/rest/src/contrib/doc/rest_api_documentation.e
diff --git a/library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page.e b/draft/library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page.e
similarity index 100%
rename from library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page.e
rename to draft/library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page.e
diff --git a/library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page_head.e b/draft/library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page_head.e
similarity index 100%
rename from library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page_head.e
rename to draft/library/server/request/rest/src/contrib/doc/rest_api_documentation_html_page_head.e
diff --git a/library/server/request/rest/src/handler/rest_request_group_handler.e- b/draft/library/server/request/rest/src/handler/rest_request_group_handler.e-
similarity index 100%
rename from library/server/request/rest/src/handler/rest_request_group_handler.e-
rename to draft/library/server/request/rest/src/handler/rest_request_group_handler.e-
diff --git a/library/server/request/rest/src/response/rest_response.e b/draft/library/server/request/rest/src/response/rest_response.e
similarity index 100%
rename from library/server/request/rest/src/response/rest_response.e
rename to draft/library/server/request/rest/src/response/rest_response.e
diff --git a/library/server/request/rest/src/rest_request_agent_handler.e b/draft/library/server/request/rest/src/rest_request_agent_handler.e
similarity index 100%
rename from library/server/request/rest/src/rest_request_agent_handler.e
rename to draft/library/server/request/rest/src/rest_request_agent_handler.e
diff --git a/library/server/request/rest/src/rest_request_handler.e b/draft/library/server/request/rest/src/rest_request_handler.e
similarity index 100%
rename from library/server/request/rest/src/rest_request_handler.e
rename to draft/library/server/request/rest/src/rest_request_handler.e
diff --git a/library/server/request/rest/src/rest_request_handler_context.e b/draft/library/server/request/rest/src/rest_request_handler_context.e
similarity index 100%
rename from library/server/request/rest/src/rest_request_handler_context.e
rename to draft/library/server/request/rest/src/rest_request_handler_context.e
diff --git a/library/server/request/rest/src/rest_request_router.e b/draft/library/server/request/rest/src/rest_request_router.e
similarity index 100%
rename from library/server/request/rest/src/rest_request_router.e
rename to draft/library/server/request/rest/src/rest_request_router.e
diff --git a/library/server/request/rest/src/rest_service.e b/draft/library/server/request/rest/src/rest_service.e
similarity index 100%
rename from library/server/request/rest/src/rest_service.e
rename to draft/library/server/request/rest/src/rest_service.e
diff --git a/library/server/request/rest/src/rest_service_i.e b/draft/library/server/request/rest/src/rest_service_i.e
similarity index 100%
rename from library/server/request/rest/src/rest_service_i.e
rename to draft/library/server/request/rest/src/rest_service_i.e
diff --git a/library/server/request/rest/src/uri/rest_request_uri_handler.e b/draft/library/server/request/rest/src/uri/rest_request_uri_handler.e
similarity index 100%
rename from library/server/request/rest/src/uri/rest_request_uri_handler.e
rename to draft/library/server/request/rest/src/uri/rest_request_uri_handler.e
diff --git a/library/server/request/rest/src/uri/rest_request_uri_handler_context.e b/draft/library/server/request/rest/src/uri/rest_request_uri_handler_context.e
similarity index 100%
rename from library/server/request/rest/src/uri/rest_request_uri_handler_context.e
rename to draft/library/server/request/rest/src/uri/rest_request_uri_handler_context.e
diff --git a/library/server/request/rest/src/uri/rest_request_uri_router.e b/draft/library/server/request/rest/src/uri/rest_request_uri_router.e
similarity index 100%
rename from library/server/request/rest/src/uri/rest_request_uri_router.e
rename to draft/library/server/request/rest/src/uri/rest_request_uri_router.e
diff --git a/library/server/request/rest/src/uri/rest_request_uri_router_i.e b/draft/library/server/request/rest/src/uri/rest_request_uri_router_i.e
similarity index 100%
rename from library/server/request/rest/src/uri/rest_request_uri_router_i.e
rename to draft/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/draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler.e
similarity index 100%
rename from library/server/request/rest/src/uri/rest_request_uri_routing_handler.e
rename to draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler.e
diff --git a/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e b/draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e
similarity index 100%
rename from library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e
rename to draft/library/server/request/rest/src/uri/rest_request_uri_routing_handler_i.e
diff --git a/library/server/request/rest/src/uri/rest_uri_service.e b/draft/library/server/request/rest/src/uri/rest_uri_service.e
similarity index 100%
rename from library/server/request/rest/src/uri/rest_uri_service.e
rename to draft/library/server/request/rest/src/uri/rest_uri_service.e
diff --git a/library/server/request/rest/src/uri_template/rest_request_uri_template_handler.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler.e
similarity index 100%
rename from library/server/request/rest/src/uri_template/rest_request_uri_template_handler.e
rename to draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler.e
diff --git a/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e
similarity index 100%
rename from library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e
rename to draft/library/server/request/rest/src/uri_template/rest_request_uri_template_handler_context.e
diff --git a/library/server/request/rest/src/uri_template/rest_request_uri_template_router.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router.e
similarity index 100%
rename from library/server/request/rest/src/uri_template/rest_request_uri_template_router.e
rename to draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router.e
diff --git a/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e
similarity index 100%
rename from library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e
rename to draft/library/server/request/rest/src/uri_template/rest_request_uri_template_router_i.e
diff --git a/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler.e b/draft/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler.e
similarity index 100%
rename from library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler.e
rename to draft/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler.e
diff --git a/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e b/draft/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/uri_template/rest_request_uri_template_routing_handler_i.e
rename to draft/library/server/request/rest/src/uri_template/rest_request_uri_template_routing_handler_i.e
diff --git a/library/server/request/rest/src/uri_template/rest_uri_template_service.e b/draft/library/server/request/rest/src/uri_template/rest_uri_template_service.e
similarity index 100%
rename from library/server/request/rest/src/uri_template/rest_uri_template_service.e
rename to draft/library/server/request/rest/src/uri_template/rest_uri_template_service.e
diff --git a/library/server/request/rest/tests/htdocs/.htaccess b/draft/library/server/request/rest/tests/htdocs/.htaccess
similarity index 100%
rename from library/server/request/rest/tests/htdocs/.htaccess
rename to draft/library/server/request/rest/tests/htdocs/.htaccess
diff --git a/library/server/request/rest/tests/htdocs/README.txt b/draft/library/server/request/rest/tests/htdocs/README.txt
similarity index 100%
rename from library/server/request/rest/tests/htdocs/README.txt
rename to draft/library/server/request/rest/tests/htdocs/README.txt
diff --git a/library/server/request/rest/tests/htdocs/build.eant b/draft/library/server/request/rest/tests/htdocs/build.eant
similarity index 100%
rename from library/server/request/rest/tests/htdocs/build.eant
rename to draft/library/server/request/rest/tests/htdocs/build.eant
diff --git a/library/server/request/rest/tests/htdocs/htaccess b/draft/library/server/request/rest/tests/htdocs/htaccess
similarity index 100%
rename from library/server/request/rest/tests/htdocs/htaccess
rename to draft/library/server/request/rest/tests/htdocs/htaccess
diff --git a/library/server/request/rest/tests/htdocs/sample.eapp b/draft/library/server/request/rest/tests/htdocs/sample.eapp
similarity index 100%
rename from library/server/request/rest/tests/htdocs/sample.eapp
rename to draft/library/server/request/rest/tests/htdocs/sample.eapp
diff --git a/library/server/request/rest/tests/sample.ecf b/draft/library/server/request/rest/tests/sample.ecf
similarity index 100%
rename from library/server/request/rest/tests/sample.ecf
rename to draft/library/server/request/rest/tests/sample.ecf
diff --git a/library/server/request/rest/tests/src/app/app_account_verify_credential.e b/draft/library/server/request/rest/tests/src/app/app_account_verify_credential.e
similarity index 100%
rename from library/server/request/rest/tests/src/app/app_account_verify_credential.e
rename to draft/library/server/request/rest/tests/src/app/app_account_verify_credential.e
diff --git a/library/server/request/rest/tests/src/app/app_test.e b/draft/library/server/request/rest/tests/src/app/app_test.e
similarity index 100%
rename from library/server/request/rest/tests/src/app/app_test.e
rename to draft/library/server/request/rest/tests/src/app/app_test.e
diff --git a/library/server/request/rest/tests/src/app_server.e b/draft/library/server/request/rest/tests/src/app_server.e
similarity index 100%
rename from library/server/request/rest/tests/src/app_server.e
rename to draft/library/server/request/rest/tests/src/app_server.e
diff --git a/library/server/request/rest/tests/src/gateway/cgi/rest_service_gateway.e b/draft/library/server/request/rest/tests/src/gateway/cgi/rest_service_gateway.e
similarity index 100%
rename from library/server/request/rest/tests/src/gateway/cgi/rest_service_gateway.e
rename to draft/library/server/request/rest/tests/src/gateway/cgi/rest_service_gateway.e
diff --git a/library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e b/draft/library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e
similarity index 100%
rename from library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e
rename to draft/library/server/request/rest/tests/src/gateway/fcgi/rest_service_gateway.e
diff --git a/library/server/request/rest/tests/src/gateway/nino/rest_service_gateway.e b/draft/library/server/request/rest/tests/src/gateway/nino/rest_service_gateway.e
similarity index 100%
rename from library/server/request/rest/tests/src/gateway/nino/rest_service_gateway.e
rename to draft/library/server/request/rest/tests/src/gateway/nino/rest_service_gateway.e
diff --git a/library/server/request/rest/tests/src/handler/app_request_agent_handler.e b/draft/library/server/request/rest/tests/src/handler/app_request_agent_handler.e
similarity index 100%
rename from library/server/request/rest/tests/src/handler/app_request_agent_handler.e
rename to draft/library/server/request/rest/tests/src/handler/app_request_agent_handler.e
diff --git a/library/server/request/rest/tests/src/handler/app_request_handler.e b/draft/library/server/request/rest/tests/src/handler/app_request_handler.e
similarity index 100%
rename from library/server/request/rest/tests/src/handler/app_request_handler.e
rename to draft/library/server/request/rest/tests/src/handler/app_request_handler.e
diff --git a/library/server/request/rest/tests/src/handler/app_request_handler_context.e b/draft/library/server/request/rest/tests/src/handler/app_request_handler_context.e
similarity index 100%
rename from library/server/request/rest/tests/src/handler/app_request_handler_context.e
rename to draft/library/server/request/rest/tests/src/handler/app_request_handler_context.e
diff --git a/library/server/request/rest/tests/src/handler/app_request_helper.e b/draft/library/server/request/rest/tests/src/handler/app_request_helper.e
similarity index 100%
rename from library/server/request/rest/tests/src/handler/app_request_helper.e
rename to draft/library/server/request/rest/tests/src/handler/app_request_helper.e
diff --git a/library/server/request/rest/tests/src/handler/app_request_router.e b/draft/library/server/request/rest/tests/src/handler/app_request_router.e
similarity index 100%
rename from library/server/request/rest/tests/src/handler/app_request_router.e
rename to draft/library/server/request/rest/tests/src/handler/app_request_router.e
diff --git a/library/server/request/rest/tests/src/handler/app_request_routing_handler.e b/draft/library/server/request/rest/tests/src/handler/app_request_routing_handler.e
similarity index 100%
rename from library/server/request/rest/tests/src/handler/app_request_routing_handler.e
rename to draft/library/server/request/rest/tests/src/handler/app_request_routing_handler.e
diff --git a/library/server/request/rest/tests/src/handler/app_service.e b/draft/library/server/request/rest/tests/src/handler/app_service.e
similarity index 100%
rename from library/server/request/rest/tests/src/handler/app_service.e
rename to draft/library/server/request/rest/tests/src/handler/app_service.e