diff --git a/.github/workflows/do-not-edit.yml b/.github/workflows/do-not-edit.yml
index dded3006..6ff786b6 100644
--- a/.github/workflows/do-not-edit.yml
+++ b/.github/workflows/do-not-edit.yml
@@ -5,10 +5,10 @@ on:
     branches-ignore:
       - main
     paths:
-      - 'ref/ams-configuration.md'
+      - 'reference/ams-configuration.md'
   pull_request:
     paths:
-      - 'ref/ams-configuration.md'
+      - 'reference/ams-configuration.md'
 
 jobs:
   check:
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Print error
-        run: echo "::error file=ref/ams-configuration.md::Never edit ref/ams-configuration.md manually - edit ref/ams-configuration.tmpl.md or ref/ams-configuration.yaml instead!"
+        run: echo "::error file=reference/ams-configuration.md::Never edit reference/ams-configuration.md manually - edit reference/ams-configuration.tmpl.md or reference/ams-configuration.yaml instead!"
 
       - name: Exit
         run: exit 1
diff --git a/.github/workflows/docs-links.yml b/.github/workflows/docs-links.yml
index 17546ef1..5a114e5c 100644
--- a/.github/workflows/docs-links.yml
+++ b/.github/workflows/docs-links.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           files_ignore: |
             .github
-            release-notes
+            reference/release-notes
       
       - name: Find Anbox Cloud docs links
         id: find-anbox-cloud-docs-links
diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
index 0dc5b097..5fe3955f 100644
--- a/.github/workflows/generate.yml
+++ b/.github/workflows/generate.yml
@@ -3,12 +3,12 @@ name: Generate and commit AMS configuration doc
 on:
   push:
     paths:
-      - 'ref/ams-configuration.tmpl.md'
-      - 'ref/ams-configuration.yaml'
+      - 'reference/ams-configuration.tmpl.md'
+      - 'reference/ams-configuration.yaml'
   pull_request:
     paths:
-      - 'ref/ams-configuration.tmpl.md'
-      - 'ref/ams-configuration.yaml'
+      - 'reference/ams-configuration.tmpl.md'
+      - 'reference/ams-configuration.yaml'
 
 jobs:
   generate:
@@ -22,7 +22,7 @@ jobs:
         run: python scripts/generate-ams-config.py
 
       - name: Show Markdown file
-        run: cat ref/ams-configuration.md
+        run: cat reference/ams-configuration.md
 
       - name: Commit changes
         if: ${{ github.ref == 'refs/heads/main' }}
@@ -30,4 +30,4 @@ jobs:
         with:
           default_author: github_actions
           message: 'Generate AMS configuration doc'
-          add: 'ref/ams-configuration.md'
+          add: 'reference/ams-configuration.md'
diff --git a/exp/aar.md b/explanation/aar.md
similarity index 100%
rename from exp/aar.md
rename to explanation/aar.md
diff --git a/exp/addons.md b/explanation/addons.md
similarity index 100%
rename from exp/addons.md
rename to explanation/addons.md
diff --git a/exp/ams.md b/explanation/ams.md
similarity index 100%
rename from exp/ams.md
rename to explanation/ams.md
diff --git a/exp/anbox-cloud.md b/explanation/anbox-cloud.md
similarity index 100%
rename from exp/anbox-cloud.md
rename to explanation/anbox-cloud.md
diff --git a/exp/application-streaming.md b/explanation/application-streaming.md
similarity index 100%
rename from exp/application-streaming.md
rename to explanation/application-streaming.md
diff --git a/exp/applications.md b/explanation/applications.md
similarity index 100%
rename from exp/applications.md
rename to explanation/applications.md
diff --git a/exp/capacity-planning.md b/explanation/capacity-planning.md
similarity index 100%
rename from exp/capacity-planning.md
rename to explanation/capacity-planning.md
diff --git a/exp/clustering.md b/explanation/clustering.md
similarity index 100%
rename from exp/clustering.md
rename to explanation/clustering.md
diff --git a/exp/gpus-instances.md b/explanation/gpus-instances.md
similarity index 100%
rename from exp/gpus-instances.md
rename to explanation/gpus-instances.md
diff --git a/exp/instances.md b/explanation/instances.md
similarity index 100%
rename from exp/instances.md
rename to explanation/instances.md
diff --git a/exp/landing.md b/explanation/landing.md
similarity index 100%
rename from exp/landing.md
rename to explanation/landing.md
diff --git a/exp/performance.md b/explanation/performance.md
similarity index 100%
rename from exp/performance.md
rename to explanation/performance.md
diff --git a/exp/platforms.md b/explanation/platforms.md
similarity index 100%
rename from exp/platforms.md
rename to explanation/platforms.md
diff --git a/exp/production.md b/explanation/production.md
similarity index 100%
rename from exp/production.md
rename to explanation/production.md
diff --git a/exp/rendering-architecture.md b/explanation/rendering-architecture.md
similarity index 100%
rename from exp/rendering-architecture.md
rename to explanation/rendering-architecture.md
diff --git a/exp/resources.md b/explanation/resources.md
similarity index 100%
rename from exp/resources.md
rename to explanation/resources.md
diff --git a/exp/security.md b/explanation/security.md
similarity index 100%
rename from exp/security.md
rename to explanation/security.md
diff --git a/index.md b/index.md
index 3987377d..70721af8 100644
--- a/index.md
+++ b/index.md
@@ -36,12 +36,12 @@ Thinking about using Anbox Cloud for your next project? [Get in touch!](https://
 | -- | -- | -- |
 | 0 | / | [Anbox Cloud documentation](https://discourse.ubuntu.com/t/anbox-cloud-documentation/17029) |
 | 0 | | |
-| 1 | tut/landing | [Tutorials](https://discourse.ubuntu.com/t/tutorials/28826) |
-| 2 | tut/installing-appliance | [1. Install the appliance](https://discourse.ubuntu.com/t/install-appliance/22681) |
-| 2 | tut/getting-started-dashboard | [2. Get started using the web dashboard](https://discourse.ubuntu.com/t/getting-started-with-anbox-cloud-web-dashboard/24958)|
-| 2 | tut/getting-started | [3. Get started using the CLI](https://discourse.ubuntu.com/t/getting-started/17756)|
-| 2 | tut/stream-client | [4. Set up a stream client (Optional)](https://discourse.ubuntu.com/t/set-up-a-stream-client/37328) |
-| 2 | tut/creating-addon | [5. Create an addon (Optional)](https://discourse.ubuntu.com/t/creating-an-addon/25284)|
+| 1 | tutorial/landing | [Tutorials](https://discourse.ubuntu.com/t/tutorials/28826) |
+| 2 | tutorial/installing-appliance | [1. Install the appliance](https://discourse.ubuntu.com/t/install-appliance/22681) |
+| 2 | tutorial/getting-started-dashboard | [2. Get started using the web dashboard](https://discourse.ubuntu.com/t/getting-started-with-anbox-cloud-web-dashboard/24958)|
+| 2 | tutorial/getting-started | [3. Get started using the CLI](https://discourse.ubuntu.com/t/getting-started/17756)|
+| 2 | tutorial/stream-client | [4. Set up a stream client (Optional)](https://discourse.ubuntu.com/t/set-up-a-stream-client/37328) |
+| 2 | tutorial/creating-addon | [5. Create an addon (Optional)](https://discourse.ubuntu.com/t/creating-an-addon/25284)|
 | 0 | | |
 | 1 | howto/landing | [How-to guides](https://discourse.ubuntu.com/t/how-to-guides/28827) |
 | 2 | howto/install-appliance/landing | [Install the appliance](https://discourse.ubuntu.com/t/how-to-install-the-anbox-cloud-appliance/29702) |
@@ -128,145 +128,145 @@ Thinking about using Anbox Cloud for your next project? [Get in touch!](https://
 | 3 | howto/troubleshoot/streaming-issues | [Troubleshoot streaming issues](https://discourse.ubuntu.com/t/how-to-debug-streaming-issues/31341)|
 | 2 | howto/monitor/landing | [Monitor Anbox Cloud](https://discourse.ubuntu.com/t/monitor-anbox-cloud/24338) |
 | 0 | | |
-| 1 | ref/landing | [Reference](https://discourse.ubuntu.com/t/reference/28828) |
-| 2 | ref/releases-versions | [Releases and versions](https://discourse.ubuntu.com/t/releases-and-versions/37993) |
-| 3 | ref/roadmap | [Release roadmap](https://discourse.ubuntu.com/t/release-roadmap/19359)|
-| 3 | ref/release-notes | [Release notes](https://discourse.ubuntu.com/t/release-notes/17842)|
-| 3 | ref/supported-versions | [Supported versions](https://discourse.ubuntu.com/t/supported-versions/21046) |
-| 3 | ref/component-versions | [Component versions](https://discourse.ubuntu.com/t/component-versions/21413)|
-| 2 | ref/requirements | [Requirements](https://discourse.ubuntu.com/t/installation-requirements/17734) |
-| 2 | ref/appliance-command-reference/landing | [Appliance command reference](https://discourse.ubuntu.com/t/39525)|
-| 2 | ref/amc-command-reference/landing | [AMC command reference](https://discourse.ubuntu.com/t/40797) |
-| 2 | ref/provided-images | [Provided images](https://discourse.ubuntu.com/t/provided-images/24185)|
-| 2 | ref/supported-rendering-resources | [Supported rendering resources](https://discourse.ubuntu.com/t/supported-rendering-resources/37322) |
-| 2 | ref/supported-codecs | [Supported codecs](https://discourse.ubuntu.com/t/37323)|
-| 2 | ref/android-features | [Supported Android features](https://discourse.ubuntu.com/t/supported-android-features/28825)|
-| 2 | ref/ams-configuration | [AMS configuration](https://discourse.ubuntu.com/t/ams-configuration/20872)|
-| 2 | ref/application-manifest | [Application manifest](https://discourse.ubuntu.com/t/application-manifest/24197)|
-| 2 | ref/api-reference | [APIs](https://discourse.ubuntu.com/t/api-reference/24339) |
-| 3 | ref/ams-http-api | [AMS HTTP API](https://anbox-cloud.github.io/latest/ams/)|
-| 3 | ref/anbox-https-api | [Anbox HTTP API](https://discourse.ubuntu.com/t/anbox-http-api-reference/17819)|
-| 3 | ref/anbox-stream-gateway | [Stream Gateway API](https://anbox-cloud.github.io/latest/anbox-stream-gateway/)|
-| 3 | ref/anbox-platform-sdk-api | [Anbox Platform SDK API](https://anbox-cloud.github.io/latest/anbox-platform-sdk/)|
-| 2 | ref/sdks | [Anbox Cloud SDKs](https://discourse.ubuntu.com/t/anbox-cloud-sdks/17844)|
-| 2 | ref/network-ports | [Network ports](https://discourse.ubuntu.com/t/network-ports/33650)|
-| 2 | ref/addon-manifest | [Addon manifest](https://discourse.ubuntu.com/t/addons/25293)|
-| 2 | ref/hooks | [Hooks](https://discourse.ubuntu.com/t/hooks/28555)|
-| 2 | ref/webrtc-streamer | [WebRTC streamer](https://discourse.ubuntu.com/t/webrtc-streamer/30195)|
-| 2 | ref/prometheus | [Prometheus metrics](https://discourse.ubuntu.com/t/prometheus-metrics/19521)|
-| 2 | ref/perf-benchmarks | [Performance benchmarks](https://discourse.ubuntu.com/t/performance-benchmarks/24709)|
-| 2 | ref/license-information | [License information](https://discourse.ubuntu.com/t/license-information/36649) |
-| 2 | ref/glossary | [Glossary](https://discourse.ubuntu.com/t/glossary/26204)|
+| 1 | reference/landing | [Reference](https://discourse.ubuntu.com/t/reference/28828) |
+| 2 | reference/releases-versions | [Releases and versions](https://discourse.ubuntu.com/t/releases-and-versions/37993) |
+| 3 | reference/roadmap | [Release roadmap](https://discourse.ubuntu.com/t/release-roadmap/19359)|
+| 3 | reference/release-notes/release-notes | [Release notes](https://discourse.ubuntu.com/t/release-notes/17842)|
+| 3 | reference/supported-versions | [Supported versions](https://discourse.ubuntu.com/t/supported-versions/21046) |
+| 3 | reference/component-versions | [Component versions](https://discourse.ubuntu.com/t/component-versions/21413)|
+| 2 | reference/requirements | [Requirements](https://discourse.ubuntu.com/t/installation-requirements/17734) |
+| 2 | reference/appliance-command-reference/landing | [Appliance command reference](https://discourse.ubuntu.com/t/39525)|
+| 2 | reference/amc-command-reference/landing | [AMC command reference](https://discourse.ubuntu.com/t/40797) |
+| 2 | reference/provided-images | [Provided images](https://discourse.ubuntu.com/t/provided-images/24185)|
+| 2 | reference/supported-rendering-resources | [Supported rendering resources](https://discourse.ubuntu.com/t/supported-rendering-resources/37322) |
+| 2 | reference/supported-codecs | [Supported codecs](https://discourse.ubuntu.com/t/37323)|
+| 2 | reference/android-features | [Supported Android features](https://discourse.ubuntu.com/t/supported-android-features/28825)|
+| 2 | reference/ams-configuration | [AMS configuration](https://discourse.ubuntu.com/t/ams-configuration/20872)|
+| 2 | reference/application-manifest | [Application manifest](https://discourse.ubuntu.com/t/application-manifest/24197)|
+| 2 | reference/api-reference | [APIs](https://discourse.ubuntu.com/t/api-reference/24339) |
+| 3 | reference/ams-http-api | [AMS HTTP API](https://anbox-cloud.github.io/latest/ams/)|
+| 3 | reference/anbox-https-api | [Anbox HTTP API](https://discourse.ubuntu.com/t/anbox-http-api-reference/17819)|
+| 3 | reference/anbox-stream-gateway | [Stream Gateway API](https://anbox-cloud.github.io/latest/anbox-stream-gateway/)|
+| 3 | reference/anbox-platform-sdk-api | [Anbox Platform SDK API](https://anbox-cloud.github.io/latest/anbox-platform-sdk/)|
+| 2 | reference/sdks | [Anbox Cloud SDKs](https://discourse.ubuntu.com/t/anbox-cloud-sdks/17844)|
+| 2 | reference/network-ports | [Network ports](https://discourse.ubuntu.com/t/network-ports/33650)|
+| 2 | reference/addon-manifest | [Addon manifest](https://discourse.ubuntu.com/t/addons/25293)|
+| 2 | reference/hooks | [Hooks](https://discourse.ubuntu.com/t/hooks/28555)|
+| 2 | reference/webrtc-streamer | [WebRTC streamer](https://discourse.ubuntu.com/t/webrtc-streamer/30195)|
+| 2 | reference/prometheus | [Prometheus metrics](https://discourse.ubuntu.com/t/prometheus-metrics/19521)|
+| 2 | reference/perf-benchmarks | [Performance benchmarks](https://discourse.ubuntu.com/t/performance-benchmarks/24709)|
+| 2 | reference/license-information | [License information](https://discourse.ubuntu.com/t/license-information/36649) |
+| 2 | reference/glossary | [Glossary](https://discourse.ubuntu.com/t/glossary/26204)|
 | 0 | | |
-| 1 | exp/landing | [Explanation](https://discourse.ubuntu.com/t/explanation/28829) |
-| 2 | exp/anbox-cloud | [Anbox Cloud](https://discourse.ubuntu.com/t/anbox-cloud-overview/17802) |
-| 2 | exp/rendering-architecture | [Rendering architecture](https://discourse.ubuntu.com/t/about-rendering-architecture/35129)
-| 2 | exp/security | [Security](https://discourse.ubuntu.com/t/about-security/31217)|
-| 2 | exp/ams | [AMS](https://discourse.ubuntu.com/t/about-ams/24321)|
-| 2 | exp/aar | [AAR](https://discourse.ubuntu.com/t/application-registry/17761)|
-| 2 | exp/applications | [Applications](https://discourse.ubuntu.com/t/managing-applications/17760)|
-| 3 | exp/resources | [Resources and resource presets](https://discourse.ubuntu.com/t/24960)|
-| 2 | exp/addons | [Addons](https://discourse.ubuntu.com/t/addons/38727)|
-| 2 | exp/application-streaming | [Application streaming](https://discourse.ubuntu.com/t/streaming-android-applications/17769)|
-| 2 | exp/instances | [Instances](https://discourse.ubuntu.com/t/17763)|
-| 2 | exp/platforms | [Platforms](https://discourse.ubuntu.com/t/anbox-platforms/18733)|
-| 2 | exp/gpus-instances | [GPUs and instances](https://discourse.ubuntu.com/t/17768)|
-| 2 | exp/clustering | [Clustering](https://discourse.ubuntu.com/t/capacity-planning/17765)|
-| 2 | exp/performance | [Performance](https://discourse.ubuntu.com/t/about-performance/29416) |
-| 2 | exp/capacity-planning | [Capacity planning](https://discourse.ubuntu.com/t/about-capacity-planning/28717) |
-| 2 | exp/production | [Production planning](https://discourse.ubuntu.com/t/about-production-planning/34648) |
+| 1 | explanation/landing | [Explanation](https://discourse.ubuntu.com/t/explanation/28829) |
+| 2 | explanation/anbox-cloud | [Anbox Cloud](https://discourse.ubuntu.com/t/anbox-cloud-overview/17802) |
+| 2 | explanation/rendering-architecture | [Rendering architecture](https://discourse.ubuntu.com/t/about-rendering-architecture/35129)
+| 2 | explanation/security | [Security](https://discourse.ubuntu.com/t/about-security/31217)|
+| 2 | explanation/ams | [AMS](https://discourse.ubuntu.com/t/about-ams/24321)|
+| 2 | explanation/aar | [AAR](https://discourse.ubuntu.com/t/application-registry/17761)|
+| 2 | explanation/applications | [Applications](https://discourse.ubuntu.com/t/managing-applications/17760)|
+| 3 | explanation/resources | [Resources and resource presets](https://discourse.ubuntu.com/t/24960)|
+| 2 | explanation/addons | [Addons](https://discourse.ubuntu.com/t/addons/38727)|
+| 2 | explanation/application-streaming | [Application streaming](https://discourse.ubuntu.com/t/streaming-android-applications/17769)|
+| 2 | explanation/instances | [Instances](https://discourse.ubuntu.com/t/17763)|
+| 2 | explanation/platforms | [Platforms](https://discourse.ubuntu.com/t/anbox-platforms/18733)|
+| 2 | explanation/gpus-instances | [GPUs and instances](https://discourse.ubuntu.com/t/17768)|
+| 2 | explanation/clustering | [Clustering](https://discourse.ubuntu.com/t/capacity-planning/17765)|
+| 2 | explanation/performance | [Performance](https://discourse.ubuntu.com/t/about-performance/29416) |
+| 2 | explanation/capacity-planning | [Capacity planning](https://discourse.ubuntu.com/t/about-capacity-planning/28717) |
+| 2 | explanation/production | [Production planning](https://discourse.ubuntu.com/t/about-production-planning/34648) |
 | 0 | | |
 | 1 | |[Documentation feedback](https://forms.gle/6yzgLbwN8rVYSdvG9)|
 | 0 | | |
-|   | release-notes/1.20.2 | [Release notes-Anbox Cloud 1.20.2](https://discourse.ubuntu.com/t/41686)|
-|   | release-notes/1.20.1 | [Release notes-Anbox Cloud 1.20.1](https://discourse.ubuntu.com/t/40988)|
-|   | release-notes/1.20.0 | [Release notes-Anbox Cloud 1.20.0](https://discourse.ubuntu.com/t/40281)|
-|   | release-notes/1.19.2 | [Release notes-Anbox Cloud 1.19.2](https://discourse.ubuntu.com/t/39311)|
-|   | release-notes/1.19.1 | [Release notes-Anbox Cloud 1.19.1](https://discourse.ubuntu.com/t/38595)|
-|   | release-notes/1.19.0-fix1 | [Hotfix release announcement](https://discourse.ubuntu.com/t/38250)|
-|   | release-notes/1.19.0 | [Release notes-Anbox Cloud 1.19.0](https://discourse.ubuntu.com/t/37849)|
-|   | release-notes/1.18.2 | [Release notes-Anbox Cloud 1.18.2](https://discourse.ubuntu.com/t/36916)|
-|   | release-notes/1.18.1 | [Release notes-Anbox Cloud 1.18.1](https://discourse.ubuntu.com/t/36309)|
-|   | release-notes/1.18.0 | [Release notes-Anbox Cloud 1.18.0](https://discourse.ubuntu.com/t/35812)|
-|   | release-notes/1.17.2 | [Release notes-Anbox Cloud 1.17.2](https://discourse.ubuntu.com/t/35195)|
-|   | release-notes/1.17.1 | [Release notes-Anbox Cloud 1.17.1](https://discourse.ubuntu.com/t/34573)|
-|   | release-notes/1.17.0 | [Release notes-Anbox Cloud 1.17.0](https://discourse.ubuntu.com/t/33927)|
-|   | release-notes/1.16.4 | [Release notes-Anbox Cloud 1.16.4](https://discourse.ubuntu.com/t/33437)|
-|   | release-notes/1.16.3 | [Release notes-Anbox Cloud 1.16.3](https://discourse.ubuntu.com/t/33261)|
-|   | release-notes/1.16.2 | [Release notes-Anbox Cloud 1.16.2](https://discourse.ubuntu.com/t/33161)|
-|   | release-notes/1.16.1 | [Release notes-Anbox Cloud 1.16.1](https://discourse.ubuntu.com/t/32733)|
-|   | release-notes/1.16.0 | [Release notes-Anbox Cloud 1.16.0](https://discourse.ubuntu.com/t/32264)|
-|   | release-notes/1.15.3 | [Release notes-Anbox Cloud 1.15.3](https://discourse.ubuntu.com/t/31616)|
-|   | release-notes/1.15.2 | [Release notes-Anbox Cloud 1.15.2](https://discourse.ubuntu.com/t/31322)|
-|   | release-notes/1.15.1 | [Release notes-Anbox Cloud 1.15.1](https://discourse.ubuntu.com/t/30585)|
-|   | release-notes/1.15.0 | [Release notes-Anbox Cloud 1.15.0](https://discourse.ubuntu.com/t/30196)|
-|   | release-notes/1.14.2 | [Release notes-Anbox Cloud 1.14.2](https://discourse.ubuntu.com/t/29553)|
-|   | release-notes/1.14.1 | [Release notes-Anbox Cloud 1.14.1](https://discourse.ubuntu.com/t/28952)|
-|   | release-notes/1.14.0 | [Release notes-Anbox Cloud 1.14.0](https://discourse.ubuntu.com/t/28557)|
-|   | release-notes/1.13.2 | [Release notes-Anbox Cloud 1.13.2](https://discourse.ubuntu.com/t/27701)|
-|   | release-notes/1.13.1 | [Release notes-Anbox Cloud 1.13.1](https://discourse.ubuntu.com/t/27254)|
-|   | release-notes/1.13.0 | [Release notes-Anbox Cloud 1.13.0](https://discourse.ubuntu.com/t/26857)|
-|   | release-notes/1.12.5 | [Release notes-Anbox Cloud 1.12.5](https://discourse.ubuntu.com/t/26380)|
-|   | release-notes/1.12.4 | [Release notes-Anbox Cloud 1.12.4](https://discourse.ubuntu.com/t/26263)|
-|   | release-notes/1.12.3 | [Release notes-Anbox Cloud 1.12.3](https://discourse.ubuntu.com/t/26252)|
-|   | release-notes/1.12.2 | [Release notes-Anbox Cloud 1.12.2](https://discourse.ubuntu.com/t/25819)|
-|   | release-notes/1.12.1 | [Release notes-Anbox Cloud 1.12.1](https://discourse.ubuntu.com/t/25542)|
-|   | release-notes/1.12.0 | [Release notes-Anbox Cloud 1.12.0](https://discourse.ubuntu.com/t/25295)|
-|   | release-notes/1.11.5 | [Release notes-Anbox Cloud 1.11.5](https://discourse.ubuntu.com/t/26739)|
-|   | release-notes/1.11.4 | [Release notes-Anbox Cloud 1.11.4](https://discourse.ubuntu.com/t/25018)|
-|   | release-notes/1.11.3 | [Release notes-Anbox Cloud 1.11.3](https://discourse.ubuntu.com/t/24705)|
-|   | release-notes/1.11.2 | [Release notes-Anbox Cloud 1.11.2](https://discourse.ubuntu.com/t/24293)|
-|   | release-notes/1.11.1 | [Release notes-Anbox Cloud 1.11.1](https://discourse.ubuntu.com/t/23772)|
-|   | release-notes/1.11.0 | [Release notes-Anbox Cloud 1.11.0](https://discourse.ubuntu.com/t/23590)|
-|   | release-notes/1.10.3 | [Release notes-Anbox Cloud 1.10.3](https://discourse.ubuntu.com/t/23267)|
-|   | release-notes/1.10.2 | [Release notes-Anbox Cloud 1.10.2](https://discourse.ubuntu.com/t/22692)|
-|   | release-notes/1.10.1 | [Release notes-Anbox Cloud 1.10.1](https://discourse.ubuntu.com/t/22280)|
-|   | release-notes/1.10.0 | [Release notes-Anbox Cloud 1.10.0](https://discourse.ubuntu.com/t/22205)|
-|   | release-notes/1.9.5 | [Release notes-Anbox Cloud 1.9.5](https://discourse.ubuntu.com/t/22259)|
-|   | release-notes/1.9.4 | [Release notes-Anbox Cloud 1.9.4](https://discourse.ubuntu.com/t/22148)|
-|   | release-notes/1.9.3 | [Release notes-Anbox Cloud 1.9.3](https://discourse.ubuntu.com/t/21795)|
-|   | release-notes/1.9.2 | [Release notes-Anbox Cloud 1.9.2](https://discourse.ubuntu.com/t/21420)|
-|   | release-notes/1.9.1 | [Release notes-Anbox Cloud 1.9.1](https://discourse.ubuntu.com/t/21232)|
-|   | release-notes/1.9.0 | [Release notes-Anbox Cloud 1.9.0](https://discourse.ubuntu.com/t/20870)|
-|   | release-notes/1.8.3 | [Release notes-Anbox Cloud 1.8.3](https://discourse.ubuntu.com/t/20435)|
-|   | release-notes/1.8.2 | [Release notes-Anbox Cloud 1.8.2](https://discourse.ubuntu.com/t/19951)|
-|   | release-notes/1.8.1 | [Release notes-Anbox Cloud 1.8.1](https://discourse.ubuntu.com/t/19319)|
-|   | release-notes/1.8.0 | [Release notes-Anbox Cloud 1.8.0](https://discourse.ubuntu.com/t/19200)|
-|   | release-notes/1.7.4 | [Release notes-Anbox Cloud 1.7.4](https://discourse.ubuntu.com/t/18812)|
-|   | release-notes/1.7.3 | [Release notes-Anbox Cloud 1.7.3](https://discourse.ubuntu.com/t/18458)|
-|   | release-notes/1.7.2 | [Release notes-Anbox Cloud 1.7.2](https://discourse.ubuntu.com/t/18265)|
-|   | release-notes/1.7.1 | [Release notes-Anbox Cloud 1.7.1](https://discourse.ubuntu.com/t/17977)|
-|   | ref/appliance-command-reference/ams | [Appliance command reference - ams](https://discourse.ubuntu.com/t/39517)|
-|   | ref/appliance-command-reference/cluster | [Appliance command reference - cluster](https://discourse.ubuntu.com/t/39519)|
-|   | ref/appliance-command-reference/dashboard | [Appliance command reference - dashboard](https://discourse.ubuntu.com/t/39520)|
-|   | ref/appliance-command-reference/destroy | [Appliance command reference - destroy](https://discourse.ubuntu.com/t/39521)|
-|   | ref/appliance-command-reference/gateway | [Appliance command reference - gateway](https://discourse.ubuntu.com/t/39522)|
-|   | ref/appliance-command-reference/help | [Appliance command reference - help](https://discourse.ubuntu.com/t/39523)|
-|   | ref/appliance-command-reference/init | [Appliance command reference - init](https://discourse.ubuntu.com/t/39524)|
-|   | ref/appliance-command-reference/status | [Appliance command reference - status](https://discourse.ubuntu.com/t/39527)|
-|   | ref/appliance-command-reference/upgrade | [Appliance command reference - upgrade](https://discourse.ubuntu.com/t/39528)|
-|   | ref/amc-command-reference/addon | [AMC command reference - addon](https://discourse.ubuntu.com/t/40775) |
-|   | ref/amc-command-reference/application | [AMC command reference - application](https://discourse.ubuntu.com/t/40776) |
-|   | ref/amc-command-reference/benchmark | [AMC command reference - benchmark](https://discourse.ubuntu.com/t/40777) |
-|   | ref/amc-command-reference/completion | [AMC command reference - completion](https://discourse.ubuntu.com/t/40778) |
-|   | ref/amc-command-reference/config | [AMC command reference - config](https://discourse.ubuntu.com/t/40779) |
-|   | ref/amc-command-reference/delete | [AMC command reference - delete](https://discourse.ubuntu.com/t/40780) |
-|   | ref/amc-command-reference/exec | [AMC command reference - exec](https://discourse.ubuntu.com/t/40781) |
-|   | ref/amc-command-reference/help | [AMC command reference - help](https://discourse.ubuntu.com/t/40782) |
-|   | ref/amc-command-reference/image | [AMC command reference - image](https://discourse.ubuntu.com/t/40783) |
-|   | ref/amc-command-reference/info | [AMC command reference - info](https://discourse.ubuntu.com/t/40784) |
-|   | ref/amc-command-reference/init | [AMC command reference - init](https://discourse.ubuntu.com/t/40785) |
-|   | ref/amc-command-reference/launch | [AMC command reference - launch](https://discourse.ubuntu.com/t/40786) |
-|   | ref/amc-command-reference/list | [AMC command reference - list](https://discourse.ubuntu.com/t/40787) |
-|   | ref/amc-command-reference/logs | [AMC command reference - logs](https://discourse.ubuntu.com/t/40788) |
-|   | ref/amc-command-reference/node | [AMC command reference - node](https://discourse.ubuntu.com/t/40789) |
-|   | ref/amc-command-reference/remote | [AMC command reference - remote](https://discourse.ubuntu.com/t/40790) |
-|   | ref/amc-command-reference/shell | [AMC command reference - shell](https://discourse.ubuntu.com/t/40791) |
-|   | ref/amc-command-reference/show-log | [AMC command reference - show-log](https://discourse.ubuntu.com/t/40792) |
-|   | ref/amc-command-reference/show | [AMC command reference - show](https://discourse.ubuntu.com/t/40793) |
-|   | ref/amc-command-reference/start | [AMC command reference - start](https://discourse.ubuntu.com/t/40794) |
-|   | ref/amc-command-reference/stop | [AMC command reference - stop](https://discourse.ubuntu.com/t/40795) |
-|   | ref/amc-command-reference/wait | [AMC command reference - wait](https://discourse.ubuntu.com/t/40796) |
+|   | reference/release-notes/1.20.2 | [Release notes-Anbox Cloud 1.20.2](https://discourse.ubuntu.com/t/41686)|
+|   | reference/release-notes/1.20.1 | [Release notes-Anbox Cloud 1.20.1](https://discourse.ubuntu.com/t/40988)|
+|   | reference/release-notes/1.20.0 | [Release notes-Anbox Cloud 1.20.0](https://discourse.ubuntu.com/t/40281)|
+|   | reference/release-notes/1.19.2 | [Release notes-Anbox Cloud 1.19.2](https://discourse.ubuntu.com/t/39311)|
+|   | reference/release-notes/1.19.1 | [Release notes-Anbox Cloud 1.19.1](https://discourse.ubuntu.com/t/38595)|
+|   | reference/release-notes/1.19.0-fix1 | [Hotfix release announcement](https://discourse.ubuntu.com/t/38250)|
+|   | reference/release-notes/1.19.0 | [Release notes-Anbox Cloud 1.19.0](https://discourse.ubuntu.com/t/37849)|
+|   | reference/release-notes/1.18.2 | [Release notes-Anbox Cloud 1.18.2](https://discourse.ubuntu.com/t/36916)|
+|   | reference/release-notes/1.18.1 | [Release notes-Anbox Cloud 1.18.1](https://discourse.ubuntu.com/t/36309)|
+|   | reference/release-notes/1.18.0 | [Release notes-Anbox Cloud 1.18.0](https://discourse.ubuntu.com/t/35812)|
+|   | reference/release-notes/1.17.2 | [Release notes-Anbox Cloud 1.17.2](https://discourse.ubuntu.com/t/35195)|
+|   | reference/release-notes/1.17.1 | [Release notes-Anbox Cloud 1.17.1](https://discourse.ubuntu.com/t/34573)|
+|   | reference/release-notes/1.17.0 | [Release notes-Anbox Cloud 1.17.0](https://discourse.ubuntu.com/t/33927)|
+|   | reference/release-notes/1.16.4 | [Release notes-Anbox Cloud 1.16.4](https://discourse.ubuntu.com/t/33437)|
+|   | reference/release-notes/1.16.3 | [Release notes-Anbox Cloud 1.16.3](https://discourse.ubuntu.com/t/33261)|
+|   | reference/release-notes/1.16.2 | [Release notes-Anbox Cloud 1.16.2](https://discourse.ubuntu.com/t/33161)|
+|   | reference/release-notes/1.16.1 | [Release notes-Anbox Cloud 1.16.1](https://discourse.ubuntu.com/t/32733)|
+|   | reference/release-notes/1.16.0 | [Release notes-Anbox Cloud 1.16.0](https://discourse.ubuntu.com/t/32264)|
+|   | reference/release-notes/1.15.3 | [Release notes-Anbox Cloud 1.15.3](https://discourse.ubuntu.com/t/31616)|
+|   | reference/release-notes/1.15.2 | [Release notes-Anbox Cloud 1.15.2](https://discourse.ubuntu.com/t/31322)|
+|   | reference/release-notes/1.15.1 | [Release notes-Anbox Cloud 1.15.1](https://discourse.ubuntu.com/t/30585)|
+|   | reference/release-notes/1.15.0 | [Release notes-Anbox Cloud 1.15.0](https://discourse.ubuntu.com/t/30196)|
+|   | reference/release-notes/1.14.2 | [Release notes-Anbox Cloud 1.14.2](https://discourse.ubuntu.com/t/29553)|
+|   | reference/release-notes/1.14.1 | [Release notes-Anbox Cloud 1.14.1](https://discourse.ubuntu.com/t/28952)|
+|   | reference/release-notes/1.14.0 | [Release notes-Anbox Cloud 1.14.0](https://discourse.ubuntu.com/t/28557)|
+|   | reference/release-notes/1.13.2 | [Release notes-Anbox Cloud 1.13.2](https://discourse.ubuntu.com/t/27701)|
+|   | reference/release-notes/1.13.1 | [Release notes-Anbox Cloud 1.13.1](https://discourse.ubuntu.com/t/27254)|
+|   | reference/release-notes/1.13.0 | [Release notes-Anbox Cloud 1.13.0](https://discourse.ubuntu.com/t/26857)|
+|   | reference/release-notes/1.12.5 | [Release notes-Anbox Cloud 1.12.5](https://discourse.ubuntu.com/t/26380)|
+|   | reference/release-notes/1.12.4 | [Release notes-Anbox Cloud 1.12.4](https://discourse.ubuntu.com/t/26263)|
+|   | reference/release-notes/1.12.3 | [Release notes-Anbox Cloud 1.12.3](https://discourse.ubuntu.com/t/26252)|
+|   | reference/release-notes/1.12.2 | [Release notes-Anbox Cloud 1.12.2](https://discourse.ubuntu.com/t/25819)|
+|   | reference/release-notes/1.12.1 | [Release notes-Anbox Cloud 1.12.1](https://discourse.ubuntu.com/t/25542)|
+|   | reference/release-notes/1.12.0 | [Release notes-Anbox Cloud 1.12.0](https://discourse.ubuntu.com/t/25295)|
+|   | reference/release-notes/1.11.5 | [Release notes-Anbox Cloud 1.11.5](https://discourse.ubuntu.com/t/26739)|
+|   | reference/release-notes/1.11.4 | [Release notes-Anbox Cloud 1.11.4](https://discourse.ubuntu.com/t/25018)|
+|   | reference/release-notes/1.11.3 | [Release notes-Anbox Cloud 1.11.3](https://discourse.ubuntu.com/t/24705)|
+|   | reference/release-notes/1.11.2 | [Release notes-Anbox Cloud 1.11.2](https://discourse.ubuntu.com/t/24293)|
+|   | reference/release-notes/1.11.1 | [Release notes-Anbox Cloud 1.11.1](https://discourse.ubuntu.com/t/23772)|
+|   | reference/release-notes/1.11.0 | [Release notes-Anbox Cloud 1.11.0](https://discourse.ubuntu.com/t/23590)|
+|   | reference/release-notes/1.10.3 | [Release notes-Anbox Cloud 1.10.3](https://discourse.ubuntu.com/t/23267)|
+|   | reference/release-notes/1.10.2 | [Release notes-Anbox Cloud 1.10.2](https://discourse.ubuntu.com/t/22692)|
+|   | reference/release-notes/1.10.1 | [Release notes-Anbox Cloud 1.10.1](https://discourse.ubuntu.com/t/22280)|
+|   | reference/release-notes/1.10.0 | [Release notes-Anbox Cloud 1.10.0](https://discourse.ubuntu.com/t/22205)|
+|   | reference/release-notes/1.9.5 | [Release notes-Anbox Cloud 1.9.5](https://discourse.ubuntu.com/t/22259)|
+|   | reference/release-notes/1.9.4 | [Release notes-Anbox Cloud 1.9.4](https://discourse.ubuntu.com/t/22148)|
+|   | reference/release-notes/1.9.3 | [Release notes-Anbox Cloud 1.9.3](https://discourse.ubuntu.com/t/21795)|
+|   | reference/release-notes/1.9.2 | [Release notes-Anbox Cloud 1.9.2](https://discourse.ubuntu.com/t/21420)|
+|   | reference/release-notes/1.9.1 | [Release notes-Anbox Cloud 1.9.1](https://discourse.ubuntu.com/t/21232)|
+|   | reference/release-notes/1.9.0 | [Release notes-Anbox Cloud 1.9.0](https://discourse.ubuntu.com/t/20870)|
+|   | reference/release-notes/1.8.3 | [Release notes-Anbox Cloud 1.8.3](https://discourse.ubuntu.com/t/20435)|
+|   | reference/release-notes/1.8.2 | [Release notes-Anbox Cloud 1.8.2](https://discourse.ubuntu.com/t/19951)|
+|   | reference/release-notes/1.8.1 | [Release notes-Anbox Cloud 1.8.1](https://discourse.ubuntu.com/t/19319)|
+|   | reference/release-notes/1.8.0 | [Release notes-Anbox Cloud 1.8.0](https://discourse.ubuntu.com/t/19200)|
+|   | reference/release-notes/1.7.4 | [Release notes-Anbox Cloud 1.7.4](https://discourse.ubuntu.com/t/18812)|
+|   | reference/release-notes/1.7.3 | [Release notes-Anbox Cloud 1.7.3](https://discourse.ubuntu.com/t/18458)|
+|   | reference/release-notes/1.7.2 | [Release notes-Anbox Cloud 1.7.2](https://discourse.ubuntu.com/t/18265)|
+|   | reference/release-notes/1.7.1 | [Release notes-Anbox Cloud 1.7.1](https://discourse.ubuntu.com/t/17977)|
+|   | reference/appliance-command-reference/ams | [Appliance command reference - ams](https://discourse.ubuntu.com/t/39517)|
+|   | reference/appliance-command-reference/cluster | [Appliance command reference - cluster](https://discourse.ubuntu.com/t/39519)|
+|   | reference/appliance-command-reference/dashboard | [Appliance command reference - dashboard](https://discourse.ubuntu.com/t/39520)|
+|   | reference/appliance-command-reference/destroy | [Appliance command reference - destroy](https://discourse.ubuntu.com/t/39521)|
+|   | reference/appliance-command-reference/gateway | [Appliance command reference - gateway](https://discourse.ubuntu.com/t/39522)|
+|   | reference/appliance-command-reference/help | [Appliance command reference - help](https://discourse.ubuntu.com/t/39523)|
+|   | reference/appliance-command-reference/init | [Appliance command reference - init](https://discourse.ubuntu.com/t/39524)|
+|   | reference/appliance-command-reference/status | [Appliance command reference - status](https://discourse.ubuntu.com/t/39527)|
+|   | reference/appliance-command-reference/upgrade | [Appliance command reference - upgrade](https://discourse.ubuntu.com/t/39528)|
+|   | reference/amc-command-reference/addon | [AMC command reference - addon](https://discourse.ubuntu.com/t/40775) |
+|   | reference/amc-command-reference/application | [AMC command reference - application](https://discourse.ubuntu.com/t/40776) |
+|   | reference/amc-command-reference/benchmark | [AMC command reference - benchmark](https://discourse.ubuntu.com/t/40777) |
+|   | reference/amc-command-reference/completion | [AMC command reference - completion](https://discourse.ubuntu.com/t/40778) |
+|   | reference/amc-command-reference/config | [AMC command reference - config](https://discourse.ubuntu.com/t/40779) |
+|   | reference/amc-command-reference/delete | [AMC command reference - delete](https://discourse.ubuntu.com/t/40780) |
+|   | reference/amc-command-reference/exec | [AMC command reference - exec](https://discourse.ubuntu.com/t/40781) |
+|   | reference/amc-command-reference/help | [AMC command reference - help](https://discourse.ubuntu.com/t/40782) |
+|   | reference/amc-command-reference/image | [AMC command reference - image](https://discourse.ubuntu.com/t/40783) |
+|   | reference/amc-command-reference/info | [AMC command reference - info](https://discourse.ubuntu.com/t/40784) |
+|   | reference/amc-command-reference/init | [AMC command reference - init](https://discourse.ubuntu.com/t/40785) |
+|   | reference/amc-command-reference/launch | [AMC command reference - launch](https://discourse.ubuntu.com/t/40786) |
+|   | reference/amc-command-reference/list | [AMC command reference - list](https://discourse.ubuntu.com/t/40787) |
+|   | reference/amc-command-reference/logs | [AMC command reference - logs](https://discourse.ubuntu.com/t/40788) |
+|   | reference/amc-command-reference/node | [AMC command reference - node](https://discourse.ubuntu.com/t/40789) |
+|   | reference/amc-command-reference/remote | [AMC command reference - remote](https://discourse.ubuntu.com/t/40790) |
+|   | reference/amc-command-reference/shell | [AMC command reference - shell](https://discourse.ubuntu.com/t/40791) |
+|   | reference/amc-command-reference/show-log | [AMC command reference - show-log](https://discourse.ubuntu.com/t/40792) |
+|   | reference/amc-command-reference/show | [AMC command reference - show](https://discourse.ubuntu.com/t/40793) |
+|   | reference/amc-command-reference/start | [AMC command reference - start](https://discourse.ubuntu.com/t/40794) |
+|   | reference/amc-command-reference/stop | [AMC command reference - stop](https://discourse.ubuntu.com/t/40795) |
+|   | reference/amc-command-reference/wait | [AMC command reference - wait](https://discourse.ubuntu.com/t/40796) |
 [/details]
 
 ## Redirects
@@ -274,75 +274,29 @@ Thinking about using Anbox Cloud for your next project? [Get in touch!](https://
 [details=Mapping table]
 | Path | Location |
 | ---- | -------- |
-| /docs/install-appliance | /docs/tut/installing-appliance |
-| /docs/lxd-auto-scaling | /docs/exp/clustering |
-| /docs/usage/usecase-streaming-sdk | /docs/ref/sdks |
-| /docs/reference/ams-sdk-api-reference | /docs/ref/sdks |
-| /docs/installation/installation-appliance | /docs/tut/installing-appliance |
-| /docs/manage/getting-started | /docs/tut/getting-started |
-| /docs/installation/installation-quickstart | /docs/howto/install/deploy-juju |
-| /docs/installation/installation-customizing | /docs/howto/install/customise |
-| /docs/installation/high-availability | /docs/howto/install/high-availability |
-| /docs/installation/validation | /docs/howto/install/validate |
-| /docs/installation/upgrading-from-previous-versions | /docs/howto/update/upgrade-anbox |
-| /docs/howto/manage/managing-images | /docs/howto/manage/images |
-| /docs/howto/manage/managing-addons | /docs/howto/addons/landing |
-| /docs/howto/manage/managing-logs | /docs/howto/manage/logs |
-| /docs/howto/manage/managing-ams-access | /docs/howto/manage/ams-access |
-| /docs/manage/managing-ams-access | /docs/howto/manage/ams-access |
-| /docs/installation/installation-application-registry | /docs/howto/aar/deploy |
-| /docs/usage/usecase-application-testing | /docs/howto/application/test |
-| /docs/usage/usecase-virtual-devices | /docs/howto/application/virtual-devices |
+| /docs/tut | /docs/tutorial |
+| /docs/ref | /docs/reference |
+| /docs/exp | /docs/explanation |
+| /docs/release-notes | /docs/reference/release-notes |
 | /docs/manage/container-access | /docs/howto/instance/access |
 | /docs/howto/container/view-log | /docs/howto/instance/logs |
 | /docs/usage/usecase-container-configuration | /docs/howto/instance/geographic-location |
 | /docs/howto/containers/backup-and-restore | /docs/howto/instance/backup-and-restore |
-| /docs/implement-android-native-streaming-client | /docs/howto/stream/native-client |
-| /docs/implement-web-based-streaming-client | /docs/howto/stream/web-client |
 | /docs/howto/stream/web-client | /docs/tut/stream-client |
-| /docs/exchange-out-of-band-data | /docs/howto/stream/oob-data |
-| /docs/integrate-keyboard | /docs/howto/stream/client-side-keyboard |
-| /docs/faq | /docs/howto/troubleshoot/landing |
 | /docs/howto/troubleshoot/collect-info | /docs/howto/troubleshoot/landing |
-| /docs/sdks | /docs/ref/sdks |
-| /docs/reference/ams-rest-api-reference | /docs/ref/ams-http-api |
-| /docs/reference/anbox-http-api-reference | /docs/ref/anbox-https-api |
-| /docs/reference/anbox-stream-gateway-reference | /docs/ref/anbox-stream-gateway |
-| /docs/manage/instance-types-reference | /docs/ref/instance-types |
-| /docs/reference/anbox-platforms | /docs/ref/platforms |
-| /docs/reference/prometheus-metrics | /docs/ref/prometheus |
-| /docs/ams-configuration | /docs/ref/ams-configuration |
-| /docs/overview | /docs/exp/anbox-cloud |
-| /docs/manage/managing-applications | /docs/exp/applications |
-| /docs/manage/managing-addons | /docs/howto/addons/landing |
-| /docs/manage/application-registry | /docs/exp/aar |
 | /docs/manage/managing-containers | /docs/exp/instances |
-| /docs/manage/capacity-planning | /docs/exp/clustering |
-| /docs/manage/gpu-support | /docs/exp/gpu-support |
-| /docs/exp/gpu-support | /docs/exp/gpus-instances |
-| /docs/manage/benchmarking-a-deployment | /docs/exp/benchmarking |
-| /docs/manage/streaming-android-applications | /docs/exp/application-streaming |
-| /docs/usage/usecase-port-android-application-to-anbox-cloud | /docs/exp/porting-issues |
-| /docs/installation/installation-requirements | /docs/requirements |
-| /docs/exp/porting-issues | /docs/howto/port/landing |
-| /docs/exp/benchmarking | /docs/howto/manage/benchmarks |
-| /docs/changelog | /docs/release-notes |
+| /docs/exp/gpu-support | /docs/explanation/gpus-instances |
 | /docs/howto/container/launch | /docs/howto/instance/create |
 | /docs/howto/stream/debug | /docs/howto/troubleshoot/streaming-issues |
 | /docs/howto/manage/web-dashboard | /docs/howto/dashboard/web-dashboard |
 | /docs/howto/manage/logs | /docs/howto/troubleshoot/logs |
-| /docs/ref/platforms | /docs/exp/platforms |
-| /docs/requirements | /docs/ref/requirements |
-| /docs/release-notes | /docs/ref/release-notes |
-| /docs/roadmap | /docs/ref/roadmap |
-| /docs/component-versions | /docs/ref/component-versions |
-| /docs/supported-versions | /docs/ref/supported-versions |
-| /docs/ref/instance-types | /docs/ref/application-manifest |
-| /docs/ref/supported-video-codecs | /docs/ref/supported-codecs |
-| /docs/howto/addons/best-practices | /docs/exp/addons |
-| /docs/ref/addons | /docs/ref/addon-manifest |
-| /docs/howto/manage/manage-appliance | /docs/ref/appliance-command-reference/landing |
-| /docs/exp/containers | /docs/exp/instances |
+| /docs/ref/platforms | /docs/explanation/platforms |
+| /docs/ref/instance-types | /docs/reference/application-manifest |
+| /docs/ref/supported-video-codecs | /docs/reference/supported-codecs |
+| /docs/howto/addons/best-practices | /docs/explanation/addons |
+| /docs/ref/addons | /docs/reference/addon-manifest |
+| /docs/howto/manage/manage-appliance | /docs/reference/appliance-command-reference/landing |
+| /docs/exp/containers | /docs/explanation/instances |
 | /docs/howto/container | /docs/howto/instance |
 | /docs/howto/troubleshoot/container-failures | /docs/howto/troubleshoot/instance-failures |
 | /docs/howto/container/access | /docs/howto/instance/access |
@@ -357,5 +311,5 @@ Thinking about using Anbox Cloud for your next project? [Get in touch!](https://
 | /docs/howto/container/start | /docs/howto/instance/start |
 | /docs/howto/container/stop | /docs/howto/instance/stop |
 | /docs/howto/container/wait | /docs/howto/instance/wait |
-| /docs/howto/application/resources | /docs/exp/resources |
+| /docs/howto/application/resources | /docs/explanation/resources |
 [/details]
diff --git a/ref/addon-manifest.md b/reference/addon-manifest.md
similarity index 100%
rename from ref/addon-manifest.md
rename to reference/addon-manifest.md
diff --git a/ref/amc-command-reference/addon.md b/reference/amc-command-reference/addon.md
similarity index 100%
rename from ref/amc-command-reference/addon.md
rename to reference/amc-command-reference/addon.md
diff --git a/ref/amc-command-reference/application.md b/reference/amc-command-reference/application.md
similarity index 100%
rename from ref/amc-command-reference/application.md
rename to reference/amc-command-reference/application.md
diff --git a/ref/amc-command-reference/benchmark.md b/reference/amc-command-reference/benchmark.md
similarity index 100%
rename from ref/amc-command-reference/benchmark.md
rename to reference/amc-command-reference/benchmark.md
diff --git a/ref/amc-command-reference/completion.md b/reference/amc-command-reference/completion.md
similarity index 100%
rename from ref/amc-command-reference/completion.md
rename to reference/amc-command-reference/completion.md
diff --git a/ref/amc-command-reference/config.md b/reference/amc-command-reference/config.md
similarity index 100%
rename from ref/amc-command-reference/config.md
rename to reference/amc-command-reference/config.md
diff --git a/ref/amc-command-reference/delete.md b/reference/amc-command-reference/delete.md
similarity index 100%
rename from ref/amc-command-reference/delete.md
rename to reference/amc-command-reference/delete.md
diff --git a/ref/amc-command-reference/exec.md b/reference/amc-command-reference/exec.md
similarity index 100%
rename from ref/amc-command-reference/exec.md
rename to reference/amc-command-reference/exec.md
diff --git a/ref/amc-command-reference/help.md b/reference/amc-command-reference/help.md
similarity index 100%
rename from ref/amc-command-reference/help.md
rename to reference/amc-command-reference/help.md
diff --git a/ref/amc-command-reference/image.md b/reference/amc-command-reference/image.md
similarity index 100%
rename from ref/amc-command-reference/image.md
rename to reference/amc-command-reference/image.md
diff --git a/ref/amc-command-reference/info.md b/reference/amc-command-reference/info.md
similarity index 100%
rename from ref/amc-command-reference/info.md
rename to reference/amc-command-reference/info.md
diff --git a/ref/amc-command-reference/init.md b/reference/amc-command-reference/init.md
similarity index 100%
rename from ref/amc-command-reference/init.md
rename to reference/amc-command-reference/init.md
diff --git a/ref/amc-command-reference/landing.md b/reference/amc-command-reference/landing.md
similarity index 100%
rename from ref/amc-command-reference/landing.md
rename to reference/amc-command-reference/landing.md
diff --git a/ref/amc-command-reference/launch.md b/reference/amc-command-reference/launch.md
similarity index 100%
rename from ref/amc-command-reference/launch.md
rename to reference/amc-command-reference/launch.md
diff --git a/ref/amc-command-reference/list.md b/reference/amc-command-reference/list.md
similarity index 100%
rename from ref/amc-command-reference/list.md
rename to reference/amc-command-reference/list.md
diff --git a/ref/amc-command-reference/logs.md b/reference/amc-command-reference/logs.md
similarity index 100%
rename from ref/amc-command-reference/logs.md
rename to reference/amc-command-reference/logs.md
diff --git a/ref/amc-command-reference/node.md b/reference/amc-command-reference/node.md
similarity index 100%
rename from ref/amc-command-reference/node.md
rename to reference/amc-command-reference/node.md
diff --git a/ref/amc-command-reference/remote.md b/reference/amc-command-reference/remote.md
similarity index 100%
rename from ref/amc-command-reference/remote.md
rename to reference/amc-command-reference/remote.md
diff --git a/ref/amc-command-reference/shell.md b/reference/amc-command-reference/shell.md
similarity index 100%
rename from ref/amc-command-reference/shell.md
rename to reference/amc-command-reference/shell.md
diff --git a/ref/amc-command-reference/show-log.md b/reference/amc-command-reference/show-log.md
similarity index 100%
rename from ref/amc-command-reference/show-log.md
rename to reference/amc-command-reference/show-log.md
diff --git a/ref/amc-command-reference/show.md b/reference/amc-command-reference/show.md
similarity index 100%
rename from ref/amc-command-reference/show.md
rename to reference/amc-command-reference/show.md
diff --git a/ref/amc-command-reference/start.md b/reference/amc-command-reference/start.md
similarity index 100%
rename from ref/amc-command-reference/start.md
rename to reference/amc-command-reference/start.md
diff --git a/ref/amc-command-reference/stop.md b/reference/amc-command-reference/stop.md
similarity index 100%
rename from ref/amc-command-reference/stop.md
rename to reference/amc-command-reference/stop.md
diff --git a/ref/amc-command-reference/wait.md b/reference/amc-command-reference/wait.md
similarity index 100%
rename from ref/amc-command-reference/wait.md
rename to reference/amc-command-reference/wait.md
diff --git a/ref/ams-configuration.md b/reference/ams-configuration.md
similarity index 100%
rename from ref/ams-configuration.md
rename to reference/ams-configuration.md
diff --git a/ref/ams-configuration.tmpl.md b/reference/ams-configuration.tmpl.md
similarity index 100%
rename from ref/ams-configuration.tmpl.md
rename to reference/ams-configuration.tmpl.md
diff --git a/ref/ams-configuration.yaml b/reference/ams-configuration.yaml
similarity index 100%
rename from ref/ams-configuration.yaml
rename to reference/ams-configuration.yaml
diff --git a/ref/ams-http-api.md b/reference/ams-http-api.md
similarity index 99%
rename from ref/ams-http-api.md
rename to reference/ams-http-api.md
index 7e70aa05..a4411ccf 100644
--- a/ref/ams-http-api.md
+++ b/reference/ams-http-api.md
@@ -1155,7 +1155,7 @@ Output:
       "images.version_lockstep": "true", // Prevent images of new minor releases to be pulled by AMS
       "registry.filter": "",             // (comma separated list) Filter out applications without matching tags
       "registry.fingerprint": <fingerprint>, // (string) Fingerprint of registry certificate
-      "registry.mode": "pull",           // (pull/push/manual) Whether AMS should act as a client or publisher automatically synchronizing applications with AAR, or manually doing so. Please refer to https://anbox-cloud.io/docs/exp/aar for all details.
+      "registry.mode": "pull",           // (pull/push/manual) Whether AMS should act as a client or publisher automatically synchronizing applications with AAR, or manually doing so. Please refer to https://anbox-cloud.io/docs/explanation/aar for all details.
       "registry.update_interval": "5s",  // (time) Frequency of updates from registry
       "registry.url": "https://127.0.0.1:3000", // (string) URL of Anbox Application Registry
       "scheduler.strategy": "spread"     // (spread|binpack) Container allocation schedule strategery
diff --git a/ref/anbox-https-api.md b/reference/anbox-https-api.md
similarity index 100%
rename from ref/anbox-https-api.md
rename to reference/anbox-https-api.md
diff --git a/ref/android-features.md b/reference/android-features.md
similarity index 100%
rename from ref/android-features.md
rename to reference/android-features.md
diff --git a/ref/api-reference.md b/reference/api-reference.md
similarity index 100%
rename from ref/api-reference.md
rename to reference/api-reference.md
diff --git a/ref/appliance-command-reference/ams.md b/reference/appliance-command-reference/ams.md
similarity index 100%
rename from ref/appliance-command-reference/ams.md
rename to reference/appliance-command-reference/ams.md
diff --git a/ref/appliance-command-reference/cluster.md b/reference/appliance-command-reference/cluster.md
similarity index 100%
rename from ref/appliance-command-reference/cluster.md
rename to reference/appliance-command-reference/cluster.md
diff --git a/ref/appliance-command-reference/dashboard.md b/reference/appliance-command-reference/dashboard.md
similarity index 100%
rename from ref/appliance-command-reference/dashboard.md
rename to reference/appliance-command-reference/dashboard.md
diff --git a/ref/appliance-command-reference/destroy.md b/reference/appliance-command-reference/destroy.md
similarity index 100%
rename from ref/appliance-command-reference/destroy.md
rename to reference/appliance-command-reference/destroy.md
diff --git a/ref/appliance-command-reference/gateway.md b/reference/appliance-command-reference/gateway.md
similarity index 100%
rename from ref/appliance-command-reference/gateway.md
rename to reference/appliance-command-reference/gateway.md
diff --git a/ref/appliance-command-reference/help.md b/reference/appliance-command-reference/help.md
similarity index 100%
rename from ref/appliance-command-reference/help.md
rename to reference/appliance-command-reference/help.md
diff --git a/ref/appliance-command-reference/init.md b/reference/appliance-command-reference/init.md
similarity index 100%
rename from ref/appliance-command-reference/init.md
rename to reference/appliance-command-reference/init.md
diff --git a/ref/appliance-command-reference/landing.md b/reference/appliance-command-reference/landing.md
similarity index 100%
rename from ref/appliance-command-reference/landing.md
rename to reference/appliance-command-reference/landing.md
diff --git a/ref/appliance-command-reference/status.md b/reference/appliance-command-reference/status.md
similarity index 100%
rename from ref/appliance-command-reference/status.md
rename to reference/appliance-command-reference/status.md
diff --git a/ref/appliance-command-reference/upgrade.md b/reference/appliance-command-reference/upgrade.md
similarity index 100%
rename from ref/appliance-command-reference/upgrade.md
rename to reference/appliance-command-reference/upgrade.md
diff --git a/ref/application-manifest.md b/reference/application-manifest.md
similarity index 100%
rename from ref/application-manifest.md
rename to reference/application-manifest.md
diff --git a/ref/component-versions.md b/reference/component-versions.md
similarity index 100%
rename from ref/component-versions.md
rename to reference/component-versions.md
diff --git a/ref/glossary.md b/reference/glossary.md
similarity index 100%
rename from ref/glossary.md
rename to reference/glossary.md
diff --git a/ref/hooks.md b/reference/hooks.md
similarity index 100%
rename from ref/hooks.md
rename to reference/hooks.md
diff --git a/ref/landing.md b/reference/landing.md
similarity index 100%
rename from ref/landing.md
rename to reference/landing.md
diff --git a/ref/license-information.md b/reference/license-information.md
similarity index 100%
rename from ref/license-information.md
rename to reference/license-information.md
diff --git a/ref/network-ports.md b/reference/network-ports.md
similarity index 100%
rename from ref/network-ports.md
rename to reference/network-ports.md
diff --git a/ref/perf-benchmarks.md b/reference/perf-benchmarks.md
similarity index 100%
rename from ref/perf-benchmarks.md
rename to reference/perf-benchmarks.md
diff --git a/ref/prometheus.md b/reference/prometheus.md
similarity index 100%
rename from ref/prometheus.md
rename to reference/prometheus.md
diff --git a/ref/provided-images.md b/reference/provided-images.md
similarity index 100%
rename from ref/provided-images.md
rename to reference/provided-images.md
diff --git a/release-notes/1.0.0.md b/reference/release-notes/1.0.0.md
similarity index 100%
rename from release-notes/1.0.0.md
rename to reference/release-notes/1.0.0.md
diff --git a/release-notes/1.0.1.md b/reference/release-notes/1.0.1.md
similarity index 100%
rename from release-notes/1.0.1.md
rename to reference/release-notes/1.0.1.md
diff --git a/release-notes/1.1.0.md b/reference/release-notes/1.1.0.md
similarity index 100%
rename from release-notes/1.1.0.md
rename to reference/release-notes/1.1.0.md
diff --git a/release-notes/1.1.1.md b/reference/release-notes/1.1.1.md
similarity index 100%
rename from release-notes/1.1.1.md
rename to reference/release-notes/1.1.1.md
diff --git a/release-notes/1.10.0.md b/reference/release-notes/1.10.0.md
similarity index 100%
rename from release-notes/1.10.0.md
rename to reference/release-notes/1.10.0.md
diff --git a/release-notes/1.10.1.md b/reference/release-notes/1.10.1.md
similarity index 100%
rename from release-notes/1.10.1.md
rename to reference/release-notes/1.10.1.md
diff --git a/release-notes/1.10.2.md b/reference/release-notes/1.10.2.md
similarity index 100%
rename from release-notes/1.10.2.md
rename to reference/release-notes/1.10.2.md
diff --git a/release-notes/1.10.3.md b/reference/release-notes/1.10.3.md
similarity index 100%
rename from release-notes/1.10.3.md
rename to reference/release-notes/1.10.3.md
diff --git a/release-notes/1.11.0.md b/reference/release-notes/1.11.0.md
similarity index 100%
rename from release-notes/1.11.0.md
rename to reference/release-notes/1.11.0.md
diff --git a/release-notes/1.11.1.md b/reference/release-notes/1.11.1.md
similarity index 100%
rename from release-notes/1.11.1.md
rename to reference/release-notes/1.11.1.md
diff --git a/release-notes/1.11.2.md b/reference/release-notes/1.11.2.md
similarity index 100%
rename from release-notes/1.11.2.md
rename to reference/release-notes/1.11.2.md
diff --git a/release-notes/1.11.3.md b/reference/release-notes/1.11.3.md
similarity index 100%
rename from release-notes/1.11.3.md
rename to reference/release-notes/1.11.3.md
diff --git a/release-notes/1.11.4.md b/reference/release-notes/1.11.4.md
similarity index 100%
rename from release-notes/1.11.4.md
rename to reference/release-notes/1.11.4.md
diff --git a/release-notes/1.11.5.md b/reference/release-notes/1.11.5.md
similarity index 100%
rename from release-notes/1.11.5.md
rename to reference/release-notes/1.11.5.md
diff --git a/release-notes/1.12.0.md b/reference/release-notes/1.12.0.md
similarity index 100%
rename from release-notes/1.12.0.md
rename to reference/release-notes/1.12.0.md
diff --git a/release-notes/1.12.1.md b/reference/release-notes/1.12.1.md
similarity index 100%
rename from release-notes/1.12.1.md
rename to reference/release-notes/1.12.1.md
diff --git a/release-notes/1.12.2.md b/reference/release-notes/1.12.2.md
similarity index 100%
rename from release-notes/1.12.2.md
rename to reference/release-notes/1.12.2.md
diff --git a/release-notes/1.12.3.md b/reference/release-notes/1.12.3.md
similarity index 100%
rename from release-notes/1.12.3.md
rename to reference/release-notes/1.12.3.md
diff --git a/release-notes/1.12.4.md b/reference/release-notes/1.12.4.md
similarity index 100%
rename from release-notes/1.12.4.md
rename to reference/release-notes/1.12.4.md
diff --git a/release-notes/1.12.5.md b/reference/release-notes/1.12.5.md
similarity index 100%
rename from release-notes/1.12.5.md
rename to reference/release-notes/1.12.5.md
diff --git a/release-notes/1.13.0.md b/reference/release-notes/1.13.0.md
similarity index 100%
rename from release-notes/1.13.0.md
rename to reference/release-notes/1.13.0.md
diff --git a/release-notes/1.13.1.md b/reference/release-notes/1.13.1.md
similarity index 100%
rename from release-notes/1.13.1.md
rename to reference/release-notes/1.13.1.md
diff --git a/release-notes/1.13.2.md b/reference/release-notes/1.13.2.md
similarity index 100%
rename from release-notes/1.13.2.md
rename to reference/release-notes/1.13.2.md
diff --git a/release-notes/1.14.0.md b/reference/release-notes/1.14.0.md
similarity index 100%
rename from release-notes/1.14.0.md
rename to reference/release-notes/1.14.0.md
diff --git a/release-notes/1.14.1.md b/reference/release-notes/1.14.1.md
similarity index 100%
rename from release-notes/1.14.1.md
rename to reference/release-notes/1.14.1.md
diff --git a/release-notes/1.14.2.md b/reference/release-notes/1.14.2.md
similarity index 100%
rename from release-notes/1.14.2.md
rename to reference/release-notes/1.14.2.md
diff --git a/release-notes/1.15.0.md b/reference/release-notes/1.15.0.md
similarity index 100%
rename from release-notes/1.15.0.md
rename to reference/release-notes/1.15.0.md
diff --git a/release-notes/1.15.1.md b/reference/release-notes/1.15.1.md
similarity index 100%
rename from release-notes/1.15.1.md
rename to reference/release-notes/1.15.1.md
diff --git a/release-notes/1.15.2.md b/reference/release-notes/1.15.2.md
similarity index 100%
rename from release-notes/1.15.2.md
rename to reference/release-notes/1.15.2.md
diff --git a/release-notes/1.15.3.md b/reference/release-notes/1.15.3.md
similarity index 100%
rename from release-notes/1.15.3.md
rename to reference/release-notes/1.15.3.md
diff --git a/release-notes/1.16.0.md b/reference/release-notes/1.16.0.md
similarity index 100%
rename from release-notes/1.16.0.md
rename to reference/release-notes/1.16.0.md
diff --git a/release-notes/1.16.1.md b/reference/release-notes/1.16.1.md
similarity index 100%
rename from release-notes/1.16.1.md
rename to reference/release-notes/1.16.1.md
diff --git a/release-notes/1.16.2.md b/reference/release-notes/1.16.2.md
similarity index 100%
rename from release-notes/1.16.2.md
rename to reference/release-notes/1.16.2.md
diff --git a/release-notes/1.16.3.md b/reference/release-notes/1.16.3.md
similarity index 100%
rename from release-notes/1.16.3.md
rename to reference/release-notes/1.16.3.md
diff --git a/release-notes/1.16.4.md b/reference/release-notes/1.16.4.md
similarity index 100%
rename from release-notes/1.16.4.md
rename to reference/release-notes/1.16.4.md
diff --git a/release-notes/1.17.0.md b/reference/release-notes/1.17.0.md
similarity index 100%
rename from release-notes/1.17.0.md
rename to reference/release-notes/1.17.0.md
diff --git a/release-notes/1.17.1.md b/reference/release-notes/1.17.1.md
similarity index 100%
rename from release-notes/1.17.1.md
rename to reference/release-notes/1.17.1.md
diff --git a/release-notes/1.17.2.md b/reference/release-notes/1.17.2.md
similarity index 100%
rename from release-notes/1.17.2.md
rename to reference/release-notes/1.17.2.md
diff --git a/release-notes/1.18.0.md b/reference/release-notes/1.18.0.md
similarity index 100%
rename from release-notes/1.18.0.md
rename to reference/release-notes/1.18.0.md
diff --git a/release-notes/1.18.1.md b/reference/release-notes/1.18.1.md
similarity index 100%
rename from release-notes/1.18.1.md
rename to reference/release-notes/1.18.1.md
diff --git a/release-notes/1.18.2.md b/reference/release-notes/1.18.2.md
similarity index 100%
rename from release-notes/1.18.2.md
rename to reference/release-notes/1.18.2.md
diff --git a/release-notes/1.19.0-fix1.md b/reference/release-notes/1.19.0-fix1.md
similarity index 100%
rename from release-notes/1.19.0-fix1.md
rename to reference/release-notes/1.19.0-fix1.md
diff --git a/release-notes/1.19.0.md b/reference/release-notes/1.19.0.md
similarity index 100%
rename from release-notes/1.19.0.md
rename to reference/release-notes/1.19.0.md
diff --git a/release-notes/1.19.1.md b/reference/release-notes/1.19.1.md
similarity index 100%
rename from release-notes/1.19.1.md
rename to reference/release-notes/1.19.1.md
diff --git a/release-notes/1.19.2.md b/reference/release-notes/1.19.2.md
similarity index 100%
rename from release-notes/1.19.2.md
rename to reference/release-notes/1.19.2.md
diff --git a/release-notes/1.2.0.md b/reference/release-notes/1.2.0.md
similarity index 100%
rename from release-notes/1.2.0.md
rename to reference/release-notes/1.2.0.md
diff --git a/release-notes/1.2.1.md b/reference/release-notes/1.2.1.md
similarity index 100%
rename from release-notes/1.2.1.md
rename to reference/release-notes/1.2.1.md
diff --git a/release-notes/1.20.0.md b/reference/release-notes/1.20.0.md
similarity index 100%
rename from release-notes/1.20.0.md
rename to reference/release-notes/1.20.0.md
diff --git a/release-notes/1.20.1.md b/reference/release-notes/1.20.1.md
similarity index 100%
rename from release-notes/1.20.1.md
rename to reference/release-notes/1.20.1.md
diff --git a/release-notes/1.20.2.md b/reference/release-notes/1.20.2.md
similarity index 100%
rename from release-notes/1.20.2.md
rename to reference/release-notes/1.20.2.md
diff --git a/release-notes/1.3.0.md b/reference/release-notes/1.3.0.md
similarity index 100%
rename from release-notes/1.3.0.md
rename to reference/release-notes/1.3.0.md
diff --git a/release-notes/1.3.1.md b/reference/release-notes/1.3.1.md
similarity index 100%
rename from release-notes/1.3.1.md
rename to reference/release-notes/1.3.1.md
diff --git a/release-notes/1.3.2.md b/reference/release-notes/1.3.2.md
similarity index 100%
rename from release-notes/1.3.2.md
rename to reference/release-notes/1.3.2.md
diff --git a/release-notes/1.3.3.md b/reference/release-notes/1.3.3.md
similarity index 100%
rename from release-notes/1.3.3.md
rename to reference/release-notes/1.3.3.md
diff --git a/release-notes/1.4.0.md b/reference/release-notes/1.4.0.md
similarity index 100%
rename from release-notes/1.4.0.md
rename to reference/release-notes/1.4.0.md
diff --git a/release-notes/1.5.0.md b/reference/release-notes/1.5.0.md
similarity index 100%
rename from release-notes/1.5.0.md
rename to reference/release-notes/1.5.0.md
diff --git a/release-notes/1.5.1.md b/reference/release-notes/1.5.1.md
similarity index 100%
rename from release-notes/1.5.1.md
rename to reference/release-notes/1.5.1.md
diff --git a/release-notes/1.5.2.md b/reference/release-notes/1.5.2.md
similarity index 100%
rename from release-notes/1.5.2.md
rename to reference/release-notes/1.5.2.md
diff --git a/release-notes/1.6.0.md b/reference/release-notes/1.6.0.md
similarity index 100%
rename from release-notes/1.6.0.md
rename to reference/release-notes/1.6.0.md
diff --git a/release-notes/1.6.1.md b/reference/release-notes/1.6.1.md
similarity index 100%
rename from release-notes/1.6.1.md
rename to reference/release-notes/1.6.1.md
diff --git a/release-notes/1.6.2.md b/reference/release-notes/1.6.2.md
similarity index 100%
rename from release-notes/1.6.2.md
rename to reference/release-notes/1.6.2.md
diff --git a/release-notes/1.6.3.md b/reference/release-notes/1.6.3.md
similarity index 100%
rename from release-notes/1.6.3.md
rename to reference/release-notes/1.6.3.md
diff --git a/release-notes/1.7.0.md b/reference/release-notes/1.7.0.md
similarity index 100%
rename from release-notes/1.7.0.md
rename to reference/release-notes/1.7.0.md
diff --git a/release-notes/1.7.1.md b/reference/release-notes/1.7.1.md
similarity index 100%
rename from release-notes/1.7.1.md
rename to reference/release-notes/1.7.1.md
diff --git a/release-notes/1.7.2.md b/reference/release-notes/1.7.2.md
similarity index 100%
rename from release-notes/1.7.2.md
rename to reference/release-notes/1.7.2.md
diff --git a/release-notes/1.7.3.md b/reference/release-notes/1.7.3.md
similarity index 100%
rename from release-notes/1.7.3.md
rename to reference/release-notes/1.7.3.md
diff --git a/release-notes/1.7.4.md b/reference/release-notes/1.7.4.md
similarity index 100%
rename from release-notes/1.7.4.md
rename to reference/release-notes/1.7.4.md
diff --git a/release-notes/1.8.0.md b/reference/release-notes/1.8.0.md
similarity index 100%
rename from release-notes/1.8.0.md
rename to reference/release-notes/1.8.0.md
diff --git a/release-notes/1.8.1.md b/reference/release-notes/1.8.1.md
similarity index 100%
rename from release-notes/1.8.1.md
rename to reference/release-notes/1.8.1.md
diff --git a/release-notes/1.8.2.md b/reference/release-notes/1.8.2.md
similarity index 100%
rename from release-notes/1.8.2.md
rename to reference/release-notes/1.8.2.md
diff --git a/release-notes/1.8.3.md b/reference/release-notes/1.8.3.md
similarity index 100%
rename from release-notes/1.8.3.md
rename to reference/release-notes/1.8.3.md
diff --git a/release-notes/1.9.0.md b/reference/release-notes/1.9.0.md
similarity index 100%
rename from release-notes/1.9.0.md
rename to reference/release-notes/1.9.0.md
diff --git a/release-notes/1.9.1.md b/reference/release-notes/1.9.1.md
similarity index 100%
rename from release-notes/1.9.1.md
rename to reference/release-notes/1.9.1.md
diff --git a/release-notes/1.9.2.md b/reference/release-notes/1.9.2.md
similarity index 100%
rename from release-notes/1.9.2.md
rename to reference/release-notes/1.9.2.md
diff --git a/release-notes/1.9.3.md b/reference/release-notes/1.9.3.md
similarity index 100%
rename from release-notes/1.9.3.md
rename to reference/release-notes/1.9.3.md
diff --git a/release-notes/1.9.4.md b/reference/release-notes/1.9.4.md
similarity index 100%
rename from release-notes/1.9.4.md
rename to reference/release-notes/1.9.4.md
diff --git a/release-notes/1.9.5.md b/reference/release-notes/1.9.5.md
similarity index 100%
rename from release-notes/1.9.5.md
rename to reference/release-notes/1.9.5.md
diff --git a/release-notes/release-notes-template.md b/reference/release-notes/release-notes-template.md
similarity index 93%
rename from release-notes/release-notes-template.md
rename to reference/release-notes/release-notes-template.md
index ecf06708..8a8e822b 100644
--- a/release-notes/release-notes-template.md
+++ b/reference/release-notes/release-notes-template.md
@@ -2,7 +2,7 @@
 
 The Anbox Cloud team is pleased to announce the release of Anbox Cloud < release-version >.
 
-Please see [component versions](https://anbox-cloud.io/docs/ref/component-versions) for a list of updated components.
+Please see [component versions](https://anbox-cloud.io/docs/reference/component-versions) for a list of updated components.
 
 ## New features & improvements
 
diff --git a/ref/release-notes.md b/reference/release-notes/release-notes.md
similarity index 100%
rename from ref/release-notes.md
rename to reference/release-notes/release-notes.md
diff --git a/ref/releases-versions.md b/reference/releases-versions.md
similarity index 100%
rename from ref/releases-versions.md
rename to reference/releases-versions.md
diff --git a/ref/requirements.md b/reference/requirements.md
similarity index 100%
rename from ref/requirements.md
rename to reference/requirements.md
diff --git a/ref/roadmap.md b/reference/roadmap.md
similarity index 100%
rename from ref/roadmap.md
rename to reference/roadmap.md
diff --git a/ref/sdks.md b/reference/sdks.md
similarity index 100%
rename from ref/sdks.md
rename to reference/sdks.md
diff --git a/ref/supported-codecs.md b/reference/supported-codecs.md
similarity index 100%
rename from ref/supported-codecs.md
rename to reference/supported-codecs.md
diff --git a/ref/supported-rendering-resources.md b/reference/supported-rendering-resources.md
similarity index 100%
rename from ref/supported-rendering-resources.md
rename to reference/supported-rendering-resources.md
diff --git a/ref/supported-versions.md b/reference/supported-versions.md
similarity index 100%
rename from ref/supported-versions.md
rename to reference/supported-versions.md
diff --git a/ref/webrtc-streamer.md b/reference/webrtc-streamer.md
similarity index 100%
rename from ref/webrtc-streamer.md
rename to reference/webrtc-streamer.md
diff --git a/scripts/generate-ams-config.py b/scripts/generate-ams-config.py
index aa067f03..b87bdec2 100644
--- a/scripts/generate-ams-config.py
+++ b/scripts/generate-ams-config.py
@@ -4,7 +4,7 @@
 
 tables = {}
 
-with open("ref/ams-configuration.yaml", 'r') as f:
+with open("reference/ams-configuration.yaml", 'r') as f:
 
     config = yaml.safe_load(f)
 
@@ -23,7 +23,7 @@
         tables[which] = table
 
 # Open the template file for reading and the Markdown file for writing
-with open("ref/ams-configuration.tmpl.md", 'r') as infile, open("ref/ams-configuration.md", 'w') as outfile:
+with open("reference/ams-configuration.tmpl.md", 'r') as infile, open("reference/ams-configuration.md", 'w') as outfile:
     outfile.write("<!-- DO NOT EDIT THIS FILE. IT IS GENERATED AUTOMATICALLY. -->\n")
     outfile.write("<!-- Edit ams-configuration.tmpl.md and ams-configuration.yaml instead. -->\n\n")
 
diff --git a/scripts/publish-pr.py b/scripts/publish-pr.py
index 8ec0ee4f..b7fa8c35 100644
--- a/scripts/publish-pr.py
+++ b/scripts/publish-pr.py
@@ -13,7 +13,7 @@
 
     for one in data:
         filename = one['filename']
-        if (filename == "ref/ams-configuration.yaml") or (filename == "ref/ams-configuration.tmpl.md"):
-            filename = "ref/ams-configuration.md"
+        if (filename == "reference/ams-configuration.yaml") or (filename == "reference/ams-configuration.tmpl.md"):
+            filename = "reference/ams-configuration.md"
         print("Publish "+filename)
         subprocess.call("./publish.sh "+filename, shell=True)
diff --git a/tut/creating-addon.md b/tutorial/creating-addon.md
similarity index 100%
rename from tut/creating-addon.md
rename to tutorial/creating-addon.md
diff --git a/tut/getting-started-dashboard.md b/tutorial/getting-started-dashboard.md
similarity index 100%
rename from tut/getting-started-dashboard.md
rename to tutorial/getting-started-dashboard.md
diff --git a/tut/getting-started.md b/tutorial/getting-started.md
similarity index 100%
rename from tut/getting-started.md
rename to tutorial/getting-started.md
diff --git a/tut/installing-appliance.md b/tutorial/installing-appliance.md
similarity index 100%
rename from tut/installing-appliance.md
rename to tutorial/installing-appliance.md
diff --git a/tut/landing.md b/tutorial/landing.md
similarity index 100%
rename from tut/landing.md
rename to tutorial/landing.md
diff --git a/tut/stream-client.md b/tutorial/stream-client.md
similarity index 100%
rename from tut/stream-client.md
rename to tutorial/stream-client.md