diff --git a/cloud/cloud-v2/api.md b/cloud/api.md
similarity index 100%
rename from cloud/cloud-v2/api.md
rename to cloud/api.md
diff --git a/cloud/callback.png b/cloud/cloud-v1/callback.png
similarity index 100%
rename from cloud/callback.png
rename to cloud/cloud-v1/callback.png
diff --git a/cloud/devices.png b/cloud/cloud-v1/devices.png
similarity index 100%
rename from cloud/devices.png
rename to cloud/cloud-v1/devices.png
diff --git a/cloud/groups.png b/cloud/cloud-v1/groups.png
similarity index 100%
rename from cloud/groups.png
rename to cloud/cloud-v1/groups.png
diff --git a/cloud/hardwario-cloud.png b/cloud/cloud-v1/hardwario-cloud.png
similarity index 100%
rename from cloud/hardwario-cloud.png
rename to cloud/cloud-v1/hardwario-cloud.png
diff --git a/cloud/introduction.md b/cloud/cloud-v1/introduction.md
similarity index 100%
rename from cloud/introduction.md
rename to cloud/cloud-v1/introduction.md
diff --git a/cloud/messages.png b/cloud/cloud-v1/messages.png
similarity index 100%
rename from cloud/messages.png
rename to cloud/cloud-v1/messages.png
diff --git a/cloud/overview.md b/cloud/cloud-v1/overview.md
similarity index 100%
rename from cloud/overview.md
rename to cloud/cloud-v1/overview.md
diff --git a/cloud/user-config.png b/cloud/cloud-v1/user-config.png
similarity index 100%
rename from cloud/user-config.png
rename to cloud/cloud-v1/user-config.png
diff --git a/cloud/cloud-v2/connector-new.png b/cloud/connector-new.png
similarity index 100%
rename from cloud/cloud-v2/connector-new.png
rename to cloud/connector-new.png
diff --git a/cloud/cloud-v2/connector-preview.png b/cloud/connector-preview.png
similarity index 100%
rename from cloud/cloud-v2/connector-preview.png
rename to cloud/connector-preview.png
diff --git a/cloud/cloud-v2/connector-transformation.png b/cloud/connector-transformation.png
similarity index 100%
rename from cloud/cloud-v2/connector-transformation.png
rename to cloud/connector-transformation.png
diff --git a/cloud/cloud-v2/connectors.md b/cloud/connectors.md
similarity index 100%
rename from cloud/cloud-v2/connectors.md
rename to cloud/connectors.md
diff --git a/cloud/cloud-v2/device-create.png b/cloud/device-create.png
similarity index 100%
rename from cloud/cloud-v2/device-create.png
rename to cloud/device-create.png
diff --git a/cloud/cloud-v2/devices.md b/cloud/devices.md
similarity index 100%
rename from cloud/cloud-v2/devices.md
rename to cloud/devices.md
diff --git a/cloud/cloud-v2/downlink-data.png b/cloud/downlink-data.png
similarity index 100%
rename from cloud/cloud-v2/downlink-data.png
rename to cloud/downlink-data.png
diff --git a/cloud/cloud-v2/downlink.md b/cloud/downlink.md
similarity index 100%
rename from cloud/cloud-v2/downlink.md
rename to cloud/downlink.md
diff --git a/cloud/cloud-v2/fota-download-firmware.png b/cloud/fota-download-firmware.png
similarity index 100%
rename from cloud/cloud-v2/fota-download-firmware.png
rename to cloud/fota-download-firmware.png
diff --git a/cloud/cloud-v2/fota-list.png b/cloud/fota-list.png
similarity index 100%
rename from cloud/cloud-v2/fota-list.png
rename to cloud/fota-list.png
diff --git a/cloud/cloud-v2/fota-timeline.png b/cloud/fota-timeline.png
similarity index 100%
rename from cloud/cloud-v2/fota-timeline.png
rename to cloud/fota-timeline.png
diff --git a/cloud/cloud-v2/fota.md b/cloud/fota.md
similarity index 100%
rename from cloud/cloud-v2/fota.md
rename to cloud/fota.md
diff --git a/cloud/cloud-v2/index.md b/cloud/index.md
similarity index 98%
rename from cloud/cloud-v2/index.md
rename to cloud/index.md
index bbfc318..ad1f3d0 100644
--- a/cloud/cloud-v2/index.md
+++ b/cloud/index.md
@@ -1,10 +1,10 @@
 ---
 slug: /
-title: Cloud v2
+title: HARDWARIO Cloud
 ---
 import Image from '@theme/IdealImage';
 
-# Cloud v2
+# HARDWARIO Cloud
 
 [**HARDWARIO Cloud v2**](https://prod.hardwario.cloud/) offers new CHESTER device management with bidirectional communication support.
 
diff --git a/cloud/cloud-v2/messages.md b/cloud/messages.md
similarity index 100%
rename from cloud/cloud-v2/messages.md
rename to cloud/messages.md
diff --git a/cloud/cloud-v2/shell-console.png b/cloud/shell-console.png
similarity index 100%
rename from cloud/cloud-v2/shell-console.png
rename to cloud/shell-console.png
diff --git a/cloud/cloud-v2/shell-icon.png b/cloud/shell-icon.png
similarity index 100%
rename from cloud/cloud-v2/shell-icon.png
rename to cloud/shell-icon.png
diff --git a/cloud/cloud-v2/tags.md b/cloud/tags.md
similarity index 82%
rename from cloud/cloud-v2/tags.md
rename to cloud/tags.md
index 51da930..0589a3b 100644
--- a/cloud/cloud-v2/tags.md
+++ b/cloud/tags.md
@@ -11,4 +11,4 @@ Tags are also crucial with **Connectors**. The same tag connects device(s) and c
 
 Tags are defined by its **name** and **color**.
 
-For proper naming, follow [**Naming Conventions**](index.md#naming-conventions).
+For proper naming, follow [**Naming Conventions**](./index.md#naming-conventions).
diff --git a/cloud/cloud-v2/users.md b/cloud/users.md
similarity index 100%
rename from cloud/cloud-v2/users.md
rename to cloud/users.md
diff --git a/sidebars-cloud.js b/sidebars-cloud.js
index e8edccd..b791867 100644
--- a/sidebars-cloud.js
+++ b/sidebars-cloud.js
@@ -3,19 +3,15 @@
 /** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
 const sidebars = {
   docs: [
-    {
-      type: 'category',
-      label: 'Cloud v2',
-      link: {
-        type: 'doc',
-        id: 'cloud-v2/index',
-      },
-      collapsed: false,
-      items: [
-        'cloud-v2/devices', 'cloud-v2/messages', 'cloud-v2/tags', 'cloud-v2/connectors', 'cloud-v2/users', 'cloud-v2/downlink',
-        'cloud-v2/fota', 'cloud-v2/api'
-      ]
-    },
+    'index',
+    'devices',
+    'messages',
+    'tags',
+    'connectors',
+    'users',
+    'downlink',
+    'fota',
+    'api',
     {
       type: 'category',
       label: 'Cloud v1',
@@ -24,8 +20,8 @@ const sidebars = {
       },
       collapsed: true,
       items: [
-        'introduction',
-        'overview',
+        'cloud-v1/introduction',
+        'cloud-v1/overview',
       ]
     }
   ],