From db448001a16332fa35491397bd97f8535538b39f Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <jfiat@eiffel.com>
Date: Wed, 13 Jun 2012 22:32:17 +0200
Subject: [PATCH] Change structure of EWF, to follow better categorization

---
 .../library/server/request/rest/rest-safe.ecf |  4 +-
 draft/library/server/request/rest/rest.ecf    |  4 +-
 .../server/request/rest/tests/sample.ecf      |  2 +-
 examples/restbucksCRUD/client/client-safe.ecf |  2 +-
 examples/restbucksCRUD/client/client.ecf      |  2 +-
 examples/restbucksCRUD/restbucks-safe.ecf     |  4 +-
 examples/simple/simple.ecf                    |  2 +-
 examples/simple_file/service_file.ecf         |  2 +-
 examples/tutorial/step_4/hello/hello.ecf      |  6 +-
 examples/upload_image/upload_image-safe.ecf   |  4 +-
 library/library.index                         | 85 ++++++++++---------
 .../{client => network}/http_client/README.md |  0
 .../http_client/http_client-safe.ecf          |  0
 .../http_client/http_client.ecf               |  0
 .../http_client/license.lic                   |  0
 .../http_client/src/http_client.e             |  0
 .../http_client/src/http_client_constants.e   |  0
 .../http_client/src/http_client_request.e     |  0
 .../src/http_client_request_context.e         |  0
 .../http_client/src/http_client_response.e    |  0
 .../http_client/src/http_client_session.e     |  0
 .../spec/libcurl/libcurl_default_function.e   |  0
 .../src/spec/libcurl/libcurl_http_client.e    |  0
 .../libcurl/libcurl_http_client_request.e     |  0
 .../libcurl/libcurl_http_client_session.e     |  0
 .../libcurl_upload_file_read_function.e       |  0
 .../http_client/tests/test-safe.ecf           |  0
 .../http_client/tests/test.e                  |  0
 .../http_client/tests/test_http_client.e      |  0
 .../{ => network}/protocol/CONNEG/.gitignore  |  0
 .../{ => network}/protocol/CONNEG/README.md   |  0
 .../protocol/CONNEG/conneg-safe.ecf           |  0
 .../{ => network}/protocol/CONNEG/conneg.ecf  |  0
 .../{ => network}/protocol/CONNEG/license.lic |  0
 .../{ => network}/protocol/CONNEG/run_test.rb |  0
 .../protocol/CONNEG/src/.gitignore            |  0
 .../src/character_encoding_variant_results.e  |  0
 .../CONNEG/src/common_accept_header_parser.e  |  0
 .../protocol/CONNEG/src/common_results.e      |  0
 .../CONNEG/src/compression_variant_results.e  |  0
 .../protocol/CONNEG/src/conneg_server_side.e  |  0
 .../protocol/CONNEG/src/fitness_and_quality.e |  0
 .../protocol/CONNEG/src/language_parse.e      |  0
 .../protocol/CONNEG/src/language_results.e    |  0
 .../CONNEG/src/language_variant_results.e     |  0
 .../CONNEG/src/media_type_variant_results.e   |  0
 .../protocol/CONNEG/src/mime_parse.e          |  0
 .../protocol/CONNEG/src/parse_results.e       |  0
 .../protocol/CONNEG/src/shared_conneg.e       |  0
 .../protocol/CONNEG/src/variant_results.e     |  0
 .../protocol/CONNEG/test/.gitignore           |  0
 .../protocol/CONNEG/test/application.e        |  0
 .../test/common_accept_header_parser_test.e   |  0
 .../CONNEG/test/conneg_server_side_test.e     |  0
 .../CONNEG/test/language_parser_test.e        |  0
 .../protocol/CONNEG/test/mime_parser_test.e   |  0
 .../protocol/CONNEG/test/test-safe.ecf        |  0
 .../protocol/CONNEG/test/test.ecf             |  0
 .../protocol/CONNEG/test/test.rc              |  0
 library/{ => network}/protocol/http/README.md |  0
 .../{ => network}/protocol/http/http-safe.ecf |  0
 library/{ => network}/protocol/http/http.ecf  |  0
 .../protocol/http}/license.lic                |  0
 .../protocol/http/src/http_constants.e        |  0
 .../protocol/http/src/http_content_type.e     |  0
 .../http/src/http_date_time_utilities.e       |  0
 .../src/http_file_extension_mime_mapping.e    |  0
 .../protocol/http/src/http_format_constants.e |  0
 .../protocol/http/src/http_header.e           |  0
 .../protocol/http/src/http_header_names.e     |  0
 .../protocol/http/src/http_media_type.e       |  0
 .../protocol/http/src/http_mime_types.e       |  0
 .../http/src/http_request_method_constants.e  |  0
 .../protocol/http/src/http_request_methods.e  |  0
 .../protocol/http/src/http_status_code.e      |  0
 .../http/src/http_status_code_messages.e      |  0
 .../server/ewsgi/connectors/cgi/cgi-safe.ecf  |  2 +-
 library/server/ewsgi/connectors/cgi/cgi.ecf   |  2 +-
 .../ewsgi/connectors/libfcgi/libfcgi-safe.ecf |  2 +-
 .../ewsgi/connectors/libfcgi/libfcgi.ecf      |  2 +-
 .../ewsgi/connectors/nino/nino-safe.ecf       |  2 +-
 library/server/ewsgi/connectors/nino/nino.ecf |  2 +-
 .../ewsgi/connectors/null/null-safe.ecf       |  2 +-
 library/server/ewsgi/connectors/null/null.ecf |  2 +-
 library/server/ewsgi/ewsgi-safe.ecf           |  4 +-
 library/server/ewsgi/ewsgi.ecf                |  4 +-
 library/server/wsf/connector/all-safe.ecf     |  4 +-
 library/server/wsf/connector/cgi-safe.ecf     |  4 +-
 library/server/wsf/connector/cgi.ecf          |  4 +-
 library/server/wsf/connector/libfcgi-safe.ecf |  4 +-
 library/server/wsf/connector/libfcgi.ecf      |  4 +-
 library/server/wsf/connector/nino-safe.ecf    |  4 +-
 library/server/wsf/connector/nino.ecf         |  4 +-
 library/server/wsf/tests/tests-safe.ecf       |  4 +-
 library/server/wsf/tests/tests.ecf            |  4 +-
 library/server/wsf/wsf-safe.ecf               |  6 +-
 library/server/wsf/wsf.ecf                    |  6 +-
 .../wsf_extension/wsf_extension-safe.ecf      |  2 +-
 .../server/wsf_extension/wsf_extension.ecf    |  2 +-
 .../parser}/uri_template/README.md            |  0
 .../parser}/uri_template/doc/REAMDE.txt       |  0
 .../parser}/uri_template/doc/rfc6570.txt      |  0
 .../uri_template/doc/uritemplate-RFC6570      |  0
 .../parser/uri_template}/license.lic          |  0
 .../parser}/uri_template/src/uri_template.e   |  0
 .../uri_template/src/uri_template_constants.e |  0
 .../src/uri_template_expression.e             |  0
 .../src/uri_template_expression_variable.e    |  0
 .../uri_template/src/uri_template_handler.e   |  0
 .../src/uri_template_match_result.e           |  0
 .../uri_template/tests/test_uri_template.e    |  0
 .../tests/test_uri_template_draft.e           |  0
 .../tests/test_uri_template_matcher.e         |  0
 .../tests/test_uri_template_parser.e          |  0
 .../parser}/uri_template/tests/tests-safe.ecf |  0
 .../uri_template/uri_template-safe.ecf        |  2 +-
 .../parser}/uri_template/uri_template.ecf     |  2 +-
 .../general}/error/error-safe.ecf             |  0
 library/{ => utility/general}/error/error.ecf |  0
 .../general/error}/license.lic                |  0
 .../{ => utility/general}/error/src/error.e   |  0
 .../general}/error/src/error_custom.e         |  0
 .../general}/error/src/error_group.e          |  0
 .../general}/error/src/error_handler.e        |  0
 .../error/src/error_handler_with_event.e      |  0
 .../error/src/visitor/error_iterator.e        |  0
 .../error/src/visitor/error_null_visitor.e    |  0
 .../error/src/visitor/error_visitor.e         |  0
 .../src/visitor/file_output_error_visitor.e   |  0
 .../error/src/visitor/output_error_visitor.e  |  0
 .../src/visitor/text_output_error_visitor.e   |  0
 .../general}/error/tests/test_error.e         |  0
 .../general}/error/tests/tests-safe.ecf       |  0
 tests/dev/hello-safe.ecf                      |  2 +-
 134 files changed, 105 insertions(+), 94 deletions(-)
 rename library/{client => network}/http_client/README.md (100%)
 rename library/{client => network}/http_client/http_client-safe.ecf (100%)
 rename library/{client => network}/http_client/http_client.ecf (100%)
 rename library/{client => network}/http_client/license.lic (100%)
 rename library/{client => network}/http_client/src/http_client.e (100%)
 rename library/{client => network}/http_client/src/http_client_constants.e (100%)
 rename library/{client => network}/http_client/src/http_client_request.e (100%)
 rename library/{client => network}/http_client/src/http_client_request_context.e (100%)
 rename library/{client => network}/http_client/src/http_client_response.e (100%)
 rename library/{client => network}/http_client/src/http_client_session.e (100%)
 rename library/{client => network}/http_client/src/spec/libcurl/libcurl_default_function.e (100%)
 rename library/{client => network}/http_client/src/spec/libcurl/libcurl_http_client.e (100%)
 rename library/{client => network}/http_client/src/spec/libcurl/libcurl_http_client_request.e (100%)
 rename library/{client => network}/http_client/src/spec/libcurl/libcurl_http_client_session.e (100%)
 rename library/{client => network}/http_client/src/spec/libcurl/libcurl_upload_file_read_function.e (100%)
 rename library/{client => network}/http_client/tests/test-safe.ecf (100%)
 rename library/{client => network}/http_client/tests/test.e (100%)
 rename library/{client => network}/http_client/tests/test_http_client.e (100%)
 rename library/{ => network}/protocol/CONNEG/.gitignore (100%)
 rename library/{ => network}/protocol/CONNEG/README.md (100%)
 rename library/{ => network}/protocol/CONNEG/conneg-safe.ecf (100%)
 rename library/{ => network}/protocol/CONNEG/conneg.ecf (100%)
 rename library/{ => network}/protocol/CONNEG/license.lic (100%)
 rename library/{ => network}/protocol/CONNEG/run_test.rb (100%)
 rename library/{ => network}/protocol/CONNEG/src/.gitignore (100%)
 rename library/{ => network}/protocol/CONNEG/src/character_encoding_variant_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/common_accept_header_parser.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/common_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/compression_variant_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/conneg_server_side.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/fitness_and_quality.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/language_parse.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/language_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/language_variant_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/media_type_variant_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/mime_parse.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/parse_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/shared_conneg.e (100%)
 rename library/{ => network}/protocol/CONNEG/src/variant_results.e (100%)
 rename library/{ => network}/protocol/CONNEG/test/.gitignore (100%)
 rename library/{ => network}/protocol/CONNEG/test/application.e (100%)
 rename library/{ => network}/protocol/CONNEG/test/common_accept_header_parser_test.e (100%)
 rename library/{ => network}/protocol/CONNEG/test/conneg_server_side_test.e (100%)
 rename library/{ => network}/protocol/CONNEG/test/language_parser_test.e (100%)
 rename library/{ => network}/protocol/CONNEG/test/mime_parser_test.e (100%)
 rename library/{ => network}/protocol/CONNEG/test/test-safe.ecf (100%)
 rename library/{ => network}/protocol/CONNEG/test/test.ecf (100%)
 rename library/{ => network}/protocol/CONNEG/test/test.rc (100%)
 rename library/{ => network}/protocol/http/README.md (100%)
 rename library/{ => network}/protocol/http/http-safe.ecf (100%)
 rename library/{ => network}/protocol/http/http.ecf (100%)
 rename library/{error => network/protocol/http}/license.lic (100%)
 rename library/{ => network}/protocol/http/src/http_constants.e (100%)
 rename library/{ => network}/protocol/http/src/http_content_type.e (100%)
 rename library/{ => network}/protocol/http/src/http_date_time_utilities.e (100%)
 rename library/{ => network}/protocol/http/src/http_file_extension_mime_mapping.e (100%)
 rename library/{ => network}/protocol/http/src/http_format_constants.e (100%)
 rename library/{ => network}/protocol/http/src/http_header.e (100%)
 rename library/{ => network}/protocol/http/src/http_header_names.e (100%)
 rename library/{ => network}/protocol/http/src/http_media_type.e (100%)
 rename library/{ => network}/protocol/http/src/http_mime_types.e (100%)
 rename library/{ => network}/protocol/http/src/http_request_method_constants.e (100%)
 rename library/{ => network}/protocol/http/src/http_request_methods.e (100%)
 rename library/{ => network}/protocol/http/src/http_status_code.e (100%)
 rename library/{ => network}/protocol/http/src/http_status_code_messages.e (100%)
 rename library/{protocol => text/parser}/uri_template/README.md (100%)
 rename library/{protocol => text/parser}/uri_template/doc/REAMDE.txt (100%)
 rename library/{protocol => text/parser}/uri_template/doc/rfc6570.txt (100%)
 rename library/{protocol => text/parser}/uri_template/doc/uritemplate-RFC6570 (100%)
 rename library/{protocol/http => text/parser/uri_template}/license.lic (100%)
 rename library/{protocol => text/parser}/uri_template/src/uri_template.e (100%)
 rename library/{protocol => text/parser}/uri_template/src/uri_template_constants.e (100%)
 rename library/{protocol => text/parser}/uri_template/src/uri_template_expression.e (100%)
 rename library/{protocol => text/parser}/uri_template/src/uri_template_expression_variable.e (100%)
 rename library/{protocol => text/parser}/uri_template/src/uri_template_handler.e (100%)
 rename library/{protocol => text/parser}/uri_template/src/uri_template_match_result.e (100%)
 rename library/{protocol => text/parser}/uri_template/tests/test_uri_template.e (100%)
 rename library/{protocol => text/parser}/uri_template/tests/test_uri_template_draft.e (100%)
 rename library/{protocol => text/parser}/uri_template/tests/test_uri_template_matcher.e (100%)
 rename library/{protocol => text/parser}/uri_template/tests/test_uri_template_parser.e (100%)
 rename library/{protocol => text/parser}/uri_template/tests/tests-safe.ecf (100%)
 rename library/{protocol => text/parser}/uri_template/uri_template-safe.ecf (92%)
 rename library/{protocol => text/parser}/uri_template/uri_template.ecf (93%)
 rename library/{ => utility/general}/error/error-safe.ecf (100%)
 rename library/{ => utility/general}/error/error.ecf (100%)
 rename library/{protocol/uri_template => utility/general/error}/license.lic (100%)
 rename library/{ => utility/general}/error/src/error.e (100%)
 rename library/{ => utility/general}/error/src/error_custom.e (100%)
 rename library/{ => utility/general}/error/src/error_group.e (100%)
 rename library/{ => utility/general}/error/src/error_handler.e (100%)
 rename library/{ => utility/general}/error/src/error_handler_with_event.e (100%)
 rename library/{ => utility/general}/error/src/visitor/error_iterator.e (100%)
 rename library/{ => utility/general}/error/src/visitor/error_null_visitor.e (100%)
 rename library/{ => utility/general}/error/src/visitor/error_visitor.e (100%)
 rename library/{ => utility/general}/error/src/visitor/file_output_error_visitor.e (100%)
 rename library/{ => utility/general}/error/src/visitor/output_error_visitor.e (100%)
 rename library/{ => utility/general}/error/src/visitor/text_output_error_visitor.e (100%)
 rename library/{ => utility/general}/error/tests/test_error.e (100%)
 rename library/{ => utility/general}/error/tests/tests-safe.ecf (100%)

diff --git a/draft/library/server/request/rest/rest-safe.ecf b/draft/library/server/request/rest/rest-safe.ecf
index b7463177..9d0055a8 100644
--- a/draft/library/server/request/rest/rest-safe.ecf
+++ b/draft/library/server/request/rest/rest-safe.ecf
@@ -12,8 +12,8 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 		<library name="wsf_extension" location="..\..\..\..\..\library\server\wsf_extension\wsf_extension-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\..\library\protocol\http\http-safe.ecf"/>
-		<library name="uri_template" location="..\..\..\..\..\library\protocol\uri_template\uri_template-safe.ecf"/>
+		<library name="http" location="../../../../../library/network/protocol/http/http-safe.ecf"/>
+		<library name="uri_template" location="../../../../../library/text/parser/uri_template/uri_template-safe.ecf"/>
 		<cluster name="contrib" location=".\src\contrib\" recursive="true">
 			<file_rule>
 				<exclude>/html$</exclude>
diff --git a/draft/library/server/request/rest/rest.ecf b/draft/library/server/request/rest/rest.ecf
index b876c63a..5f74326c 100644
--- a/draft/library/server/request/rest/rest.ecf
+++ b/draft/library/server/request/rest/rest.ecf
@@ -11,8 +11,8 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="wsf" location="..\..\..\..\..\library\server\wsf\wsf.ecf"/>
 		<library name="wsf_extension" location="..\..\..\..\..\library\server\wsf_extension\wsf_extension.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\..\library\protocol\http\http.ecf"/>
-		<library name="uri_template" location="..\..\..\..\..\library\protocol\uri_template\uri_template.ecf"/>
+		<library name="http" location="../../../../../library/network/protocol/http/http.ecf"/>
+		<library name="uri_template" location="../../../../../library/text/parser/uri_template/uri_template.ecf"/>
 		<cluster name="contrib" location=".\src\contrib\" recursive="true">
 			<file_rule>
 				<exclude>/html$</exclude>
diff --git a/draft/library/server/request/rest/tests/sample.ecf b/draft/library/server/request/rest/tests/sample.ecf
index f9640b61..04b6e489 100644
--- a/draft/library/server/request/rest/tests/sample.ecf
+++ b/draft/library/server/request/rest/tests/sample.ecf
@@ -13,7 +13,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="rest" location="..\rest-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
+		<library name="http" location="../../../../../../library/network/protocol/http/http-safe.ecf" readonly="false"/>
 	</target>
 	<target name="sample_fcgi" extends="common">
 		<root class="APP_SERVER" feature="make"/>
diff --git a/examples/restbucksCRUD/client/client-safe.ecf b/examples/restbucksCRUD/client/client-safe.ecf
index 63589edf..ed09ae8f 100644
--- a/examples/restbucksCRUD/client/client-safe.ecf
+++ b/examples/restbucksCRUD/client/client-safe.ecf
@@ -11,7 +11,7 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="http_client" location="..\..\..\library\client\http_client\http_client-safe.ecf" readonly="false"/>
+		<library name="http_client" location="../../../library/network/http_client/http_client-safe.ecf" readonly="false"/>
 		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
diff --git a/examples/restbucksCRUD/client/client.ecf b/examples/restbucksCRUD/client/client.ecf
index 8dd66985..867e1b93 100644
--- a/examples/restbucksCRUD/client/client.ecf
+++ b/examples/restbucksCRUD/client/client.ecf
@@ -10,7 +10,7 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
 		<setting name="concurrency" value="thread"/>
-		<library name="http_client" location="..\..\..\library\client\http_client\http_client.ecf"/>
+		<library name="http_client" location="../../../library/network/http_client/http_client.ecf"/>
 		<library name="json" location="..\..\..\contrib\library\text\parser\json\library\json.ecf" readonly="false"/>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY/library/thread/thread.ecf"/>
diff --git a/examples/restbucksCRUD/restbucks-safe.ecf b/examples/restbucksCRUD/restbucks-safe.ecf
index 626e87d9..cd30f6bb 100644
--- a/examples/restbucksCRUD/restbucks-safe.ecf
+++ b/examples/restbucksCRUD/restbucks-safe.ecf
@@ -21,9 +21,9 @@
 		<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
 		<library name="eel" location="..\..\library\crypto\eel\eel-safe.ecf" readonly="false"/>
 		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
+		<library name="http" location="../../library/network/protocol/http/http-safe.ecf" readonly="false"/>
 		<library name="json" location="..\..\contrib\library\text\parser\json\library\json-safe.ecf" readonly="false"/>
-		<library name="uri_template" location="..\..\library\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
+		<library name="uri_template" location="../../library/text/parser/uri_template/uri_template-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 		<library name="wsf_extension" location="..\..\library\server\wsf_extension\wsf_extension-safe.ecf" readonly="false"/>
 		<cluster name="src" location="src\" recursive="true"/>
diff --git a/examples/simple/simple.ecf b/examples/simple/simple.ecf
index 6dc064b9..e0c8c499 100644
--- a/examples/simple/simple.ecf
+++ b/examples/simple/simple.ecf
@@ -11,7 +11,7 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="http" location="..\..\library\protocol\http\http-safe.ecf"/>
+		<library name="http" location="../../library/network/protocol/http/http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 	</target>
 
diff --git a/examples/simple_file/service_file.ecf b/examples/simple_file/service_file.ecf
index 8667fb2d..b6920e7e 100644
--- a/examples/simple_file/service_file.ecf
+++ b/examples/simple_file/service_file.ecf
@@ -8,7 +8,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="connector_nino" location="..\..\library\server\ewsgi\connectors\nino\nino-safe.ecf"/>
 		<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf"/>
-		<library name="http" location="..\..\library\protocol\http\http-safe.ecf"/>
+		<library name="http" location="../../library/network/protocol/http/http-safe.ecf"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf"/>
 		<cluster name="service_file" location=".\" recursive="true">
 			<file_rule>
diff --git a/examples/tutorial/step_4/hello/hello.ecf b/examples/tutorial/step_4/hello/hello.ecf
index 9a69655b..a8be82e8 100644
--- a/examples/tutorial/step_4/hello/hello.ecf
+++ b/examples/tutorial/step_4/hello/hello.ecf
@@ -11,12 +11,14 @@
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
-		 <precompile name="precomp_wsf-mt" location="..\..\..\..\precomp\wsf-mt-safe.ecf"/>
+		<!--
+		<precompile name="precomp_wsf-mt" location="..\..\..\..\precomp\wsf-mt-safe.ecf"/>
+		-->
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="default_nino" location="..\..\..\..\library\server\wsf\default\nino-safe.ecf"/>
 		<library name="encoder" location="..\..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
+		<library name="http" location="../../../../library/network/protocol/http/http-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/examples/upload_image/upload_image-safe.ecf b/examples/upload_image/upload_image-safe.ecf
index 8906381f..8c5ebf9d 100644
--- a/examples/upload_image/upload_image-safe.ecf
+++ b/examples/upload_image/upload_image-safe.ecf
@@ -20,10 +20,10 @@
 		</library>
 		<library name="default_nino" location="..\..\library\server\wsf\default\nino-safe.ecf" readonly="false" use_application_options="true"/>
 		<library name="encoder" location="..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
+		<library name="http" location="../../library/network/protocol/http/http-safe.ecf" readonly="false"/>
 		<library name="router" location="..\..\library\server\request\router\router-safe.ecf" readonly="false"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
-		<library name="uri_template" location="..\..\library\protocol\uri_template\uri_template-safe.ecf" readonly="false"/>
+		<library name="uri_template" location="../../library/text/parser/uri_template/uri_template-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false" use_application_options="true"/>
 		<cluster name="src" location="src\" recursive="true">
 		</cluster>
diff --git a/library/library.index b/library/library.index
index 5b8807f3..fbc1ac0e 100644
--- a/library/library.index
+++ b/library/library.index
@@ -1,42 +1,51 @@
  
 # Available libraries.  
   
-http_client-safe : c:\_dev\Dev-Process\web-framework\library\client\http_client\http_client-safe.ecf  
-http_client : c:\_dev\Dev-Process\web-framework\library\client\http_client\http_client.ecf  
-eapml-safe : c:\_dev\Dev-Process\web-framework\library\crypto\eapml\eapml-safe.ecf  
-eapml : c:\_dev\Dev-Process\web-framework\library\crypto\eapml\eapml.ecf  
-eel-safe : c:\_dev\Dev-Process\web-framework\library\crypto\eel\eel-safe.ecf  
-eel : c:\_dev\Dev-Process\web-framework\library\crypto\eel\eel.ecf  
-error-safe : c:\_dev\Dev-Process\web-framework\library\error\error-safe.ecf  
-error : c:\_dev\Dev-Process\web-framework\library\error\error.ecf  
-conneg-safe : c:\_dev\Dev-Process\web-framework\library\protocol\CONNEG\conneg-safe.ecf  
-conneg : c:\_dev\Dev-Process\web-framework\library\protocol\CONNEG\conneg.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  
-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  
-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  
-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  
-libfcgi : c:\_dev\Dev-Process\web-framework\library\server\libfcgi\libfcgi.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  
-libfcgi-safe : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\libfcgi-safe.ecf  
-libfcgi : c:\_dev\Dev-Process\web-framework\library\server\wsf\default\libfcgi.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  
+http_client-safe : c:\_dev\EWF\EWF-dev\library\network\http_client\http_client-safe.ecf  
+http_client : c:\_dev\EWF\EWF-dev\library\network\http_client\http_client.ecf  
+conneg-safe : c:\_dev\EWF\EWF-dev\library\network\protocol\CONNEG\conneg-safe.ecf  
+conneg : c:\_dev\EWF\EWF-dev\library\network\protocol\CONNEG\conneg.ecf  
+http-safe : c:\_dev\EWF\EWF-dev\library\network\protocol\http\http-safe.ecf  
+http : c:\_dev\EWF\EWF-dev\library\network\protocol\http\http.ecf  
+http_authorization-safe : c:\_dev\EWF\EWF-dev\library\server\authentication\http_authorization\http_authorization-safe.ecf  
+http_authorization : c:\_dev\EWF\EWF-dev\library\server\authentication\http_authorization\http_authorization.ecf  
+ewsgi-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi-safe.ecf  
+ewsgi : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi.ecf  
+ewsgi_spec-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi_spec-safe.ecf  
+ewsgi_spec : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi_spec.ecf  
+cgi-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\cgi\cgi-safe.ecf  
+cgi : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\cgi\cgi.ecf  
+libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf  
+libfcgi : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\libfcgi\libfcgi.ecf  
+nino-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\nino\nino-safe.ecf  
+nino : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\nino\nino.ecf  
+null-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\null\null-safe.ecf  
+null : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\null\null.ecf  
+fcgi-safe : c:\_dev\EWF\EWF-dev\library\server\libfcgi\fcgi-safe.ecf  
+fcgi : c:\_dev\EWF\EWF-dev\library\server\libfcgi\fcgi.ecf  
+libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\libfcgi\libfcgi-safe.ecf  
+libfcgi : c:\_dev\EWF\EWF-dev\library\server\libfcgi\libfcgi.ecf  
+router-safe : c:\_dev\EWF\EWF-dev\library\server\request\router\router-safe.ecf  
+router : c:\_dev\EWF\EWF-dev\library\server\request\router\router.ecf  
+wsf-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\wsf-safe.ecf  
+wsf : c:\_dev\EWF\EWF-dev\library\server\wsf\wsf.ecf  
+all-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\all-safe.ecf  
+cgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\cgi-safe.ecf  
+cgi : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\cgi.ecf  
+libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\libfcgi-safe.ecf  
+libfcgi : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\libfcgi.ecf  
+nino-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\nino-safe.ecf  
+nino : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\nino.ecf  
+cgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\default\cgi-safe.ecf  
+cgi : c:\_dev\EWF\EWF-dev\library\server\wsf\default\cgi.ecf  
+libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\default\libfcgi-safe.ecf  
+libfcgi : c:\_dev\EWF\EWF-dev\library\server\wsf\default\libfcgi.ecf  
+nino-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\default\nino-safe.ecf  
+nino : c:\_dev\EWF\EWF-dev\library\server\wsf\default\nino.ecf  
+wsf_extension-safe : c:\_dev\EWF\EWF-dev\library\server\wsf_extension\wsf_extension-safe.ecf  
+wsf_extension : c:\_dev\EWF\EWF-dev\library\server\wsf_extension\wsf_extension.ecf  
+encoder-safe : c:\_dev\EWF\EWF-dev\library\text\encoder\encoder-safe.ecf  
+encoder : c:\_dev\EWF\EWF-dev\library\text\encoder\encoder.ecf  
+error-safe : c:\_dev\EWF\EWF-dev\library\utility\general\error\error-safe.ecf  
+error : c:\_dev\EWF\EWF-dev\library\utility\general\error\error.ecf  
   
diff --git a/library/client/http_client/README.md b/library/network/http_client/README.md
similarity index 100%
rename from library/client/http_client/README.md
rename to library/network/http_client/README.md
diff --git a/library/client/http_client/http_client-safe.ecf b/library/network/http_client/http_client-safe.ecf
similarity index 100%
rename from library/client/http_client/http_client-safe.ecf
rename to library/network/http_client/http_client-safe.ecf
diff --git a/library/client/http_client/http_client.ecf b/library/network/http_client/http_client.ecf
similarity index 100%
rename from library/client/http_client/http_client.ecf
rename to library/network/http_client/http_client.ecf
diff --git a/library/client/http_client/license.lic b/library/network/http_client/license.lic
similarity index 100%
rename from library/client/http_client/license.lic
rename to library/network/http_client/license.lic
diff --git a/library/client/http_client/src/http_client.e b/library/network/http_client/src/http_client.e
similarity index 100%
rename from library/client/http_client/src/http_client.e
rename to library/network/http_client/src/http_client.e
diff --git a/library/client/http_client/src/http_client_constants.e b/library/network/http_client/src/http_client_constants.e
similarity index 100%
rename from library/client/http_client/src/http_client_constants.e
rename to library/network/http_client/src/http_client_constants.e
diff --git a/library/client/http_client/src/http_client_request.e b/library/network/http_client/src/http_client_request.e
similarity index 100%
rename from library/client/http_client/src/http_client_request.e
rename to library/network/http_client/src/http_client_request.e
diff --git a/library/client/http_client/src/http_client_request_context.e b/library/network/http_client/src/http_client_request_context.e
similarity index 100%
rename from library/client/http_client/src/http_client_request_context.e
rename to library/network/http_client/src/http_client_request_context.e
diff --git a/library/client/http_client/src/http_client_response.e b/library/network/http_client/src/http_client_response.e
similarity index 100%
rename from library/client/http_client/src/http_client_response.e
rename to library/network/http_client/src/http_client_response.e
diff --git a/library/client/http_client/src/http_client_session.e b/library/network/http_client/src/http_client_session.e
similarity index 100%
rename from library/client/http_client/src/http_client_session.e
rename to library/network/http_client/src/http_client_session.e
diff --git a/library/client/http_client/src/spec/libcurl/libcurl_default_function.e b/library/network/http_client/src/spec/libcurl/libcurl_default_function.e
similarity index 100%
rename from library/client/http_client/src/spec/libcurl/libcurl_default_function.e
rename to library/network/http_client/src/spec/libcurl/libcurl_default_function.e
diff --git a/library/client/http_client/src/spec/libcurl/libcurl_http_client.e b/library/network/http_client/src/spec/libcurl/libcurl_http_client.e
similarity index 100%
rename from library/client/http_client/src/spec/libcurl/libcurl_http_client.e
rename to library/network/http_client/src/spec/libcurl/libcurl_http_client.e
diff --git a/library/client/http_client/src/spec/libcurl/libcurl_http_client_request.e b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
similarity index 100%
rename from library/client/http_client/src/spec/libcurl/libcurl_http_client_request.e
rename to library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
diff --git a/library/client/http_client/src/spec/libcurl/libcurl_http_client_session.e b/library/network/http_client/src/spec/libcurl/libcurl_http_client_session.e
similarity index 100%
rename from library/client/http_client/src/spec/libcurl/libcurl_http_client_session.e
rename to library/network/http_client/src/spec/libcurl/libcurl_http_client_session.e
diff --git a/library/client/http_client/src/spec/libcurl/libcurl_upload_file_read_function.e b/library/network/http_client/src/spec/libcurl/libcurl_upload_file_read_function.e
similarity index 100%
rename from library/client/http_client/src/spec/libcurl/libcurl_upload_file_read_function.e
rename to library/network/http_client/src/spec/libcurl/libcurl_upload_file_read_function.e
diff --git a/library/client/http_client/tests/test-safe.ecf b/library/network/http_client/tests/test-safe.ecf
similarity index 100%
rename from library/client/http_client/tests/test-safe.ecf
rename to library/network/http_client/tests/test-safe.ecf
diff --git a/library/client/http_client/tests/test.e b/library/network/http_client/tests/test.e
similarity index 100%
rename from library/client/http_client/tests/test.e
rename to library/network/http_client/tests/test.e
diff --git a/library/client/http_client/tests/test_http_client.e b/library/network/http_client/tests/test_http_client.e
similarity index 100%
rename from library/client/http_client/tests/test_http_client.e
rename to library/network/http_client/tests/test_http_client.e
diff --git a/library/protocol/CONNEG/.gitignore b/library/network/protocol/CONNEG/.gitignore
similarity index 100%
rename from library/protocol/CONNEG/.gitignore
rename to library/network/protocol/CONNEG/.gitignore
diff --git a/library/protocol/CONNEG/README.md b/library/network/protocol/CONNEG/README.md
similarity index 100%
rename from library/protocol/CONNEG/README.md
rename to library/network/protocol/CONNEG/README.md
diff --git a/library/protocol/CONNEG/conneg-safe.ecf b/library/network/protocol/CONNEG/conneg-safe.ecf
similarity index 100%
rename from library/protocol/CONNEG/conneg-safe.ecf
rename to library/network/protocol/CONNEG/conneg-safe.ecf
diff --git a/library/protocol/CONNEG/conneg.ecf b/library/network/protocol/CONNEG/conneg.ecf
similarity index 100%
rename from library/protocol/CONNEG/conneg.ecf
rename to library/network/protocol/CONNEG/conneg.ecf
diff --git a/library/protocol/CONNEG/license.lic b/library/network/protocol/CONNEG/license.lic
similarity index 100%
rename from library/protocol/CONNEG/license.lic
rename to library/network/protocol/CONNEG/license.lic
diff --git a/library/protocol/CONNEG/run_test.rb b/library/network/protocol/CONNEG/run_test.rb
similarity index 100%
rename from library/protocol/CONNEG/run_test.rb
rename to library/network/protocol/CONNEG/run_test.rb
diff --git a/library/protocol/CONNEG/src/.gitignore b/library/network/protocol/CONNEG/src/.gitignore
similarity index 100%
rename from library/protocol/CONNEG/src/.gitignore
rename to library/network/protocol/CONNEG/src/.gitignore
diff --git a/library/protocol/CONNEG/src/character_encoding_variant_results.e b/library/network/protocol/CONNEG/src/character_encoding_variant_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/character_encoding_variant_results.e
rename to library/network/protocol/CONNEG/src/character_encoding_variant_results.e
diff --git a/library/protocol/CONNEG/src/common_accept_header_parser.e b/library/network/protocol/CONNEG/src/common_accept_header_parser.e
similarity index 100%
rename from library/protocol/CONNEG/src/common_accept_header_parser.e
rename to library/network/protocol/CONNEG/src/common_accept_header_parser.e
diff --git a/library/protocol/CONNEG/src/common_results.e b/library/network/protocol/CONNEG/src/common_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/common_results.e
rename to library/network/protocol/CONNEG/src/common_results.e
diff --git a/library/protocol/CONNEG/src/compression_variant_results.e b/library/network/protocol/CONNEG/src/compression_variant_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/compression_variant_results.e
rename to library/network/protocol/CONNEG/src/compression_variant_results.e
diff --git a/library/protocol/CONNEG/src/conneg_server_side.e b/library/network/protocol/CONNEG/src/conneg_server_side.e
similarity index 100%
rename from library/protocol/CONNEG/src/conneg_server_side.e
rename to library/network/protocol/CONNEG/src/conneg_server_side.e
diff --git a/library/protocol/CONNEG/src/fitness_and_quality.e b/library/network/protocol/CONNEG/src/fitness_and_quality.e
similarity index 100%
rename from library/protocol/CONNEG/src/fitness_and_quality.e
rename to library/network/protocol/CONNEG/src/fitness_and_quality.e
diff --git a/library/protocol/CONNEG/src/language_parse.e b/library/network/protocol/CONNEG/src/language_parse.e
similarity index 100%
rename from library/protocol/CONNEG/src/language_parse.e
rename to library/network/protocol/CONNEG/src/language_parse.e
diff --git a/library/protocol/CONNEG/src/language_results.e b/library/network/protocol/CONNEG/src/language_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/language_results.e
rename to library/network/protocol/CONNEG/src/language_results.e
diff --git a/library/protocol/CONNEG/src/language_variant_results.e b/library/network/protocol/CONNEG/src/language_variant_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/language_variant_results.e
rename to library/network/protocol/CONNEG/src/language_variant_results.e
diff --git a/library/protocol/CONNEG/src/media_type_variant_results.e b/library/network/protocol/CONNEG/src/media_type_variant_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/media_type_variant_results.e
rename to library/network/protocol/CONNEG/src/media_type_variant_results.e
diff --git a/library/protocol/CONNEG/src/mime_parse.e b/library/network/protocol/CONNEG/src/mime_parse.e
similarity index 100%
rename from library/protocol/CONNEG/src/mime_parse.e
rename to library/network/protocol/CONNEG/src/mime_parse.e
diff --git a/library/protocol/CONNEG/src/parse_results.e b/library/network/protocol/CONNEG/src/parse_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/parse_results.e
rename to library/network/protocol/CONNEG/src/parse_results.e
diff --git a/library/protocol/CONNEG/src/shared_conneg.e b/library/network/protocol/CONNEG/src/shared_conneg.e
similarity index 100%
rename from library/protocol/CONNEG/src/shared_conneg.e
rename to library/network/protocol/CONNEG/src/shared_conneg.e
diff --git a/library/protocol/CONNEG/src/variant_results.e b/library/network/protocol/CONNEG/src/variant_results.e
similarity index 100%
rename from library/protocol/CONNEG/src/variant_results.e
rename to library/network/protocol/CONNEG/src/variant_results.e
diff --git a/library/protocol/CONNEG/test/.gitignore b/library/network/protocol/CONNEG/test/.gitignore
similarity index 100%
rename from library/protocol/CONNEG/test/.gitignore
rename to library/network/protocol/CONNEG/test/.gitignore
diff --git a/library/protocol/CONNEG/test/application.e b/library/network/protocol/CONNEG/test/application.e
similarity index 100%
rename from library/protocol/CONNEG/test/application.e
rename to library/network/protocol/CONNEG/test/application.e
diff --git a/library/protocol/CONNEG/test/common_accept_header_parser_test.e b/library/network/protocol/CONNEG/test/common_accept_header_parser_test.e
similarity index 100%
rename from library/protocol/CONNEG/test/common_accept_header_parser_test.e
rename to library/network/protocol/CONNEG/test/common_accept_header_parser_test.e
diff --git a/library/protocol/CONNEG/test/conneg_server_side_test.e b/library/network/protocol/CONNEG/test/conneg_server_side_test.e
similarity index 100%
rename from library/protocol/CONNEG/test/conneg_server_side_test.e
rename to library/network/protocol/CONNEG/test/conneg_server_side_test.e
diff --git a/library/protocol/CONNEG/test/language_parser_test.e b/library/network/protocol/CONNEG/test/language_parser_test.e
similarity index 100%
rename from library/protocol/CONNEG/test/language_parser_test.e
rename to library/network/protocol/CONNEG/test/language_parser_test.e
diff --git a/library/protocol/CONNEG/test/mime_parser_test.e b/library/network/protocol/CONNEG/test/mime_parser_test.e
similarity index 100%
rename from library/protocol/CONNEG/test/mime_parser_test.e
rename to library/network/protocol/CONNEG/test/mime_parser_test.e
diff --git a/library/protocol/CONNEG/test/test-safe.ecf b/library/network/protocol/CONNEG/test/test-safe.ecf
similarity index 100%
rename from library/protocol/CONNEG/test/test-safe.ecf
rename to library/network/protocol/CONNEG/test/test-safe.ecf
diff --git a/library/protocol/CONNEG/test/test.ecf b/library/network/protocol/CONNEG/test/test.ecf
similarity index 100%
rename from library/protocol/CONNEG/test/test.ecf
rename to library/network/protocol/CONNEG/test/test.ecf
diff --git a/library/protocol/CONNEG/test/test.rc b/library/network/protocol/CONNEG/test/test.rc
similarity index 100%
rename from library/protocol/CONNEG/test/test.rc
rename to library/network/protocol/CONNEG/test/test.rc
diff --git a/library/protocol/http/README.md b/library/network/protocol/http/README.md
similarity index 100%
rename from library/protocol/http/README.md
rename to library/network/protocol/http/README.md
diff --git a/library/protocol/http/http-safe.ecf b/library/network/protocol/http/http-safe.ecf
similarity index 100%
rename from library/protocol/http/http-safe.ecf
rename to library/network/protocol/http/http-safe.ecf
diff --git a/library/protocol/http/http.ecf b/library/network/protocol/http/http.ecf
similarity index 100%
rename from library/protocol/http/http.ecf
rename to library/network/protocol/http/http.ecf
diff --git a/library/error/license.lic b/library/network/protocol/http/license.lic
similarity index 100%
rename from library/error/license.lic
rename to library/network/protocol/http/license.lic
diff --git a/library/protocol/http/src/http_constants.e b/library/network/protocol/http/src/http_constants.e
similarity index 100%
rename from library/protocol/http/src/http_constants.e
rename to library/network/protocol/http/src/http_constants.e
diff --git a/library/protocol/http/src/http_content_type.e b/library/network/protocol/http/src/http_content_type.e
similarity index 100%
rename from library/protocol/http/src/http_content_type.e
rename to library/network/protocol/http/src/http_content_type.e
diff --git a/library/protocol/http/src/http_date_time_utilities.e b/library/network/protocol/http/src/http_date_time_utilities.e
similarity index 100%
rename from library/protocol/http/src/http_date_time_utilities.e
rename to library/network/protocol/http/src/http_date_time_utilities.e
diff --git a/library/protocol/http/src/http_file_extension_mime_mapping.e b/library/network/protocol/http/src/http_file_extension_mime_mapping.e
similarity index 100%
rename from library/protocol/http/src/http_file_extension_mime_mapping.e
rename to library/network/protocol/http/src/http_file_extension_mime_mapping.e
diff --git a/library/protocol/http/src/http_format_constants.e b/library/network/protocol/http/src/http_format_constants.e
similarity index 100%
rename from library/protocol/http/src/http_format_constants.e
rename to library/network/protocol/http/src/http_format_constants.e
diff --git a/library/protocol/http/src/http_header.e b/library/network/protocol/http/src/http_header.e
similarity index 100%
rename from library/protocol/http/src/http_header.e
rename to library/network/protocol/http/src/http_header.e
diff --git a/library/protocol/http/src/http_header_names.e b/library/network/protocol/http/src/http_header_names.e
similarity index 100%
rename from library/protocol/http/src/http_header_names.e
rename to library/network/protocol/http/src/http_header_names.e
diff --git a/library/protocol/http/src/http_media_type.e b/library/network/protocol/http/src/http_media_type.e
similarity index 100%
rename from library/protocol/http/src/http_media_type.e
rename to library/network/protocol/http/src/http_media_type.e
diff --git a/library/protocol/http/src/http_mime_types.e b/library/network/protocol/http/src/http_mime_types.e
similarity index 100%
rename from library/protocol/http/src/http_mime_types.e
rename to library/network/protocol/http/src/http_mime_types.e
diff --git a/library/protocol/http/src/http_request_method_constants.e b/library/network/protocol/http/src/http_request_method_constants.e
similarity index 100%
rename from library/protocol/http/src/http_request_method_constants.e
rename to library/network/protocol/http/src/http_request_method_constants.e
diff --git a/library/protocol/http/src/http_request_methods.e b/library/network/protocol/http/src/http_request_methods.e
similarity index 100%
rename from library/protocol/http/src/http_request_methods.e
rename to library/network/protocol/http/src/http_request_methods.e
diff --git a/library/protocol/http/src/http_status_code.e b/library/network/protocol/http/src/http_status_code.e
similarity index 100%
rename from library/protocol/http/src/http_status_code.e
rename to library/network/protocol/http/src/http_status_code.e
diff --git a/library/protocol/http/src/http_status_code_messages.e b/library/network/protocol/http/src/http_status_code_messages.e
similarity index 100%
rename from library/protocol/http/src/http_status_code_messages.e
rename to library/network/protocol/http/src/http_status_code_messages.e
diff --git a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
index 512dd955..9ad9cd54 100644
--- a/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
+++ b/library/server/ewsgi/connectors/cgi/cgi-safe.ecf
@@ -11,7 +11,7 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/connectors/cgi/cgi.ecf b/library/server/ewsgi/connectors/cgi/cgi.ecf
index d6c265ec..c8df2ee7 100644
--- a/library/server/ewsgi/connectors/cgi/cgi.ecf
+++ b/library/server/ewsgi/connectors/cgi/cgi.ecf
@@ -11,7 +11,7 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\protocol\http\http.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf b/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
index cc3d47bc..48582c1c 100644
--- a/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
+++ b/library/server/ewsgi/connectors/libfcgi/libfcgi-safe.ecf
@@ -12,7 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf"/>
 		<library name="libfcgi" location="..\..\..\libfcgi\libfcgi-safe.ecf"/>
-		<library name="http" location="..\..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf b/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
index bf084003..a95e88d0 100644
--- a/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
+++ b/library/server/ewsgi/connectors/libfcgi/libfcgi.ecf
@@ -12,7 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
 		<library name="libfcgi" location="..\..\..\libfcgi\libfcgi.ecf" />
-		<library name="http" location="..\..\..\..\protocol\http\http.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http.ecf"/>
 		<cluster name="src" location=".\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/connectors/nino/nino-safe.ecf b/library/server/ewsgi/connectors/nino/nino-safe.ecf
index 7926cb48..eb4b8aa3 100644
--- a/library/server/ewsgi/connectors/nino/nino-safe.ecf
+++ b/library/server/ewsgi/connectors/nino/nino-safe.ecf
@@ -11,7 +11,7 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
 		<library name="nino" location="..\..\..\..\..\contrib\library\server\nino\nino-safe.ecf" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
diff --git a/library/server/ewsgi/connectors/nino/nino.ecf b/library/server/ewsgi/connectors/nino/nino.ecf
index e22c084e..c0d9087e 100644
--- a/library/server/ewsgi/connectors/nino/nino.ecf
+++ b/library/server/ewsgi/connectors/nino/nino.ecf
@@ -11,7 +11,7 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\protocol\http\http.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http.ecf"/>
 		<library name="nino" location="..\..\..\..\..\contrib\library\server\nino\nino.ecf" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
diff --git a/library/server/ewsgi/connectors/null/null-safe.ecf b/library/server/ewsgi/connectors/null/null-safe.ecf
index 512dd955..9ad9cd54 100644
--- a/library/server/ewsgi/connectors/null/null-safe.ecf
+++ b/library/server/ewsgi/connectors/null/null-safe.ecf
@@ -11,7 +11,7 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/connectors/null/null.ecf b/library/server/ewsgi/connectors/null/null.ecf
index d6c265ec..c8df2ee7 100644
--- a/library/server/ewsgi/connectors/null/null.ecf
+++ b/library/server/ewsgi/connectors/null/null.ecf
@@ -11,7 +11,7 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\protocol\http\http.ecf"/>
+		<library name="http" location="../../../../network/protocol/http/http.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/server/ewsgi/ewsgi-safe.ecf b/library/server/ewsgi/ewsgi-safe.ecf
index 410aff17..dbf0c5d8 100644
--- a/library/server/ewsgi/ewsgi-safe.ecf
+++ b/library/server/ewsgi/ewsgi-safe.ecf
@@ -11,8 +11,8 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="error" location="..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\protocol\http\http-safe.ecf"/>
+		<library name="error" location="../../utility/general/error/error-safe.ecf"/>
+		<library name="http" location="../../network/protocol/http/http-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<cluster name="interface" location="src\" recursive="true"/>
 		<cluster name="specification_request" location="specification\request" recursive="true"/>
diff --git a/library/server/ewsgi/ewsgi.ecf b/library/server/ewsgi/ewsgi.ecf
index bd4fee59..afca2d4d 100644
--- a/library/server/ewsgi/ewsgi.ecf
+++ b/library/server/ewsgi/ewsgi.ecf
@@ -11,8 +11,8 @@
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<library name="error" location="..\..\error\error.ecf"/>
-		<library name="http" location="..\..\protocol\http\http.ecf"/>
+		<library name="error" location="../../utility/general/error/error.ecf"/>
+		<library name="http" location="../../network/protocol/http/http.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf" readonly="false"/>
 		<cluster name="interface" location="src\" recursive="true" />
 		<cluster name="specification_request" location="specification\request" recursive="true"/>
diff --git a/library/server/wsf/connector/all-safe.ecf b/library/server/wsf/connector/all-safe.ecf
index 7105b665..13996424 100644
--- a/library/server/wsf/connector/all-safe.ecf
+++ b/library/server/wsf/connector/all-safe.ecf
@@ -20,8 +20,8 @@
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		
-		<library name="error" location="..\..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="error" location="../../../utility/general/error/error-safe.ecf"/>
+		<library name="http" location="../../../network/protocol/http/http-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<cluster name="wsf_nino" location="./nino" recursive="true"/>
 		<cluster name="wsf_cgi" location="./cgi" recursive="true"/>
diff --git a/library/server/wsf/connector/cgi-safe.ecf b/library/server/wsf/connector/cgi-safe.ecf
index 2392fa12..9f70e84a 100644
--- a/library/server/wsf/connector/cgi-safe.ecf
+++ b/library/server/wsf/connector/cgi-safe.ecf
@@ -14,8 +14,8 @@
 		<library name="ewsgi" location="../../ewsgi/ewsgi-safe.ecf"/>
 		<library name="wsf" location="../wsf-safe.ecf"/>
 		<library name="connector_cgi" location="../../ewsgi/connectors/cgi/cgi-safe.ecf"/>
-		<library name="error" location="..\..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="error" location="../../../utility/general/error/error-safe.ecf"/>
+		<library name="http" location="../../../network/protocol/http/http-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<cluster name="wsf_cgi" location="./cgi" recursive="true"/>
 	</target>
diff --git a/library/server/wsf/connector/cgi.ecf b/library/server/wsf/connector/cgi.ecf
index 50de1ffb..cf25584a 100644
--- a/library/server/wsf/connector/cgi.ecf
+++ b/library/server/wsf/connector/cgi.ecf
@@ -14,8 +14,8 @@
 		<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
 		<library name="wsf" location="../wsf.ecf"/>
 		<library name="connector_cgi" location="../../ewsgi/connectors/cgi/cgi.ecf"/>
-		<library name="error" location="..\..\..\error\error.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http.ecf"/>
+		<library name="error" location="../../../utility/general/error/error.ecf"/>
+		<library name="http" location="../../../network/protocol/http/http.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder.ecf" readonly="false"/>
 		<cluster name="wsf_cgi" location="./cgi" recursive="true"/>
 	</target>
diff --git a/library/server/wsf/connector/libfcgi-safe.ecf b/library/server/wsf/connector/libfcgi-safe.ecf
index 9e55d282..7228eaa5 100644
--- a/library/server/wsf/connector/libfcgi-safe.ecf
+++ b/library/server/wsf/connector/libfcgi-safe.ecf
@@ -14,8 +14,8 @@
 		<library name="ewsgi" location="../../ewsgi/ewsgi-safe.ecf"/>
 		<library name="wsf" location="../wsf-safe.ecf"/>
 		<library name="connector_libfcgi" location="../../ewsgi/connectors/libfcgi/libfcgi-safe.ecf"/>
-		<library name="error" location="..\..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="error" location="../../../utility/general/error/error-safe.ecf"/>
+		<library name="http" location="../../../network/protocol/http/http-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<cluster name="wsf_libfcgi" location="./libfcgi" recursive="true"/>
 	</target>
diff --git a/library/server/wsf/connector/libfcgi.ecf b/library/server/wsf/connector/libfcgi.ecf
index 324ea5cb..5c87293b 100644
--- a/library/server/wsf/connector/libfcgi.ecf
+++ b/library/server/wsf/connector/libfcgi.ecf
@@ -14,8 +14,8 @@
 		<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
 		<library name="wsf" location="../wsf.ecf"/>
 		<library name="connector_libfcgi" location="../../ewsgi/connectors/libfcgi/libfcgi.ecf"/>
-		<library name="error" location="..\..\..\error\error.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http.ecf"/>
+		<library name="error" location="../../../utility/general/error/error.ecf"/>
+		<library name="http" location="../../../network/protocol/http/http.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder.ecf" readonly="false"/>
 		<cluster name="wsf_libfcgi" location="./libfcgi" recursive="true"/>
 	</target>
diff --git a/library/server/wsf/connector/nino-safe.ecf b/library/server/wsf/connector/nino-safe.ecf
index 611af8b7..17e3a687 100644
--- a/library/server/wsf/connector/nino-safe.ecf
+++ b/library/server/wsf/connector/nino-safe.ecf
@@ -18,8 +18,8 @@
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		
-		<library name="error" location="..\..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http-safe.ecf"/>
+		<library name="error" location="../../../utility/general/error/error-safe.ecf"/>
+		<library name="http" location="../../../network/protocol/http/http-safe.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder-safe.ecf" readonly="false"/>
 		<cluster name="wsf_nino" location="./nino" recursive="true"/>
 	</target>
diff --git a/library/server/wsf/connector/nino.ecf b/library/server/wsf/connector/nino.ecf
index d44407d2..264fcf30 100644
--- a/library/server/wsf/connector/nino.ecf
+++ b/library/server/wsf/connector/nino.ecf
@@ -18,8 +18,8 @@
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		
-		<library name="error" location="..\..\..\error\error.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http.ecf"/>
+		<library name="error" location="../../../utility/general/error/error.ecf"/>
+		<library name="http" location="../../../network/protocol/http/http.ecf"/>
 		<library name="encoder" location="..\..\..\text\encoder\encoder.ecf" readonly="false"/>
 		<cluster name="wsf_nino" location="./nino" recursive="true"/>
 	</target>
diff --git a/library/server/wsf/tests/tests-safe.ecf b/library/server/wsf/tests/tests-safe.ecf
index 6d3bfd74..63d3bafc 100644
--- a/library/server/wsf/tests/tests-safe.ecf
+++ b/library/server/wsf/tests/tests-safe.ecf
@@ -15,8 +15,8 @@
 		<library name="connector_null" location="..\..\ewsgi\connectors\null\null-safe.ecf" readonly="false"/>
 		<library name="dft_nino" location="..\default\nino-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\protocol\http\http-safe.ecf" readonly="false"/>
-		<library name="http_client" location="..\..\..\client\http_client\http_client-safe.ecf" readonly="false"/>
+		<library name="http" location="../../../network/protocol/http/http-safe.ecf" readonly="false"/>
+		<library name="http_client" location="../../../network/http_client/http_client-safe.ecf" readonly="false"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
 		<library name="wsf" location="..\wsf-safe.ecf" readonly="false"/>
diff --git a/library/server/wsf/tests/tests.ecf b/library/server/wsf/tests/tests.ecf
index d788a833..2afa7055 100644
--- a/library/server/wsf/tests/tests.ecf
+++ b/library/server/wsf/tests/tests.ecf
@@ -15,10 +15,10 @@
 		<library name="connector_null" location="..\..\ewsgi\connectors\null\null.ecf" readonly="false"/>
 		<library name="dft_nino" location="..\default\nino.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi\ewsgi.ecf"/>
-		<library name="http_client" location="..\..\..\client\http_client\http_client.ecf"/>
+		<library name="http_client" location="../../../network/http_client/http_client.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
-		<library name="http" location="..\..\..\protocol\http\http.ecf" readonly="false"/>
+		<library name="http" location="../../../network/protocol/http/http.ecf" readonly="false"/>
 		<library name="wsf" location="..\wsf.ecf" readonly="false"/>
 		<tests name="src" location=".\src\" recursive="true"/>
 	</target>
diff --git a/library/server/wsf/wsf-safe.ecf b/library/server/wsf/wsf-safe.ecf
index 7adabe5d..5c654920 100644
--- a/library/server/wsf/wsf-safe.ecf
+++ b/library/server/wsf/wsf-safe.ecf
@@ -13,9 +13,9 @@
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
-		<library name="error" location="..\..\error\error-safe.ecf"/>
-		<library name="http" location="..\..\protocol\http\http-safe.ecf"/>
-		<library name="uri_template" location="..\..\protocol\uri_template\uri_template-safe.ecf"/>
+		<library name="error" location="../../utility/general/error/error-safe.ecf"/>
+		<library name="http" location="../../network/protocol/http/http-safe.ecf"/>
+		<library name="uri_template" location="../../text/parser/uri_template/uri_template-safe.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
 		<cluster name="src" location=".\src" recursive="true"/>
 		<cluster name="router" location=".\router" recursive="true"/>
diff --git a/library/server/wsf/wsf.ecf b/library/server/wsf/wsf.ecf
index f26d1693..7c540415 100644
--- a/library/server/wsf/wsf.ecf
+++ b/library/server/wsf/wsf.ecf
@@ -13,9 +13,9 @@
 		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
-		<library name="error" location="..\..\error\error.ecf"/>
-		<library name="http" location="..\..\protocol\http\http.ecf"/>
-		<library name="uri_template" location="..\..\protocol\uri_template\uri_template.ecf"/>
+		<library name="error" location="../../utility/general/error/error.ecf"/>
+		<library name="http" location="../../network/protocol/http/http.ecf"/>
+		<library name="uri_template" location="../../text/parser/uri_template/uri_template.ecf"/>
 		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
 		<cluster name="src" location=".\src" recursive="true"/>
 		<cluster name="router" location=".\router" recursive="true"/>
diff --git a/library/server/wsf_extension/wsf_extension-safe.ecf b/library/server/wsf_extension/wsf_extension-safe.ecf
index 627c1bcc..1e644b30 100644
--- a/library/server/wsf_extension/wsf_extension-safe.ecf
+++ b/library/server/wsf_extension/wsf_extension-safe.ecf
@@ -10,7 +10,7 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
-		<library name="http" location="..\..\protocol\http\http-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\wsf-safe.ecf"/>
 		<cluster name="src" location="./src" recursive="true"/>
diff --git a/library/server/wsf_extension/wsf_extension.ecf b/library/server/wsf_extension/wsf_extension.ecf
index 2f3b0881..d9c06cc9 100644
--- a/library/server/wsf_extension/wsf_extension.ecf
+++ b/library/server/wsf_extension/wsf_extension.ecf
@@ -10,7 +10,7 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
 		</option>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="http" location="..\..\protocol\http\http.ecf"/>
+		<library name="http" location="../../network/protocol/http/http.ecf"/>
 		<library name="ewsgi" location="..\ewsgi\ewsgi.ecf"/>
 		<library name="wsf" location="..\wsf\wsf.ecf"/>
 		<cluster name="src" location="./src" recursive="true"/>
diff --git a/library/protocol/uri_template/README.md b/library/text/parser/uri_template/README.md
similarity index 100%
rename from library/protocol/uri_template/README.md
rename to library/text/parser/uri_template/README.md
diff --git a/library/protocol/uri_template/doc/REAMDE.txt b/library/text/parser/uri_template/doc/REAMDE.txt
similarity index 100%
rename from library/protocol/uri_template/doc/REAMDE.txt
rename to library/text/parser/uri_template/doc/REAMDE.txt
diff --git a/library/protocol/uri_template/doc/rfc6570.txt b/library/text/parser/uri_template/doc/rfc6570.txt
similarity index 100%
rename from library/protocol/uri_template/doc/rfc6570.txt
rename to library/text/parser/uri_template/doc/rfc6570.txt
diff --git a/library/protocol/uri_template/doc/uritemplate-RFC6570 b/library/text/parser/uri_template/doc/uritemplate-RFC6570
similarity index 100%
rename from library/protocol/uri_template/doc/uritemplate-RFC6570
rename to library/text/parser/uri_template/doc/uritemplate-RFC6570
diff --git a/library/protocol/http/license.lic b/library/text/parser/uri_template/license.lic
similarity index 100%
rename from library/protocol/http/license.lic
rename to library/text/parser/uri_template/license.lic
diff --git a/library/protocol/uri_template/src/uri_template.e b/library/text/parser/uri_template/src/uri_template.e
similarity index 100%
rename from library/protocol/uri_template/src/uri_template.e
rename to library/text/parser/uri_template/src/uri_template.e
diff --git a/library/protocol/uri_template/src/uri_template_constants.e b/library/text/parser/uri_template/src/uri_template_constants.e
similarity index 100%
rename from library/protocol/uri_template/src/uri_template_constants.e
rename to library/text/parser/uri_template/src/uri_template_constants.e
diff --git a/library/protocol/uri_template/src/uri_template_expression.e b/library/text/parser/uri_template/src/uri_template_expression.e
similarity index 100%
rename from library/protocol/uri_template/src/uri_template_expression.e
rename to library/text/parser/uri_template/src/uri_template_expression.e
diff --git a/library/protocol/uri_template/src/uri_template_expression_variable.e b/library/text/parser/uri_template/src/uri_template_expression_variable.e
similarity index 100%
rename from library/protocol/uri_template/src/uri_template_expression_variable.e
rename to library/text/parser/uri_template/src/uri_template_expression_variable.e
diff --git a/library/protocol/uri_template/src/uri_template_handler.e b/library/text/parser/uri_template/src/uri_template_handler.e
similarity index 100%
rename from library/protocol/uri_template/src/uri_template_handler.e
rename to library/text/parser/uri_template/src/uri_template_handler.e
diff --git a/library/protocol/uri_template/src/uri_template_match_result.e b/library/text/parser/uri_template/src/uri_template_match_result.e
similarity index 100%
rename from library/protocol/uri_template/src/uri_template_match_result.e
rename to library/text/parser/uri_template/src/uri_template_match_result.e
diff --git a/library/protocol/uri_template/tests/test_uri_template.e b/library/text/parser/uri_template/tests/test_uri_template.e
similarity index 100%
rename from library/protocol/uri_template/tests/test_uri_template.e
rename to library/text/parser/uri_template/tests/test_uri_template.e
diff --git a/library/protocol/uri_template/tests/test_uri_template_draft.e b/library/text/parser/uri_template/tests/test_uri_template_draft.e
similarity index 100%
rename from library/protocol/uri_template/tests/test_uri_template_draft.e
rename to library/text/parser/uri_template/tests/test_uri_template_draft.e
diff --git a/library/protocol/uri_template/tests/test_uri_template_matcher.e b/library/text/parser/uri_template/tests/test_uri_template_matcher.e
similarity index 100%
rename from library/protocol/uri_template/tests/test_uri_template_matcher.e
rename to library/text/parser/uri_template/tests/test_uri_template_matcher.e
diff --git a/library/protocol/uri_template/tests/test_uri_template_parser.e b/library/text/parser/uri_template/tests/test_uri_template_parser.e
similarity index 100%
rename from library/protocol/uri_template/tests/test_uri_template_parser.e
rename to library/text/parser/uri_template/tests/test_uri_template_parser.e
diff --git a/library/protocol/uri_template/tests/tests-safe.ecf b/library/text/parser/uri_template/tests/tests-safe.ecf
similarity index 100%
rename from library/protocol/uri_template/tests/tests-safe.ecf
rename to library/text/parser/uri_template/tests/tests-safe.ecf
diff --git a/library/protocol/uri_template/uri_template-safe.ecf b/library/text/parser/uri_template/uri_template-safe.ecf
similarity index 92%
rename from library/protocol/uri_template/uri_template-safe.ecf
rename to library/text/parser/uri_template/uri_template-safe.ecf
index 29c4aca1..fb501669 100644
--- a/library/protocol/uri_template/uri_template-safe.ecf
+++ b/library/text/parser/uri_template/uri_template-safe.ecf
@@ -11,7 +11,7 @@
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="encoder" location="..\..\text\encoder\encoder-safe.ecf"/>
+		<library name="encoder" location="../../encoder/encoder-safe.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time-safe.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
diff --git a/library/protocol/uri_template/uri_template.ecf b/library/text/parser/uri_template/uri_template.ecf
similarity index 93%
rename from library/protocol/uri_template/uri_template.ecf
rename to library/text/parser/uri_template/uri_template.ecf
index 41e920c2..25c069a5 100644
--- a/library/protocol/uri_template/uri_template.ecf
+++ b/library/text/parser/uri_template/uri_template.ecf
@@ -14,7 +14,7 @@
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="encoder" location="..\..\text\encoder\encoder.ecf"/>
+		<library name="encoder" location="../../encoder/encoder.ecf"/>
 		<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
 		<cluster name="src" location="src\" recursive="true"/>
 	</target>
diff --git a/library/error/error-safe.ecf b/library/utility/general/error/error-safe.ecf
similarity index 100%
rename from library/error/error-safe.ecf
rename to library/utility/general/error/error-safe.ecf
diff --git a/library/error/error.ecf b/library/utility/general/error/error.ecf
similarity index 100%
rename from library/error/error.ecf
rename to library/utility/general/error/error.ecf
diff --git a/library/protocol/uri_template/license.lic b/library/utility/general/error/license.lic
similarity index 100%
rename from library/protocol/uri_template/license.lic
rename to library/utility/general/error/license.lic
diff --git a/library/error/src/error.e b/library/utility/general/error/src/error.e
similarity index 100%
rename from library/error/src/error.e
rename to library/utility/general/error/src/error.e
diff --git a/library/error/src/error_custom.e b/library/utility/general/error/src/error_custom.e
similarity index 100%
rename from library/error/src/error_custom.e
rename to library/utility/general/error/src/error_custom.e
diff --git a/library/error/src/error_group.e b/library/utility/general/error/src/error_group.e
similarity index 100%
rename from library/error/src/error_group.e
rename to library/utility/general/error/src/error_group.e
diff --git a/library/error/src/error_handler.e b/library/utility/general/error/src/error_handler.e
similarity index 100%
rename from library/error/src/error_handler.e
rename to library/utility/general/error/src/error_handler.e
diff --git a/library/error/src/error_handler_with_event.e b/library/utility/general/error/src/error_handler_with_event.e
similarity index 100%
rename from library/error/src/error_handler_with_event.e
rename to library/utility/general/error/src/error_handler_with_event.e
diff --git a/library/error/src/visitor/error_iterator.e b/library/utility/general/error/src/visitor/error_iterator.e
similarity index 100%
rename from library/error/src/visitor/error_iterator.e
rename to library/utility/general/error/src/visitor/error_iterator.e
diff --git a/library/error/src/visitor/error_null_visitor.e b/library/utility/general/error/src/visitor/error_null_visitor.e
similarity index 100%
rename from library/error/src/visitor/error_null_visitor.e
rename to library/utility/general/error/src/visitor/error_null_visitor.e
diff --git a/library/error/src/visitor/error_visitor.e b/library/utility/general/error/src/visitor/error_visitor.e
similarity index 100%
rename from library/error/src/visitor/error_visitor.e
rename to library/utility/general/error/src/visitor/error_visitor.e
diff --git a/library/error/src/visitor/file_output_error_visitor.e b/library/utility/general/error/src/visitor/file_output_error_visitor.e
similarity index 100%
rename from library/error/src/visitor/file_output_error_visitor.e
rename to library/utility/general/error/src/visitor/file_output_error_visitor.e
diff --git a/library/error/src/visitor/output_error_visitor.e b/library/utility/general/error/src/visitor/output_error_visitor.e
similarity index 100%
rename from library/error/src/visitor/output_error_visitor.e
rename to library/utility/general/error/src/visitor/output_error_visitor.e
diff --git a/library/error/src/visitor/text_output_error_visitor.e b/library/utility/general/error/src/visitor/text_output_error_visitor.e
similarity index 100%
rename from library/error/src/visitor/text_output_error_visitor.e
rename to library/utility/general/error/src/visitor/text_output_error_visitor.e
diff --git a/library/error/tests/test_error.e b/library/utility/general/error/tests/test_error.e
similarity index 100%
rename from library/error/tests/test_error.e
rename to library/utility/general/error/tests/test_error.e
diff --git a/library/error/tests/tests-safe.ecf b/library/utility/general/error/tests/tests-safe.ecf
similarity index 100%
rename from library/error/tests/tests-safe.ecf
rename to library/utility/general/error/tests/tests-safe.ecf
diff --git a/tests/dev/hello-safe.ecf b/tests/dev/hello-safe.ecf
index 79bc29f3..94095ccb 100644
--- a/tests/dev/hello-safe.ecf
+++ b/tests/dev/hello-safe.ecf
@@ -13,7 +13,7 @@
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="http" location="..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
+		<library name="http" location="../../library/network/protocol/http/http-safe.ecf" readonly="false"/>
 		<library name="wsf" location="..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 	</target>
 	<target name="hello_nino" extends="hello_connector">