diff --git a/README.md b/README.md
index 049c314c521b56124ce25344c33fceac86d3bf9e..c971bdaedda1d6924b92045a9bd4f2b519dba348 100644
--- a/README.md
+++ b/README.md
@@ -61,98 +61,13 @@ In the web browser at `http://localhost:8888/swagger-ui/index.html`. You should
-You can now create a new project or import existing project.
+Follow the [wiki pages](https://gitlab.isae-supaero.fr/nanostar/nanospace/nanospace-demo/-/wikis/home) to setup the demo.
-
+Enjoy :satellite: :rocket: !
- - Click on `Subscribe` link.
- - Choose your username and password.
- - Log in using chosen username and password.
- - Download the [TutorialNanostar.json](https://gitlab.isae-supaero.fr/nanostar/nanospace/nanospace-user/-/blob/master/examples/TutorialNanostar.json) file example on your local drive.
- - Click on `Project` (in the top right header) > `Import Project`
- - Import the `TutorialNanostar.json` file.
- - You can invite other users by selecting `TutorialNanostar` in the `Project` tree and therefore share your project with them (they need to be registered).
+# 4. Contact Point
- Enjoy :satellite: :rocket: !
-
-# 4. API
-
-API is described at [http://localhost:8888/swagger-ui/index.html](http://localhost:8888/swagger-ui/index.html).
-
-The API port is 8888 by default.
-
-A Python example is given in [Python API](https://gitlab.isae-supaero.fr/nanostar/nanospace/nanospace-clients/nanospace-python-client)
-
-# 5. Templates
-
-(A big thanks to Carlos Sarille on this part!)
-
-Oh hello!
-In this part I will document how I am doing for the use of templates.
-Example files for the following can be found on the [System Engineering folder](https://gitlab.isae-supaero.fr/nanostar/nanospace/nanospace-demo/-/tree/master/examples?ref_type=heads)
-
-## 5.A Usage
-
-The main idea is that, in order to facilitate work, there are user-definable templates that can be used to create elements in Nanospace. That is done by clicking secondary button in the tree, and navigating into "Create from template". Angular reads a json file with the templates (this should be uploadable by the user) and displays the posibilities.
-As examples, we could have a context menu like this:
-
-
-
-What is going on behind the curtains is the following:
-- On the tree, I added a submenu to the context menu. This will execute a function that reads the json file provided by the user and generates the submenus accordingly.
-- When the user clicks on one option, this will execute another function that will create the nodes, child nodes and values (only strings by now, sorry). The code is not too complicated but it took me a while to make it work. Most of the stuff is in the sidebar-component.ts file, but I also had to add a "addStringSilent", and some others to the Nanospace service.
-
-The document with the templates has the following format:
-- Extension: .json
-- Format of submenus:
- - {"name":"submenu_name", "type":"submenu", "children":[{child_1},{child_2},...]}
- - Children can be submenus or elements.
-- Format of elements
- - {"name":"element_name", "type":"element", "children":[{child_1},{child_2},...]}
- - Children can be elements or modes.
-- Format of modes
- - {"name":"mode_name", "type":"element", "values":[{value_1},{value_2},...]}
-- Format of values
- - {"name":"value_name", "type":"value_string", "value":"number_or_string", "mode":"nominal"}
- - type can be "value_string", "value_formula" or "calue_matrix".
-
-The file is loaded in the top right menu. It is shared between navbar.component and sidebar.component through tool.service in a very precarious way. I don't have the time to do it better but hey, you probably do so go for it!
-
-## 5.B Generation of templates
-
-When you right click on an element, there is a "Generate template from element" option, that displays a messy window from where you can copy the json code for that element as a template. This way you don't have to worry too much about writing the json. It is still a bit messy for the user but definitely better than writing the json by hand. There is a template file as example in the folder carlos_mods. Most of the changes are in the sidebar-component.ts
-
-## 5.C CopyPaste
-
-With the right click menu on the tree you can copy and paste elements. it works exactly as the template generation and loading but without dealing with files. Most of the changes are in the sidebar-component.ts
-
-## 5.D Drag and Drop
-
-You can drag and drop elements, values and modes from the tree to the text inputs for strings formulas and matrixes. Most of the changes are in the sidebar-component.ts
-
-## 5.E Full tree
-
-The tree now displays components, modes and values. If there are no values it shows no modes. This makes everything much easier for the user. Clicking on values takes you to the element. Hovering the mouse over the value name on the tree shows the value in an alt. Most of the changes are in the sidebar-component.ts
-
-## 5.F API Endpoint
-
-So we discovered this when deploying in several computers. So far the endpoint (this is, the address where the frontend sends the requests to the middle ent) was harcoded. For deployment in a server this might be a good idea, I don't know. For local networks it's a mess.
-
-The solution was to add a couple of lines to the file main.ts, that update the api endpoint variable to be the same address where you are getting the web from. So, if you are connecting to 192.168.123 to access nanospace, all the requests to the middlend will be done to that same IP. If the IP changes, this adapts by itself.
-
-## 5.G Other additions
-
-All this changes are in sidebar-component.ts
-- Search bar for the tree
-- Tree is now organized alphabetically and by cathegory
-- Refresh button for the tree
-
-
-
-# 5. Contact Point
-
-- Stéphanie Dhombres from [ISAE-SUPAERO - DCAS](https://www.isae-supaero.fr/departement-conception-et-conduite-des-vehicules-aeronautiques-et-spatiaux-dcas/)
-
-- Thibault Gateau from [ISAE-SUPAERO - DCAS](https://www.isae-supaero.fr/departement-conception-et-conduite-des-vehicules-aeronautiques-et-spatiaux-dcas/)
+- Stéphanie Dhombres (firstname.lastname@isae-supaero.fr) from [ISAE-SUPAERO - DCAS](https://www.isae-supaero.fr/departement-conception-et-conduite-des-vehicules-aeronautiques-et-spatiaux-dcas/)
+- Thibault Gateau (firstname.lastname@isae-supaero.fr) from [ISAE-SUPAERO - DCAS](https://www.isae-supaero.fr/departement-conception-et-conduite-des-vehicules-aeronautiques-et-spatiaux-dcas/)
diff --git a/doc/images/add_mode.png b/doc/images/add_mode.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb46c58dc1c78a988189cc41d2c4434d1942e523
Binary files /dev/null and b/doc/images/add_mode.png differ
diff --git a/doc/images/create_component.png b/doc/images/create_component.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d958123d5c5f9427830af9e71f9c3f146f0fd76
Binary files /dev/null and b/doc/images/create_component.png differ
diff --git a/doc/images/create_new_projet.png b/doc/images/create_new_projet.png
new file mode 100644
index 0000000000000000000000000000000000000000..edf75e7be54e79504a4b632bdc8bffd4194ddc0b
Binary files /dev/null and b/doc/images/create_new_projet.png differ
diff --git a/doc/images/edit.png b/doc/images/edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..6100276c9151328ea991cded1b756c76ebaea722
Binary files /dev/null and b/doc/images/edit.png differ
diff --git a/doc/images/export.png b/doc/images/export.png
new file mode 100644
index 0000000000000000000000000000000000000000..832c9247dd62dd11bffcb979b149a1fa07b75249
Binary files /dev/null and b/doc/images/export.png differ
diff --git a/doc/images/get.png b/doc/images/get.png
new file mode 100644
index 0000000000000000000000000000000000000000..43e8726b48af846039202a59ea28631f2ffa6bd0
Binary files /dev/null and b/doc/images/get.png differ
diff --git a/doc/images/new_project.png b/doc/images/new_project.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ca4f1662e4c6a363637f54fb0a9c237cdb16b7c
Binary files /dev/null and b/doc/images/new_project.png differ
diff --git a/doc/images/reset_database.png b/doc/images/reset_database.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6b01e77238b957e36b0977017bcc5b5a9b04a82
Binary files /dev/null and b/doc/images/reset_database.png differ
diff --git a/doc/images/values.png b/doc/images/values.png
new file mode 100644
index 0000000000000000000000000000000000000000..563493756a310fed58700db2862c8eb14f6b6d83
Binary files /dev/null and b/doc/images/values.png differ