diff --git a/README.md b/README.md
index eaa401b9..15ee2af8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Khue's Home Lab
 
+Work in progress
+
 ## Hardware setup
 
 ![Hardware](https://user-images.githubusercontent.com/27996771/98970963-25137200-2543-11eb-8f2d-f9a2d45756ef.JPG)
@@ -10,31 +12,11 @@
   - SSD: 128GB
 - Switch TP-Link TL-SG108
 
-## Design
+## Architecture
 
-| Layer | Name     | Description                                 | Provisioner         |
-|-------|----------|---------------------------------------------|---------------------|
-| 0     | metal    | bare metal PXE boot, etcd, docker, lxd,     | Ansible, PXE server |
-| 1     | infra    | Cloud-like infrastructure, based on KVM/LXC | Terraform           |
-| 2     | platform | kubernetes, vault, git, ci/cd...            | Helm                |
-| 3     | apps     | Plex, PeerTube, Nextcloud...                | ArgoCD              |
-
-## Features
-
-### Infrastructure
-
-![Ansible](https://img.shields.io/static/v1?logo=Ansible&logoColor=white&label=&message=Ansible&color=EE0000)
-![Docker](https://img.shields.io/static/v1?logo=Docker&logoColor=white&label=&message=Docker&color=2496ED)
-![Helm](https://img.shields.io/static/v1?logo=Helm&logoColor=white&label=&message=Helm&color=277A9F)
-![Kubernetes](https://img.shields.io/static/v1?logo=Kubernetes&logoColor=white&label=&message=Kubernetes&color=326CE5)
-![OpenStack](https://img.shields.io/static/v1?logo=OpenStack&logoColor=white&label=&message=OpenStack&color=ED1944)
-![Terraform](https://img.shields.io/static/v1?logo=Terraform&logoColor=white&label=&message=Terraform&color=623CE4)
-
-### Applications
-
-![Gitea](https://img.shields.io/static/v1?logo=Gitea&logoColor=white&label=&message=Gitea&color=609926)
-![MariaDB](https://img.shields.io/static/v1?logo=MariaDB&logoColor=white&label=&message=MariaDB&color=003545)
-![NGINX](https://img.shields.io/static/v1?logo=NGINX&logoColor=white&label=&message=NGINX&color=269539)
-![Pastebin](https://img.shields.io/static/v1?logo=Pastebin&logoColor=white&label=&message=Pastebin&color=02456C)
-![PeerTube](https://img.shields.io/static/v1?logo=PeerTube&logoColor=white&label=&message=PeerTube&color=F1680D)
-![Plex](https://img.shields.io/static/v1?logo=Plex&logoColor=white&label=&message=Plex&color=E5A00D)
+| Layer | Name                   | Description                                 | Provisioner         |
+|-------|------------------------|---------------------------------------------|---------------------|
+| 0     | [metal](./metal)       | bare metal PXE boot, etcd, docker, lxd,     | Ansible, PXE server |
+| 1     | [infra](./infra)       | Cloud-like infrastructure, based on KVM/LXC | Terraform           |
+| 2     | [platform](./platform) | kubernetes, vault, git, ci/cd...            | Helm                |
+| 3     | [apps](./apps)         | Plex, PeerTube, Nextcloud...                | ArgoCD              |