diff --git a/0-quickstart/README.md b/0-quickstart/README.md
index 3ffc3a8022f5bda02fbe66c78102e10e58996f8a..ec6e92f3ae7acdd598b5a591feaf9064de2f46aa 100644
--- a/0-quickstart/README.md
+++ b/0-quickstart/README.md
@@ -1,65 +1,92 @@
# Quickstart
-Quickstart is intended for users that want to spin up a virtual machine in the cloud as fast as possible.
+Quickstart is intended for users that want to spin up a virtual machine instance in the cloud as quickly as possible.
-To create a virtual machine, you need to
-* sign in to the MetaCentrum cloud web interface,
-* create an *ssh* key pair,
-* set up security groups,
-* start a virtual machine,
-* log in to the running instance using *ssh*.
+To create a virtual machine instance, you need to
+* sign in via the MetaCentrum cloud web interface,
+* create an *ssh* key pair or use an existing key pair,
+* set up or update a security group,
+* start a virtual machine instance,
+* log in to the running instance using *ssh* (secure shell).
-## 1. Sign in to the MetaCentrum cloud web interface
-The web interface is available at [https://cloud.muni.cz](https://cloud.muni.cz). We recommend using the English version of the interface.
+## Sign in via the MetaCentrum cloud web interface
+The web interface is available at [https://cloud.muni.cz](https://cloud.muni.cz).
To sign in,
* select `ENIFRA CESNET`,
-* click `Sign In`,
-* select your institution from the drop-down list (use search box at the top as a filter),
+* click on `Sign In`,
+* select your institution from the drop-down list (use the search box at the top as a filter),
* provide your institution-specific sign-in credentials,
* wait to be redirected back to our web interface.
-## 2. Create an SSH key pair
-To create a first instance accessible from the network you typically need to go through a few one-time steps that are not required later on. The first step is to create/import SSH keys.
+## Create an *ssh* key pair
+All virtual machine instances running in the cloud have to be accessed remotely. The most common way of accessing a virtual machine instance remotely is the secure shell - *ssh*. Using *ssh* requires a pair of cryptographic keys.
-1. To create a new SSH key pair, go to **Project > Compute > Key Pairs** and click the button "Create Key Pair"
-{% reveal text="Click here to show a screenshot" %}
+1. To create a new *ssh* key pair, go to **Project > Compute > Key Pairs** and click the button "Create Key Pair"
+{% reveal text="Show Screenshot" %}
{% endreveal %}
-
2. Name your new key and click on "Create Key Pair" again. Avoid using special characters, if possible.
-{% reveal text="Click here to show a screenshot" %}
+{% reveal text="Show Screenshot" %}
{% endreveal %}
-
-3. You can see your newly created key pair and its fingerprint. We recommend you save it in a safe location and back it up in case you accidentally delete it.
-{% reveal text="Click here to show a screenshot" %}
+3. You can see your newly created key pair and its fingerprint. We recommend you store the key in a safe location and back it up in case you accidentally delete it.
+{% reveal text="Show Screenshot" %}
{% endreveal %}
-## 3. Set up Security Groups
-In OpenStack, all incoming network traffic is blocked by default. You need to explicitly grant access to individual virtual machines by utilizing the concept of security groups. You need to add two new rules to be able to connect to your new instance (or any instance using the given security group). This is similar to setting up firewall rules on your router or server. If set up correctly, you will be able to access your virtual machine via SSH connection from your local terminal.
+## Update a security group
+In OpenStack, all incoming traffic from external networks to virtual machine instances is blocked by default. You need to explicitly allow access to individual virtual machine instances and services via a security group.
+
+You need to add two new rules to be able to connect to your new instance (or any instance using the given security group). This is similar to setting up firewall rules on your router or server. If set up correctly, you will be able to access your virtual machine via *ssh* from your local terminal.
-1. Go to **Project > Networks > Security Groups** You can see a default security group. You can either create a new one or edit the default group by clicking on "Manage Rules".
-{% reveal text="Click here to show a screenshot" %}
+1. Go to **Project > Networks > Security Groups**. Here you can see the default security group. You can either edit the default group by clicking on "Manage Rules" or create a new one. The simplest way is to edit the default group.
+{% reveal text="Show Screenshot" %}
{% endreveal %}
-2. Click on the button "Add rule", choose "SSH" and leave the remaining fields unchanged.
-{% reveal text="Click here to show a screenshot" %}
+2. Click on "Add rule", choose "SSH" and leave the remaining fields unchanged.
+{% reveal text="Show Screenshot" %}
{% endreveal %}
-3. Click on the button "Add rule", choose "ALL ICMP" and leave the remaining fields unchanged.
-{% reveal text="Click here to show a screenshot" %}
+3. Click on "Add rule", choose "ALL ICMP" and leave the remaining fields unchanged.
+{% reveal text="Show Screenshot" %}
{% endreveal %}
-## 4. Start a virtual machine
-1. To spin up a new virtual machine, navigate to **Project > Compute > Instances** and click on the "Launch Instance" button.
+## Start a virtual machine instance
+1. Navigate to **Quickstart** and click on "Launch Instance".
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
2. Choose a name for your virtual machine.
-3. From the drop-down menu, choose **"Image"** as a source and select an operating system that you desire to run on your instance.
-4. Choose a suitable configuration of RAM/CPUs/Disk space, also known as a flavor.
-5. Add a virtual network for your instance.
-6. You can leave the rest of the fields unchanged.
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
+3. Choose an Operating System to run on your instance, also known as an **Image**.
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
+4. Choose a suitable size of the new instance, also known as a **Flavor**.
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
+5. Select the previously created *ssh* key pair by name.
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
+6. Click on "Launch instance" and wait until **Quickstart** provides you with information about the running virtual machine instance.
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
+7. *[Optionally]* Add a persistent volume to the running virtual machine instance.
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
+8. Close the dialog with "Finish" to return to the list of active instances.
+{% reveal text="Show Screenshot" %}
+ 
+{% endreveal %}
-## 5. Log in to a virtual machine
-> **TODO** add steps how to login to VM
+## Log in to the virtual machine instance
+Follow instructions provided by **Quickstart** and log in remotely:
+> ssh -i ${PATH_TO_SSH_KEY_FILE} ${USER}@${IP_ADDRESS}
diff --git a/0-quickstart/qs1.png b/0-quickstart/qs1.png
new file mode 100644
index 0000000000000000000000000000000000000000..af6c182d7271a8efc902188db28bc5a9bd8ab35d
Binary files /dev/null and b/0-quickstart/qs1.png differ
diff --git a/0-quickstart/qs3-1.png b/0-quickstart/qs3-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..718edf861141677fccdc48d4c8deb03be5090f05
Binary files /dev/null and b/0-quickstart/qs3-1.png differ
diff --git a/0-quickstart/qs3-2.png b/0-quickstart/qs3-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7e5bf0b7dee647a406e684f46dced999817ca5c
Binary files /dev/null and b/0-quickstart/qs3-2.png differ
diff --git a/0-quickstart/qs3-3.png b/0-quickstart/qs3-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6d0c2661ee571d7de8c34cdbed8ab88fbd9ccb7
Binary files /dev/null and b/0-quickstart/qs3-3.png differ
diff --git a/0-quickstart/qs3-4.png b/0-quickstart/qs3-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..c529d05635166a4d714ae48ce0add5817eebcec9
Binary files /dev/null and b/0-quickstart/qs3-4.png differ
diff --git a/0-quickstart/qs4.png b/0-quickstart/qs4.png
new file mode 100644
index 0000000000000000000000000000000000000000..327c274150d28b89f2eac9ff1322d1dcc4f181cf
Binary files /dev/null and b/0-quickstart/qs4.png differ
diff --git a/0-quickstart/qs5.png b/0-quickstart/qs5.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a1e074a5b7b16f8f7f279943310396a8f4e42e4
Binary files /dev/null and b/0-quickstart/qs5.png differ
diff --git a/0-quickstart/qs6.png b/0-quickstart/qs6.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bde428984c0063623a01e3d24033a386324c4ae
Binary files /dev/null and b/0-quickstart/qs6.png differ
diff --git a/1-gui/README.md b/1-gui/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..ec02f529b8145cc5fda7c943af6ad6ba60e13aea
--- /dev/null
+++ b/1-gui/README.md
@@ -0,0 +1,10 @@
+# Using OpenStack's Web Interface
+
+## Network
+> TODO
+
+## Compute
+> TODO
+
+## Volume
+> TODO
diff --git a/1-security/README.md b/1-security/README.md
deleted file mode 100644
index bfec1a387797f808118964561c2d20db5d73f77e..0000000000000000000000000000000000000000
--- a/1-security/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# Security
-
-## Code of conduct
->**TODO** user is admin of virtual machines... etc.
-
-## SSH keys
-
-## Pre-runtime measures
-### Endorsed images
-endorsements for virtual machine images implemented directly, as cryptographically signed hashes, indirectly, based on verbal agreements only virtual machine instances based on endorsed images are allowed to have public IP addresses modified and subsequently saved images are no longer considered to be endorsed by the original endorser
-
-##Trusted users
-trusted users defined as users with high-level identity verification or explicit endorsement from other trusted users or site managers. Only trusted users have access to pools of public IP addresses
-
-##Restricted remote access to running virtual machines
-only the following combinations of access methods and authentication methods are allowed
-SSH with public key authentication
-SSH with GSS API authentication
-
-##Encrypted RDP/VNC
-password-based remote authentication methods are not allowed (e.g. SSH with a plain password)
-Automated pre-runtime compliance testing
-all virtual machine images and virtual machine instances based on said images must be tested for explicit compliance with the defined security profile (Cloud_Security_Policy#Security_Profile)
-only compliant images and virtual machine instances based on said images can
-be published (made available to other users)
-be assigned public IP addresses
-be launched outside isolated private networks
-
-##Runtime measures
-* Networking isolation for L2
-* running virtual machine instance will be isolated in a VLAN if the image of the instance is based on is not endorsed by a trusted user
-it does not belong to a trusted user
-it is running OS Windows
-its owner chooses to isolate it
-
-##Networking isolation for L3
-running virtual machine instance will be isolated using firewall if
-it has a public IP address
-its owner chooses to isolate it in a private network
-
-##IP logging
-* every IP address given to a virtual machine instance will be tied to its owner for the duration of its lifetime (i.e. until shutdown)
-owner of the virtual machine instance is responsible for any illegal activity during its lifetime
-* Anti-spoofing rules for networking
-network addresses assigned to a virtual machine instance by the cloud platform are mandatory and cannot be changed by the owner at runtime. Anti-spoofing rules are enforced by the hypervisor or local network infrastructure
-an attempt to change the assigned network addresses will immediately cut off the virtual machine instance from any subsequent network communication
-
-##Automated runtime compliance testing
-All running virtual machine instances are periodically tested for compliance with the defined security profile (Cloud_Security_Policy#Security_Profile)
-repeated or long-running non-compliance will result in an immediate forced shutdown of the given instance
-
-##Automated configuration changes in virtual machines
-all virtual machine images must support contextualization to the following extent
-* boot-time injection of a public key for the root user (where applicable)
-* boot-time change of the RDP/VNC credentials (where applicable)
-* Post-runtime measures
-
-##Extraction of virtual machine logs
-At the end of its lifetime (i.e. after shutdown), the contents of /var/log from the root file system of every virtual machine instance will be archived
-
-##Extraction of timestamps
-At the end of its lifetime (i.e. after shutdown), timestamps from the root file system of every virtual machine instance will be archived
-
-##Security Profile
-TBD
-
-##Incident Response
-whenever possible follow general procedures stipulated by CESNET and EGI
-close cooperation with CSIRT security teams
diff --git a/2-cli/README.md b/2-cli/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..87221fb7c5f792196ef8a7d779def2359a0c27aa
--- /dev/null
+++ b/2-cli/README.md
@@ -0,0 +1,10 @@
+# Command Line Interface
+
+## Getting API credentials
+> TODO
+
+## Setting up the environment
+> TODO
+
+## Full reference
+See [OpenStack CLI Cheat Sheet](http://docs.openstack.org/user-guide/cli-cheat-sheet.html).
diff --git a/2-networking/README.md b/2-networking/README.md
deleted file mode 100644
index f7ad2c9b63971ad42d38611cf69af80fe213284f..0000000000000000000000000000000000000000
--- a/2-networking/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Network settings -MASSIVE TODO-
-
-Instances in OpenStack make use of user-defined internal networks, through which they can communicate. To access your instances from an external network, you need to connect the internal and the external network via a virtual router and allocate a public \(floating\) IP address to your virtual machine.
-
-TODO> By logging in, you are automatically provided with a default internal network **"internal-net"** and a default virtual router that connects to the public network **"public-float-21"** with a subnet of **192.168.0.0/24.** In order to make your instance publicly accessible, you only need to assign a public IP to it.
-
-## 1. Internal network creation
-
-1. In the left menu navigate to **Project > Network > Networks** and hit "Create network".
-2. Give your network a name and set a subnet.
-3. In details add also DNS server addresses. They need to be set explicitly to **147.251.4.33** and **147.251.6.10**.
-
-## 2. Security groups
-
-All network traffic is blocked in OpenStack by default. You need to explicitly grant access to individual services by utilising Security Groups. This is similar to setting up firewall rules on your router or server. If setup correctly, you can access your virtual machine via SSH connection from your terminal.
-
-## 3. Floating IPs
-
-## 4. Router settings
-
-1. You can connect the previously created internal network to the external net by creating a virtual router. To do so, navigate to **Project** > **Network** > **Routers** and hit **"Create router"**.
-2. TODO> Here you can give your router a name and choose the "public-float-21" network and add it.
-3. Click on your router and a settings window will expand. Hit **"Add Interface"**.
-4. After expanding the router interface settings window, hit **"Add Interface"**.
-5. Select the network you want to connect to the public network.
diff --git a/3-compute/README.md b/3-compute/README.md
deleted file mode 100644
index 36a6f5449393d39719608859450972854aa7869e..0000000000000000000000000000000000000000
--- a/3-compute/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Compute
-
-## Flavors
-
-## Instance creation
-
-## Instance access
diff --git a/3-faq/README.md b/3-faq/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..914213ee210af91ee73dd2c3a08ea4642df0380e
--- /dev/null
+++ b/3-faq/README.md
@@ -0,0 +1,7 @@
+# Frequently Asked Questions
+
+## I want to use OpenStack. How do I register?
+Follow instructions for registering in [MetaCentrum](https://metavo.metacentrum.cz/en/application/index.html).
+
+## I have an issue with OpenStack. Where do I report it?
+First, try to search the documentation for an answer to your problem. If all else fails, open a ticket with [helpdesk@ics.muni.cz](mailto:helpdesk@ics.muni.cz). When contacting Helpdesk, always include your *username* (upper right corner of the web interface) and *domain* with active *project* (upper left corner of the web interface) as well as a description of your problem and/or an error messsage if available.
diff --git a/4-storage/README.md b/4-storage/README.md
deleted file mode 100644
index b69ddad4e1ee72042a99ef3a79923b6334160f3b..0000000000000000000000000000000000000000
--- a/4-storage/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Storage
-
-## Volumes vs Ephemeral storage
->**TODO** ceph info
diff --git a/5-images/README.md b/5-images/README.md
deleted file mode 100644
index 7c7f0a32c9ee4501db7e25171500cd42da3c16ed..0000000000000000000000000000000000000000
--- a/5-images/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Snapshots
-
-Snapshot of an instance is an exact state of a VM in the moment when the snapshot was taken. Snapshots can be done on running aas well as on turned-off instances. They are useful for example when significant system changes are needed.They provide an easy roll-back option to the state before the changes. The snapshots cannot be considered a replacement for a system back-up. The snapshots neither provide a protection from a hardware failure.
-
-HOW TO via CLI: h[ttps://docs.openstack.org/mitaka/user-guide/cli\_use\_snapshots\_to\_migrate\_instances.html](https://docs.openstack.org/mitaka/user-guide/cli_use_snapshots_to_migrate_instances.html)
-
-store metadata: [https://docs.openstack.org/mitaka/user-guide/cli\_config\_drive.html](https://docs.openstack.org/mitaka/user-guide/cli_config_drive.html)
-
-## Replication
-
-Replication is the act of continuous copying of the instance content \(more specifically \) to a separate storage. In case of hardware failure of the underlying infrastructure it is possible to spin-up your VM from this copy. This copy is not entirely identical to the original instance Although the copy is recorded periodically, there usually is a few minutes delay compared to the state of the live instance. This is an asynchronnous process.
-
-**High Availability**– the live instance is monitored non-stp and in case of physical hardware failure is immediately spinned up on another physical server.
-
-**Fault Tolerance**– This feature enables to run one virtual machine on multiuple physical servers. This feature is functionally close to replication and differs in the fact that it is implemented as a synchronnous process. This means that both replicas are identical all of the time. This feature brings about certain technical limitations. Please contact support in case you are interested in this feature, as some things need to be specified and negotiated.
-
-## Public images
-
-## Creating images
-
-## Uploading images
-
-
-
diff --git a/6-cli/README.md b/6-cli/README.md
deleted file mode 100644
index 7504ef0bb2d49833d072dcbf83b4ee1ec6d09e53..0000000000000000000000000000000000000000
--- a/6-cli/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Command line interface
-
-You can interact with OpenStack using your command line. This is the preferred option by advanced users but it is available even for beginner users. The complete functionality is accessible throug OpenStack API \([**http://developer.openstack.org/api-guide/quick-start/index.html**](http://developer.openstack.org/api-guide/quick-start/index.html)\). Remeber that OpenStack API is accessible only through the University network \(range 147.521.0.0/16\) You can also use [**VPN**](https://it.muni.cz/sluzby/vpn). Some examples of how to interact with the CLI can be found here \([**http://docs.openstack.org/user-guide/cli-cheat-sheet.html**](http://docs.openstack.org/user-guide/cli-cheat-sheet.html)\). An SDKs exists for the usual programming languages \([**http://developer.openstack.org/**](http://developer.openstack.org/)\). You can also use OpenStack Client for simple scripts written directly into the command line. Install it via:
-
-
-`pip install python-openstackclient`
-
-
-
-1. You can forward the login credentials to the client through parameters or through variable environment. You can generate a script for the environment variables through the Horizon dashboard. Navigate to  **Project** > **Compute** > **API Acess **and hit the **"Download OpenStack RC File"** and select the **"OpenStack RC File \(Identity API v3\)"** option.
-
- \(insert screenshot\)
-
-2. And continue by setting the environment variables by running the script. \(Replace the MyProject by the actual project that you created the script in.\)
-
-```
-. pMyProject-openrc.sh
-```
-
-## Installation
-
-> **TODO** manual install + some docker shizz?
-
-## Access to MetaCentrum Cloud via CLI
-
-> **TODO** add token access info
-
-## Usage examples
-
-> **TODO** how to create vm, network from CLI
-
-
-
diff --git a/7-heat/README.md b/7-heat/README.md
deleted file mode 100644
index 1b020505682076ead40971cac94b6648d862d3f6..0000000000000000000000000000000000000000
--- a/7-heat/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Orchestration
-
-Apart from the native web GUI and CLI you can also operate your instances and apllications running on OpenStack using an array of orchestration tools. Some of them are listed below:
-
-## [**Heat**](https://wiki.openstack.org/wiki/Heat)
-
-Heat is one of the OpenStack projects that enables cloud resource orchestration. A Heat template describes the infrastructure for a cloud application in a text file that is readable and writable by humans, and can be checked into version control, diffed, &c.
-
-* Infrastructure resources that can be described include: servers, floating ips, volumes, security groups, users, etc.
-
-* Heat also provides an autoscaling service that integrates with [Telemetry](https://wiki.openstack.org/wiki/Telemetry), so you can include a scaling group as a resource in a template.
-* Templates can also specify the relationships between resources \(e.g. this volume is connected to this server\). This enables Heat to call out to the OpenStack APIs to create all of your infrastructure in the correct order to completely launch your application.
-* Heat manages the whole lifecycle of the application - when you need to change your infrastructure, simply modify the template and use it to update your existing stack. Heat knows how to make the necessary changes. It will delete all of the resources when you are finished with the application, too.
-* Heat primarily manages infrastructure, but the templates integrate well with software configuration management tools such as [Puppet](https://s3.amazonaws.com/cloudformation-examples/IntegratingAWSCloudFormationWithPuppet.pdf) and [Chef](http://www.full360.com/2011/02/27/integrating-aws-cloudformation-and-chef.html). The Heat team is working on providing even better integration between infrastructure and software.Its GUI is available under
-
-To work with Heat, we recomment the following set of tutorials: [**1**](https://developer.rackspace.com/blog/openstack-orchestration-in-depth-part-1-introduction-to-heat/),[**2**](https://developer.rackspace.com/blog/openstack-orchestration-in-depth-part-2-single-instance-deployments/),[**3**](https://developer.rackspace.com/blog/openstack-orchestration-in-depth-part-3-multi-instance-deployments/),[**4**](https://developer.rackspace.com/blog/openstack-orchestration-in-depth-part-4-scaling/). Additional templates can be found here
-
-## [**Vagrant**](https://www.vagrantup.com/)
-
-See the [**vagrant-openstack-example**](https://gitlab.ics.muni.cz/172673/vagrant-openstack-example) for a reference including the Vagrantfile
-
-## [**Ansible**](https://www.ansible.com/)
-
-You can use this guide [**Create Compute Instances from OpenStack**](https://docs.ansible.com/ansible/latest/modules/os_server_module.html). This way was used for testing the MUNI OpenStack. [**Scipion Web Tools clusteru**](https://github.com/RadimPesa/scipion_on_ostack)
-
-# How to start
-
-> **TODO** ad some examples
diff --git a/8-faq/README.md b/8-faq/README.md
deleted file mode 100644
index 6dccd6dbca17077b354dc3e5161fcc77dc2d322f..0000000000000000000000000000000000000000
--- a/8-faq/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Frequently asked questions
-
-## I want to use OpenStack. How do I register?
-
-First thing you need to do is to sign up at MetaCenter and create an account. Use this [link](https://perun.metacentrum.cz/fed/registrar/?vo=meta&group=MetaCentrum Cloud).
-
-## I have an issue with OpenStack. Where do I report it?
-
-First try to search the guide and see if you can find an answer to your problem in there. If all else fails, you can open a ticket with user support. To do so, click on your project name in the upper right corner and hit "Help".
-You will be redirected to your e-mail client and you can send your request to [helpdesk@ics.muni.cz](mailto:helpdesk@ics.muni.cz).
-
- -TODO prokonzultovat obvykle use casy- Here is a list of typical use cases our support team can help you with:
- * Your VM is crashing / stuck in a boot loop / cannot spin up / ...
- * You cannot log on to your VM.
- * You need to reassign your project to another user as an owner.
- * Your networking is faulty.
-
-##
diff --git a/GLOSSARY.md b/GLOSSARY.md
index e4fab436c2379e13d8d41609b47297c2262700b7..9ab6dc51546b52ce7bda77af5529cd901189daac 100644
--- a/GLOSSARY.md
+++ b/GLOSSARY.md
@@ -1,19 +1,10 @@
# Glossary
-##
-
-An OpenStack service, such as Compute (nova), Object Storage (swift), or Image service (glance), that provides one or more endpoints through which users can access resources and perform operations.
-
-## Instance
-
-OpenStack virtual machines are called instances, mostly because they are instances of an image that is created upon request and that is configured when launched. ... In the persistent model, the instance is launched from a persistent volume on a compute node, or from a block storage volume, and not from the Image service.
+## Virtual Machine Instance
+> TODO
## Security Group
+> TODO
## Project
-
-A project (a.k.a. an account) is a group of zero or more users. In Compute, a project owns virtual machines. In Object Storage, a project owns containers. Users can be associated with more than one project. Each project and user pairing can have a role associated with it.
-
-## Role
-
-Roles define which actions users can perform. You assign roles to user-project pairs.
+> TODO
diff --git a/README.md b/README.md
index 5d3d29c9b21649aea05163a8b2bf755cc92cff80..0dbb7931b014caf5dd2a99cab29706ab67a13c25 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,12 @@
-# Welcome to MetaCentrum Cloud Documentation
+# MetaCentrum Cloud Documentation
+The MetaCentrum Cloud provides an environment for running your own virtual servers or whole virtual environments as a service. This infrastructure is available to anyone wishing to run *arbitrary* services, containerized application environments, unusual operating systems or complex computing infrastructures.
-Cloud infrastructure provides an environment for running your own virtual servers or whole virtual environments as a service. This infrastructure is available to anyone wishing to run *arbitrary* services, containerized application environments, unusual operating systems or complex computing infrastructures.
-
-## Credits
-The service is owned and operated as a joint venture of CESNET, the national e-infrastructure for science, development and education in Czech Republic and Institute of Computer Science of Masaryk University.
+This service is owned and operated as a joint venture of CESNET, the national e-infrastructure for science, development and education in Czech Republic and Institute of Computer Science of Masaryk University.
-## How to use this guide
+## How-to
This guide aims to provide a basic walk-through for setting up your virtual environment. Several topics are covered. If you are a complete beginner we recommend starting in the [Quickstart](0-quickstart/README.md) section which will walk you through all the necessary activities step by step. Use the left sidebar for navigation throughout the documentation. You can also download individual pages to PDF for printing or later use.
Bear in mind that this is not the complete documentation to OpenStack but rather a quick guide that is supposed to help you with elementary use of our infrastructure. If you need more information, please turn to the official [OpenStack Documentation](https://docs.openstack.org/rocky/user/).
diff --git a/SUMMARY.md b/SUMMARY.md
index de5215822a063ea72cf30919125fd2b147625c1f..ba35d4ff5f5dbcff1c5541a00d43e0294d9c1e3f 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -2,11 +2,7 @@
* [Introduction](README.md)
* [Quickstart](0-quickstart/README.md)
-* [Security](1-security/README.md)
-* [Networking](2-networking/README.md)
-* [Compute](3-compute/README.md)
-* [Storage](4-storage/README.md)
-* [Images](5-images/README.md)
-* [CLI](6-cli/README.md)
-* [Orchestration](7-heat/README.md)
-* [FAQ](8-faq/README.md)
+* [Graphical User Interface](1-gui/README.md)
+* [Command Line Interface](2-cli/README.md)
+* [FAQ](3-faq/README.md)
+* [Glossary](GLOSSARY.md)