diff --git a/.gitmodules b/.gitmodules
index e4d61513..19d4dc1e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "contrib/library/server/nino"]
-	path = contrib/library/server/nino
-	url = https://github.com/Eiffel-World/EiffelWebNino.git
 [submodule "contrib/library/text/parser/json"]
 	path = contrib/library/text/parser/json
 	url = https://github.com/Eiffel-World/json.git
diff --git a/contrib/library/server/nino b/contrib/library/server/nino
deleted file mode 160000
index e8521368..00000000
--- a/contrib/library/server/nino
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e85213689e33783eb6ad3233efa506318f0656ff
diff --git a/library/server/ewsgi/connectors/nino/nino-safe.ecf b/library/server/ewsgi/connectors/nino/nino-safe.ecf
index eb4b8aa3..80dd1c20 100644
--- a/library/server/ewsgi/connectors/nino/nino-safe.ecf
+++ b/library/server/ewsgi/connectors/nino/nino-safe.ecf
@@ -12,7 +12,7 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
-		<library name="nino" location="..\..\..\..\..\contrib\library\server\nino\nino-safe.ecf" readonly="false">
+		<library name="nino" location="../../../wsf/connector/nino-safe.ecf" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		<cluster name="src" location=".\src\" recursive="true"/>
diff --git a/library/server/ewsgi/connectors/nino/nino.ecf b/library/server/ewsgi/connectors/nino/nino.ecf
index c0d9087e..207733b4 100644
--- a/library/server/ewsgi/connectors/nino/nino.ecf
+++ b/library/server/ewsgi/connectors/nino/nino.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="http" location="../../../../network/protocol/http/http.ecf"/>
-		<library name="nino" location="..\..\..\..\..\contrib\library\server\nino\nino.ecf" readonly="false">
+		<library name="nino" location="../../../wsf/connector/nino.ecf" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		<cluster name="src" location=".\src\" recursive="true"/>
diff --git a/library/server/wsf/connector/all-safe.ecf b/library/server/wsf/connector/all-safe.ecf
index 13996424..11f19f8f 100644
--- a/library/server/wsf/connector/all-safe.ecf
+++ b/library/server/wsf/connector/all-safe.ecf
@@ -16,7 +16,7 @@
 		<library name="connector_cgi" location="../../ewsgi/connectors/cgi/cgi-safe.ecf"/>
 		<library name="connector_libfcgi" location="../../ewsgi/connectors/libfcgi/libfcgi-safe.ecf"/>
 		<library name="connector_nino" location="../../ewsgi/connectors/nino/nino-safe.ecf"/>
-		<library name="nino" location="..\..\..\..\contrib\library\server\nino\nino-safe.ecf" readonly="false">
+		<library name="nino" location="nino-safe.ecf" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		
diff --git a/library/server/wsf/connector/nino-safe.ecf b/library/server/wsf/connector/nino-safe.ecf
index 17e3a687..f37e687c 100644
--- a/library/server/wsf/connector/nino-safe.ecf
+++ b/library/server/wsf/connector/nino-safe.ecf
@@ -14,7 +14,7 @@
 		<library name="ewsgi" location="../../ewsgi/ewsgi-safe.ecf"/>
 		<library name="wsf" location="../wsf-safe.ecf"/>
 		<library name="connector_nino" location="../../ewsgi/connectors/nino/nino-safe.ecf"/>
-		<library name="nino" location="..\..\..\..\contrib\library\server\nino\nino-safe.ecf" readonly="false">
+		<library name="nino" location="" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		
diff --git a/library/server/wsf/connector/nino.ecf b/library/server/wsf/connector/nino.ecf
index 264fcf30..25ccff35 100644
--- a/library/server/wsf/connector/nino.ecf
+++ b/library/server/wsf/connector/nino.ecf
@@ -14,7 +14,7 @@
 		<library name="ewsgi" location="../../ewsgi/ewsgi.ecf"/>
 		<library name="wsf" location="../wsf.ecf"/>
 		<library name="connector_nino" location="../../ewsgi/connectors/nino/nino.ecf"/>
-		<library name="nino" location="..\..\..\..\contrib\library\server\nino\nino.ecf" readonly="false">
+		<library name="nino" location="" readonly="false">
 			<renaming old_name="HTTP_CONSTANTS" new_name="NINO_HTTP_CONSTANTS"/>
 		</library>
 		
diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat
index dfc60841..a3f93f42 100644
--- a/tools/install_ewf.bat
+++ b/tools/install_ewf.bat
@@ -61,16 +61,16 @@ echo Install examples
 %COPYCMD% %TMP_DIR%\examples	%TMP_TARGET_DIR%\examples\ewf
 
 echo Install library: error
-%COPYCMD% %TMP_DIR%\library\error	%TMP_TARGET_DIR%\library\utility\general\error
+%COPYCMD% %TMP_DIR%\library\utility\general\error	%TMP_TARGET_DIR%\library\utility\general\error
 echo Install library: http_client
-%COPYCMD% %TMP_DIR%\library\client\http_client	%TMP_TARGET_DIR%\library\network\http_client
+%COPYCMD% %TMP_DIR%\library\network\http_client	%TMP_TARGET_DIR%\library\network\http_client
 echo Install library: http
-%COPYCMD% %TMP_DIR%\library\protocol\http	%TMP_TARGET_DIR%\library\network\protocol\http
+%COPYCMD% %TMP_DIR%\library\network\protocol\http	%TMP_TARGET_DIR%\library\network\protocol\http
 echo Install library: uri_template
-%COPYCMD% %TMP_DIR%\library\protocol\uri_template %TMP_TARGET_DIR%\library\text\parser\uri_template
+%COPYCMD% %TMP_DIR%\library\text\parser\uri_template %TMP_TARGET_DIR%\library\text\parser\uri_template
 
 echo Install contrib library: nino
-%COPYCMD% %TMP_DIR%\contrib\library\server\nino	%TMP_TARGET_DIR%\contrib\library\network\server\nino
+%COPYCMD% %TMP_DIR%\contrib\library\network\server\nino	%TMP_TARGET_DIR%\contrib\library\network\server\nino
 
 cd %TMP_TARGET_DIR%
 call %~dp0\bin\ecf_updater.bat --force --backup --verbose --diff --ise_library .