diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..6342e5c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+EIFGENs
diff --git a/nino.ecf b/nino.ecf
index 5f07f73c..4fa6a143 100644
--- a/nino.ecf
+++ b/nino.ecf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
 	<target name="nino">
 		<root class="APPLICATION" feature="make"/>
 		<file_rule>
@@ -15,6 +15,6 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
-		<cluster name="nino" location=".\" recursive="true"/>
+		<cluster name="nino" location=".\src" recursive="true"/>
 	</target>
 </system>
diff --git a/README b/src/README
similarity index 100%
rename from README
rename to src/README
diff --git a/configuration/http_server_configuration.e b/src/configuration/http_server_configuration.e
similarity index 100%
rename from configuration/http_server_configuration.e
rename to src/configuration/http_server_configuration.e
diff --git a/configuration/http_server_shared_configuration.e b/src/configuration/http_server_shared_configuration.e
similarity index 100%
rename from configuration/http_server_shared_configuration.e
rename to src/configuration/http_server_shared_configuration.e
diff --git a/server/http_connection_handler.e b/src/http_connection_handler.e
similarity index 100%
rename from server/http_connection_handler.e
rename to src/http_connection_handler.e
diff --git a/server/http_constants.e b/src/http_constants.e
similarity index 100%
rename from server/http_constants.e
rename to src/http_constants.e
diff --git a/server/http_encoding_facilities.e b/src/http_encoding_facilities.e
similarity index 100%
rename from server/http_encoding_facilities.e
rename to src/http_encoding_facilities.e
diff --git a/server/http_handler.e b/src/http_handler.e
similarity index 100%
rename from server/http_handler.e
rename to src/http_handler.e
diff --git a/server/http_protocol_handler.e b/src/http_protocol_handler.e
similarity index 100%
rename from server/http_protocol_handler.e
rename to src/http_protocol_handler.e
diff --git a/server/http_server.e b/src/http_server.e
similarity index 100%
rename from server/http_server.e
rename to src/http_server.e
diff --git a/io/http_input_stream.e b/src/io/http_input_stream.e
similarity index 100%
rename from io/http_input_stream.e
rename to src/io/http_input_stream.e
diff --git a/io/http_output_stream.e b/src/io/http_output_stream.e
similarity index 100%
rename from io/http_output_stream.e
rename to src/io/http_output_stream.e
diff --git a/request/get_request_handler.e b/src/request/get_request_handler.e
similarity index 100%
rename from request/get_request_handler.e
rename to src/request/get_request_handler.e
diff --git a/request/head_request_handler.e b/src/request/head_request_handler.e
similarity index 100%
rename from request/head_request_handler.e
rename to src/request/head_request_handler.e
diff --git a/request/http_request_handler.e b/src/request/http_request_handler.e
similarity index 100%
rename from request/http_request_handler.e
rename to src/request/http_request_handler.e
diff --git a/request/post_request_handler.e b/src/request/post_request_handler.e
similarity index 100%
rename from request/post_request_handler.e
rename to src/request/post_request_handler.e
diff --git a/response/http_response.e b/src/response/http_response.e
similarity index 100%
rename from response/http_response.e
rename to src/response/http_response.e
diff --git a/server/shared_http_request_handlers.e b/src/shared_http_request_handlers.e
similarity index 100%
rename from server/shared_http_request_handlers.e
rename to src/shared_http_request_handlers.e
diff --git a/server/shared_uri_contents_types.e b/src/shared_uri_contents_types.e
similarity index 100%
rename from server/shared_uri_contents_types.e
rename to src/shared_uri_contents_types.e
diff --git a/server/tcp_stream_socket.e b/src/tcp_stream_socket.e
similarity index 100%
rename from server/tcp_stream_socket.e
rename to src/tcp_stream_socket.e
diff --git a/server/uri_contents_types.e b/src/uri_contents_types.e
similarity index 100%
rename from server/uri_contents_types.e
rename to src/uri_contents_types.e
diff --git a/application.e b/web_server/application.e
similarity index 100%
rename from application.e
rename to web_server/application.e
diff --git a/application_handler.e b/web_server/application_handler.e
similarity index 100%
rename from application_handler.e
rename to web_server/application_handler.e
diff --git a/web_server/web_server.ecf b/web_server/web_server.ecf
new file mode 100644
index 00000000..826dfa8b
--- /dev/null
+++ b/web_server/web_server.ecf
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="web_server" uuid="B1D3254D-A58E-4259-9796-8A2843A511A9">
+	<target name="web_server">
+		<root class="APPLICATION" feature="make"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+			<exclude>/.git$</exclude>
+		</file_rule>
+		<option warning="true" is_attached_by_default="true" void_safety="all">
+			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
+		</option>
+		<setting name="concurrency" value="thread"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
+		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
+		<library name="nino" location="../nino.ecf"/>
+		<cluster name="src" location=".\" recursive="true"/>
+	</target>
+</system>
diff --git a/webroot/demo1/img/gradient_light.jpg b/web_server/webroot/demo1/img/gradient_light.jpg
similarity index 100%
rename from webroot/demo1/img/gradient_light.jpg
rename to web_server/webroot/demo1/img/gradient_light.jpg
diff --git a/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt b/web_server/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt
similarity index 100%
rename from webroot/demo1/jquery.scrollTo-1.4.2/changes.txt
rename to web_server/webroot/demo1/jquery.scrollTo-1.4.2/changes.txt
diff --git a/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js b/web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js
similarity index 100%
rename from webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js
rename to web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo-min.js
diff --git a/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js b/web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js
similarity index 100%
rename from webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js
rename to web_server/webroot/demo1/jquery.scrollTo-1.4.2/jquery.scrollTo.js
diff --git a/webroot/demo1/script.js b/web_server/webroot/demo1/script.js
similarity index 100%
rename from webroot/demo1/script.js
rename to web_server/webroot/demo1/script.js
diff --git a/webroot/demo1/styles.css b/web_server/webroot/demo1/styles.css
similarity index 100%
rename from webroot/demo1/styles.css
rename to web_server/webroot/demo1/styles.css
diff --git a/webroot/demo1/template.html b/web_server/webroot/demo1/template.html
similarity index 100%
rename from webroot/demo1/template.html
rename to web_server/webroot/demo1/template.html
diff --git a/webroot/demo2/demo.html b/web_server/webroot/demo2/demo.html
similarity index 100%
rename from webroot/demo2/demo.html
rename to web_server/webroot/demo2/demo.html
diff --git a/webroot/demo2/img/background.jpg b/web_server/webroot/demo2/img/background.jpg
similarity index 100%
rename from webroot/demo2/img/background.jpg
rename to web_server/webroot/demo2/img/background.jpg
diff --git a/webroot/demo2/img/button_bg.jpg b/web_server/webroot/demo2/img/button_bg.jpg
similarity index 100%
rename from webroot/demo2/img/button_bg.jpg
rename to web_server/webroot/demo2/img/button_bg.jpg
diff --git a/webroot/demo2/img/dot.png b/web_server/webroot/demo2/img/dot.png
similarity index 100%
rename from webroot/demo2/img/dot.png
rename to web_server/webroot/demo2/img/dot.png
diff --git a/webroot/demo2/script.js b/web_server/webroot/demo2/script.js
similarity index 100%
rename from webroot/demo2/script.js
rename to web_server/webroot/demo2/script.js
diff --git a/webroot/demo2/styles.css b/web_server/webroot/demo2/styles.css
similarity index 100%
rename from webroot/demo2/styles.css
rename to web_server/webroot/demo2/styles.css
diff --git a/webroot/example/fonts/DINMittelschriftStd.otf b/web_server/webroot/example/fonts/DINMittelschriftStd.otf
similarity index 100%
rename from webroot/example/fonts/DINMittelschriftStd.otf
rename to web_server/webroot/example/fonts/DINMittelschriftStd.otf
diff --git a/webroot/example/fonts/MyriadPro-LightCond.otf b/web_server/webroot/example/fonts/MyriadPro-LightCond.otf
similarity index 100%
rename from webroot/example/fonts/MyriadPro-LightCond.otf
rename to web_server/webroot/example/fonts/MyriadPro-LightCond.otf
diff --git a/webroot/example/fonts/MyriadPro-SemiboldCond.otf b/web_server/webroot/example/fonts/MyriadPro-SemiboldCond.otf
similarity index 100%
rename from webroot/example/fonts/MyriadPro-SemiboldCond.otf
rename to web_server/webroot/example/fonts/MyriadPro-SemiboldCond.otf
diff --git a/webroot/example/fonts/stan0755.ttf b/web_server/webroot/example/fonts/stan0755.ttf
similarity index 100%
rename from webroot/example/fonts/stan0755.ttf
rename to web_server/webroot/example/fonts/stan0755.ttf
diff --git a/webroot/example/fonts/tahoma.ttf b/web_server/webroot/example/fonts/tahoma.ttf
similarity index 100%
rename from webroot/example/fonts/tahoma.ttf
rename to web_server/webroot/example/fonts/tahoma.ttf
diff --git a/webroot/example/fonts/tahomabd.ttf b/web_server/webroot/example/fonts/tahomabd.ttf
similarity index 100%
rename from webroot/example/fonts/tahomabd.ttf
rename to web_server/webroot/example/fonts/tahomabd.ttf
diff --git a/webroot/example/fonts/trebuc.ttf b/web_server/webroot/example/fonts/trebuc.ttf
similarity index 100%
rename from webroot/example/fonts/trebuc.ttf
rename to web_server/webroot/example/fonts/trebuc.ttf
diff --git a/webroot/example/fonts/trebucbd.ttf b/web_server/webroot/example/fonts/trebucbd.ttf
similarity index 100%
rename from webroot/example/fonts/trebucbd.ttf
rename to web_server/webroot/example/fonts/trebucbd.ttf
diff --git a/webroot/example/html/contentpage.html b/web_server/webroot/example/html/contentpage.html
similarity index 100%
rename from webroot/example/html/contentpage.html
rename to web_server/webroot/example/html/contentpage.html
diff --git a/webroot/example/html/css/styles.css b/web_server/webroot/example/html/css/styles.css
similarity index 100%
rename from webroot/example/html/css/styles.css
rename to web_server/webroot/example/html/css/styles.css
diff --git a/webroot/example/html/images/b_footer.jpg b/web_server/webroot/example/html/images/b_footer.jpg
similarity index 100%
rename from webroot/example/html/images/b_footer.jpg
rename to web_server/webroot/example/html/images/b_footer.jpg
diff --git a/webroot/example/html/images/btn_1.jpg b/web_server/webroot/example/html/images/btn_1.jpg
similarity index 100%
rename from webroot/example/html/images/btn_1.jpg
rename to web_server/webroot/example/html/images/btn_1.jpg
diff --git a/webroot/example/html/images/btn_1_over.jpg b/web_server/webroot/example/html/images/btn_1_over.jpg
similarity index 100%
rename from webroot/example/html/images/btn_1_over.jpg
rename to web_server/webroot/example/html/images/btn_1_over.jpg
diff --git a/webroot/example/html/images/btn_2.jpg b/web_server/webroot/example/html/images/btn_2.jpg
similarity index 100%
rename from webroot/example/html/images/btn_2.jpg
rename to web_server/webroot/example/html/images/btn_2.jpg
diff --git a/webroot/example/html/images/btn_2_over.jpg b/web_server/webroot/example/html/images/btn_2_over.jpg
similarity index 100%
rename from webroot/example/html/images/btn_2_over.jpg
rename to web_server/webroot/example/html/images/btn_2_over.jpg
diff --git a/webroot/example/html/images/btn_3.jpg b/web_server/webroot/example/html/images/btn_3.jpg
similarity index 100%
rename from webroot/example/html/images/btn_3.jpg
rename to web_server/webroot/example/html/images/btn_3.jpg
diff --git a/webroot/example/html/images/btn_3_over.jpg b/web_server/webroot/example/html/images/btn_3_over.jpg
similarity index 100%
rename from webroot/example/html/images/btn_3_over.jpg
rename to web_server/webroot/example/html/images/btn_3_over.jpg
diff --git a/webroot/example/html/images/btn_4.jpg b/web_server/webroot/example/html/images/btn_4.jpg
similarity index 100%
rename from webroot/example/html/images/btn_4.jpg
rename to web_server/webroot/example/html/images/btn_4.jpg
diff --git a/webroot/example/html/images/btn_4_over.jpg b/web_server/webroot/example/html/images/btn_4_over.jpg
similarity index 100%
rename from webroot/example/html/images/btn_4_over.jpg
rename to web_server/webroot/example/html/images/btn_4_over.jpg
diff --git a/webroot/example/html/images/btn_5.jpg b/web_server/webroot/example/html/images/btn_5.jpg
similarity index 100%
rename from webroot/example/html/images/btn_5.jpg
rename to web_server/webroot/example/html/images/btn_5.jpg
diff --git a/webroot/example/html/images/btn_5_over.jpg b/web_server/webroot/example/html/images/btn_5_over.jpg
similarity index 100%
rename from webroot/example/html/images/btn_5_over.jpg
rename to web_server/webroot/example/html/images/btn_5_over.jpg
diff --git a/webroot/example/html/images/btn_6.jpg b/web_server/webroot/example/html/images/btn_6.jpg
similarity index 100%
rename from webroot/example/html/images/btn_6.jpg
rename to web_server/webroot/example/html/images/btn_6.jpg
diff --git a/webroot/example/html/images/btn_6_over.jpg b/web_server/webroot/example/html/images/btn_6_over.jpg
similarity index 100%
rename from webroot/example/html/images/btn_6_over.jpg
rename to web_server/webroot/example/html/images/btn_6_over.jpg
diff --git a/webroot/example/html/images/client_login.jpg b/web_server/webroot/example/html/images/client_login.jpg
similarity index 100%
rename from webroot/example/html/images/client_login.jpg
rename to web_server/webroot/example/html/images/client_login.jpg
diff --git a/webroot/example/html/images/lines-07.jpg b/web_server/webroot/example/html/images/lines-07.jpg
similarity index 100%
rename from webroot/example/html/images/lines-07.jpg
rename to web_server/webroot/example/html/images/lines-07.jpg
diff --git a/webroot/example/html/images/lines-09.jpg b/web_server/webroot/example/html/images/lines-09.jpg
similarity index 100%
rename from webroot/example/html/images/lines-09.jpg
rename to web_server/webroot/example/html/images/lines-09.jpg
diff --git a/webroot/example/html/images/lines-11.jpg b/web_server/webroot/example/html/images/lines-11.jpg
similarity index 100%
rename from webroot/example/html/images/lines-11.jpg
rename to web_server/webroot/example/html/images/lines-11.jpg
diff --git a/webroot/example/html/images/lines-13.jpg b/web_server/webroot/example/html/images/lines-13.jpg
similarity index 100%
rename from webroot/example/html/images/lines-13.jpg
rename to web_server/webroot/example/html/images/lines-13.jpg
diff --git a/webroot/example/html/images/lines.jpg b/web_server/webroot/example/html/images/lines.jpg
similarity index 100%
rename from webroot/example/html/images/lines.jpg
rename to web_server/webroot/example/html/images/lines.jpg
diff --git a/webroot/example/html/images/main-03.jpg b/web_server/webroot/example/html/images/main-03.jpg
similarity index 100%
rename from webroot/example/html/images/main-03.jpg
rename to web_server/webroot/example/html/images/main-03.jpg
diff --git a/webroot/example/html/images/main-15.jpg b/web_server/webroot/example/html/images/main-15.jpg
similarity index 100%
rename from webroot/example/html/images/main-15.jpg
rename to web_server/webroot/example/html/images/main-15.jpg
diff --git a/webroot/example/html/images/main.jpg b/web_server/webroot/example/html/images/main.jpg
similarity index 100%
rename from webroot/example/html/images/main.jpg
rename to web_server/webroot/example/html/images/main.jpg
diff --git a/webroot/example/html/images/news-19.jpg b/web_server/webroot/example/html/images/news-19.jpg
similarity index 100%
rename from webroot/example/html/images/news-19.jpg
rename to web_server/webroot/example/html/images/news-19.jpg
diff --git a/webroot/example/html/images/news-20.jpg b/web_server/webroot/example/html/images/news-20.jpg
similarity index 100%
rename from webroot/example/html/images/news-20.jpg
rename to web_server/webroot/example/html/images/news-20.jpg
diff --git a/webroot/example/html/images/news.jpg b/web_server/webroot/example/html/images/news.jpg
similarity index 100%
rename from webroot/example/html/images/news.jpg
rename to web_server/webroot/example/html/images/news.jpg
diff --git a/webroot/example/html/images/services-23.jpg b/web_server/webroot/example/html/images/services-23.jpg
similarity index 100%
rename from webroot/example/html/images/services-23.jpg
rename to web_server/webroot/example/html/images/services-23.jpg
diff --git a/webroot/example/html/images/services-25.jpg b/web_server/webroot/example/html/images/services-25.jpg
similarity index 100%
rename from webroot/example/html/images/services-25.jpg
rename to web_server/webroot/example/html/images/services-25.jpg
diff --git a/webroot/example/html/images/services.jpg b/web_server/webroot/example/html/images/services.jpg
similarity index 100%
rename from webroot/example/html/images/services.jpg
rename to web_server/webroot/example/html/images/services.jpg
diff --git a/webroot/example/html/images/spotlight-24.jpg b/web_server/webroot/example/html/images/spotlight-24.jpg
similarity index 100%
rename from webroot/example/html/images/spotlight-24.jpg
rename to web_server/webroot/example/html/images/spotlight-24.jpg
diff --git a/webroot/example/html/images/spotlight.jpg b/web_server/webroot/example/html/images/spotlight.jpg
similarity index 100%
rename from webroot/example/html/images/spotlight.jpg
rename to web_server/webroot/example/html/images/spotlight.jpg
diff --git a/webroot/example/html/images/welcome-18.jpg b/web_server/webroot/example/html/images/welcome-18.jpg
similarity index 100%
rename from webroot/example/html/images/welcome-18.jpg
rename to web_server/webroot/example/html/images/welcome-18.jpg
diff --git a/webroot/example/html/images/welcome.jpg b/web_server/webroot/example/html/images/welcome.jpg
similarity index 100%
rename from webroot/example/html/images/welcome.jpg
rename to web_server/webroot/example/html/images/welcome.jpg
diff --git a/webroot/example/html/index.html b/web_server/webroot/example/html/index.html
similarity index 100%
rename from webroot/example/html/index.html
rename to web_server/webroot/example/html/index.html
diff --git a/webroot/example/jpeg/template276.jpg b/web_server/webroot/example/jpeg/template276.jpg
similarity index 100%
rename from webroot/example/jpeg/template276.jpg
rename to web_server/webroot/example/jpeg/template276.jpg
diff --git a/webroot/example/psd/index.psd b/web_server/webroot/example/psd/index.psd
similarity index 100%
rename from webroot/example/psd/index.psd
rename to web_server/webroot/example/psd/index.psd
diff --git a/webroot/example/readme.html b/web_server/webroot/example/readme.html
similarity index 100%
rename from webroot/example/readme.html
rename to web_server/webroot/example/readme.html
diff --git a/webroot/html/images.html b/web_server/webroot/html/images.html
similarity index 100%
rename from webroot/html/images.html
rename to web_server/webroot/html/images.html
diff --git a/webroot/html/images/btn_1.jpg b/web_server/webroot/html/images/btn_1.jpg
similarity index 100%
rename from webroot/html/images/btn_1.jpg
rename to web_server/webroot/html/images/btn_1.jpg
diff --git a/webroot/html/images/pulpit.jpg b/web_server/webroot/html/images/pulpit.jpg
similarity index 100%
rename from webroot/html/images/pulpit.jpg
rename to web_server/webroot/html/images/pulpit.jpg
diff --git a/webroot/html/simple.html b/web_server/webroot/html/simple.html
similarity index 100%
rename from webroot/html/simple.html
rename to web_server/webroot/html/simple.html
diff --git a/webroot/html5/dataset.html b/web_server/webroot/html5/dataset.html
similarity index 100%
rename from webroot/html5/dataset.html
rename to web_server/webroot/html5/dataset.html
diff --git a/webroot/post/index.html b/web_server/webroot/post/index.html
similarity index 100%
rename from webroot/post/index.html
rename to web_server/webroot/post/index.html