diff --git a/README b/README
deleted file mode 100644
index 8ba8d6d0..00000000
--- a/README
+++ /dev/null
@@ -1,20 +0,0 @@
-Official project site for Eiffel Web Framework:
- - https://github.com/Eiffel-World/Eiffel-Web-Framework
-
-For more information please have a look at the related wiki:
- - https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
-
-# How to get the source code? #
- - 
-= Get the source code =
-
- - git clone https://github.com/Eiffel-World/Eiffel-Web-Framework.git
- - cd Eiffel-Web-Framework
- - git submodule update --init
- - git submodule foreach git pull origin master
- - git submodule foreach git checkout master
-
-# Overview #
-
- - library/ewsgi: Eiffel Web Server Gateway Interface
-
diff --git a/README b/README
new file mode 120000
index 00000000..42061c01
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+README.md
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..8bda4594
--- /dev/null
+++ b/README.md
@@ -0,0 +1,30 @@
+Official project site for Eiffel Web Framework:
+* https://github.com/Eiffel-World/Eiffel-Web-Framework
+
+For more information please have a look at the related wiki:
+* https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
+
+How to get the source code?
+---------------------------
+
+   git clone https://github.com/Eiffel-World/Eiffel-Web-Framework.git
+   cd Eiffel-Web-Framework
+   git submodule update --init
+   git submodule foreach git pull origin master
+   git submodule foreach git checkout master
+
+Overview
+--------
+
+* library/server/ewsgi: Eiffel Web Server Gateway Interface
+* library/server/ewsgi/connectors: various web server connectors for EWSGI
+* library/server/libfcgi: Wrapper for libfcgi SDK
+
+* library/protocol/http: HTTP related classes, constants for status code, content types, ...
+* library/protocol/uri_template: URI Template library (parsing and expander)
+
+* library/error: very simple/basic library to handle error
+* library/text/encoder: Various simpler encoder: base64, url-encoder, xml entities, html entities
+
+For more information please have a look at the related wiki:
+* https://github.com/Eiffel-World/Eiffel-Web-Framework/wiki
diff --git a/doc/wiki b/doc/wiki
index e1120040..c7f4f45f 160000
--- a/doc/wiki
+++ b/doc/wiki
@@ -1 +1 @@
-Subproject commit e1120040bbe843cc4d67e14b0b52fe580a466d6b
+Subproject commit c7f4f45f5eab34092d633f9e9bca52a8e9f33a90