diff --git a/docs/components/addon-modules/_category_.json b/docs/components/addon-modules/_category_.json
index fbd9994c..81ad93ed 100644
--- a/docs/components/addon-modules/_category_.json
+++ b/docs/components/addon-modules/_category_.json
@@ -1,5 +1,5 @@
 {
-  "label": "Addon Modules",
+  "label": "Hardware Addon Modules",
   "position": 3,
   "collapsed": true
 }
diff --git a/docs/components/enclosures/IMG_0368.jpg b/docs/components/enclosures/IMG_0368.jpg
deleted file mode 100644
index 971902a3..00000000
Binary files a/docs/components/enclosures/IMG_0368.jpg and /dev/null differ
diff --git a/docs/components/enclosures/_category_.json b/docs/components/enclosures/_category_.json
index 47ae191f..9daa8796 100644
--- a/docs/components/enclosures/_category_.json
+++ b/docs/components/enclosures/_category_.json
@@ -1,5 +1,5 @@
 {
-  "label": "Enclosures",
+  "label": "Device Enclosures",
   "position": 2,
   "collapsed": true
 }
diff --git a/docs/components/enclosures/img/Lobaro-Design-Cover-wmbus-gateway.jpg b/docs/components/enclosures/img/Lobaro-Design-Cover-wmbus-gateway.jpg
new file mode 100644
index 00000000..8987d1dc
Binary files /dev/null and b/docs/components/enclosures/img/Lobaro-Design-Cover-wmbus-gateway.jpg differ
diff --git a/docs/components/enclosures/img/Lobaro-housing-dimensions2.jpg b/docs/components/enclosures/img/Lobaro-housing-dimensions2.jpg
new file mode 100644
index 00000000..d2a950e6
Binary files /dev/null and b/docs/components/enclosures/img/Lobaro-housing-dimensions2.jpg differ
diff --git a/docs/components/enclosures/img/housing-spelsberg-closed.jpg b/docs/components/enclosures/img/housing-spelsberg-closed.jpg
new file mode 100644
index 00000000..227c94fe
Binary files /dev/null and b/docs/components/enclosures/img/housing-spelsberg-closed.jpg differ
diff --git a/docs/components/enclosures/index.md b/docs/components/enclosures/index.md
index 4cded633..4313d3c4 100644
--- a/docs/components/enclosures/index.md
+++ b/docs/components/enclosures/index.md
@@ -3,6 +3,3 @@ sidebar_position: 1
 ---
 
 # Device Enclosures
-
-
-<Image alt='a Housing' img={require('./IMG_0368.jpg')} style={{width:'57%'}}/>
\ No newline at end of file
diff --git a/docs/components/enclosures/spelsberg_TG_PC_1208-6-o.md b/docs/components/enclosures/spelsberg_TG_PC_1208-6-o.md
new file mode 100644
index 00000000..cd993cba
--- /dev/null
+++ b/docs/components/enclosures/spelsberg_TG_PC_1208-6-o.md
@@ -0,0 +1,43 @@
+---
+sidebar_position: 1
+displayed_sidebar: componentsSidebar
+title: Spelsberg TG PC 1208-6-o
+---
+
+# Spelsberg TG PC 1208-6-o
+
+<Image alt='Spelsberg TG PC 1208-6-o Housing'
+img={require('./img/housing-spelsberg-closed.jpg')}
+style={{width: '50%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+* [Product Specifications (external Link)](https://www.spelsberg.com/industrial-housing/plain-with-mounting-cams/20040401/)
+* Size: 122mm (w) x 82mm (l) x 55mm (h)
+* IP Rating: IP65
+* Max. 70% relative humidity, condensation must be ruled out.
+
+:::warning[Outdoor installations]
+This housing is suited for installations in industrial environments and **protected** outdoor areas only!
+
+For operation in manholes or other challenging environmental conditions, we also recommend encapsulating the
+electronics and/or coat the PCBA. Please contact Lobaro for details.
+:::
+
+## Dimensions
+
+<Image alt='Spelsberg TG PC 1208-6-o Dimensions'
+img={require('./img/Lobaro-housing-dimensions2.jpg')}
+style={{width: '80%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+## Accessories
+
+### Design Cover
+
+The Lobaro Design housing cover allows the TG PC 1208-6-o to be installed inconspicuously and in an aesthetically pleasing manner:
+
+<Image alt='Spelsberg TG PC 1208-6-o Housing'
+img={require('./img/Lobaro-Design-Cover-wmbus-gateway.jpg')}
+style={{width: '55%', paddingTop: '0px', paddingBottom: '10px'}}/>
+
+
+* Housing cover 138mm x 109mm
+* Lobaro PN: **8000162**
\ No newline at end of file
diff --git a/docs/components/firmware/_category_.json b/docs/components/firmware/_category_.json
index f8be4d01..0eca2a4e 100644
--- a/docs/components/firmware/_category_.json
+++ b/docs/components/firmware/_category_.json
@@ -1,5 +1,5 @@
 {
-  "label": "Firmware",
+  "label": "Firmware Manuals",
   "position": 1,
   "collapsed": true
 }
diff --git a/docs/components/firmware/app-nrf9160-wmbus/compatible-hardware.md b/docs/components/firmware/app-nrf9160-wmbus/compatible-hardware.md
deleted file mode 100644
index 4e89bbeb..00000000
--- a/docs/components/firmware/app-nrf9160-wmbus/compatible-hardware.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-sidebar_position: 99
-displayed_sidebar: componentsSidebar
-title: Compatible Hardware
----
-
-# Compatible Hardware
-
diff --git a/docs/components/firmware/index.md b/docs/components/firmware/index.md
index e266994b..219b8cff 100644
--- a/docs/components/firmware/index.md
+++ b/docs/components/firmware/index.md
@@ -2,6 +2,6 @@
 sidebar_position: 0
 ---
 
-# Firmware Overview
+# Firmware Manuals
 
 
diff --git a/docs/components/index.md b/docs/components/index.md
index 413b4e08..0e4ed799 100644
--- a/docs/components/index.md
+++ b/docs/components/index.md
@@ -4,10 +4,8 @@ displayed_sidebar: componentsSidebar
 title: Overview
 ---
 
-# Components Overview
-
-<IIcon icon="fluent-mdl2:web-components" height="64" /> 
-
+# Product Components
+---
 Lobaro Products are made from components.
 
 This section describes the different available firmware implementation. In different products the same firmware is
diff --git a/docs/configuration/index.md b/docs/configuration/index.md
index 5a479cd2..633d3e35 100644
--- a/docs/configuration/index.md
+++ b/docs/configuration/index.md
@@ -4,11 +4,8 @@ displayed_sidebar: configurationSidebar
 title: Overview
 ---
 
-# Configuration Overview
-
-<IIcon icon="hugeicons:configuration-02" height="80" /> 
-
-
+# Device Configuration 
+---
 The device configuration allows a wide range and flexible way of internal settings adjustments for Lobaro hardware.
 This chapter generally describes our tools, common configuration parameters and workflows that are used in the same way
 for many
diff --git a/docs/configuration/lobaro-config-tool.md b/docs/configuration/lobaro-config-tool.md
index 8287247f..4cf65c5e 100644
--- a/docs/configuration/lobaro-config-tool.md
+++ b/docs/configuration/lobaro-config-tool.md
@@ -171,7 +171,7 @@ If you need to parse the log messages of one of our Devices with your own tools,
 Maintenance Tool by using any serial UART reader. You can find the UART parameters above. Take care on the additional
 control lines (DTR, RTS) to have the right state to keep the device run the firmware.
 
-## Device Firmwareupdate
+## Device Firmwareupdate{#fwupdate}
 
 Our devices are shipped ready to use with firmware installed on them, so normally you do not need to install firmware
 yourself. However, over time we sometimes add new features to our devices or fix bugs that come up over time. If you
diff --git a/docs/img/lobaro-office.png b/docs/img/lobaro-office.png
deleted file mode 100644
index 7e7449a1..00000000
Binary files a/docs/img/lobaro-office.png and /dev/null differ
diff --git a/docs/index.md b/docs/index.md
index b74d512f..df77d349 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,35 +1,12 @@
 ---
 sidebar_position: 0
+title: Overview
+---
+# Lobaro Documentation Center
 ---
 
-# Lobaro Documentation
-
-<Image img={require('./img/lobaro-logo.png')} style={{width:'30%',margin:'0 0 20px 0',alt:'Lobaro Logo'}}/>
+<Image img={require('./img/lobaro-logo.png')} style={{width:'20%',margin:'0 0 20px 0',alt:'Lobaro Logo'}}/>
 
 :::info
 This new documentation center is currently work in progress
 :::
-
-
-
-<Image img={require('./img/lobaro-office.png')} style={{width:'80%',alt:'Lobaro Office'}}/>
-
-* [ ] ddd
-* [x] d
-* [ ] d
-* [ ] d
-* [ ] d
-  
-<Tabs>
-  <TabItem value="apple" label="Apple" default>
-    This is an apple 🍎
-  </TabItem>
-  <TabItem value="orange" label="Orange">
-    This is an orange 🍊
-  </TabItem>
-  <TabItem value="banana" label="Banana">
-    This is a banana 🍌
-  </TabItem>
-</Tabs>
-
-
diff --git a/docs/knowledge-base/playground.md b/docs/knowledge-base/playground.md
index b9d9264c..a5696451 100644
--- a/docs/knowledge-base/playground.md
+++ b/docs/knowledge-base/playground.md
@@ -20,10 +20,16 @@ From https://docusaurus.community/
 <IIcon icon="charm:github" height="48" /> This is a GitHub icon.
 
 ```jsx title="Include Icons"
-<IIcon icon="mdi:github" height="48" /> This is a GitHub icon.
+<IIcon icon="mdi:github" height="48"/>
+This
+is
+a
+GitHub
+icon.
 ```
 
-Iconify have a superb [Icon Explorer](https://icon-sets.iconify.design/) where you can search for icons and copy the code to use in your documentation.
+Iconify have a superb [Icon Explorer](https://icon-sets.iconify.design/) where you can search for icons and copy the
+code to use in your documentation.
 
 ## Images
 
@@ -232,10 +238,12 @@ Files should be placed nearby the doc source files in a `./files` directory.
 </tr></table>
 
 ```jsx title="Download"
-<table><tr>
-    <td><Image alt='PDF Download' img={require('@site/static/img/pdf.png')} style={{width: '32px'}}/></td>
-    <td><a target="\_blank" href={require('./files/en---sensusrf-brochure.pdf').default}>Download this PDF </a></td>
-</tr></table>
+<table>
+    <tr>
+        <td><Image alt='PDF Download' img={require('@site/static/img/pdf.png')} style={{width: '32px'}}/></td>
+        <td><a target="\_blank" href={require('./files/en---sensusrf-brochure.pdf').default}>Download this PDF </a></td>
+    </tr>
+</table>
 ```
 
 ## Horizontal Rule
@@ -245,3 +253,30 @@ Files should be placed nearby the doc source files in a `./files` directory.
 ```markdown title="Three dashes form a horizontal rule in md"
 ---
 ```
+
+## Checkboxes
+
+* [ ] ddd
+* [x] d
+* [ ] d
+* [ ] d
+* [ ] d
+*
+
+## Links
+
+```markdown title="File Links"
+[file path to another document](./installation.mdx)
+
+You can write [links](/otherFolder/doc4.mdx) relative to the content root (`/docs/`).
+
+You can also write [links](/docs/otherFolder/doc4.mdx) relative to the site directory, but it's not recommended.
+```
+
+Relative file paths are resolved against the current file's directory. Absolute file paths, on the other hand, are
+resolved relative to the content root, usually docs/, blog/, or localized ones like
+i18n/zh-Hans/plugin-content-docs/current.
+
+Absolute file paths can also be relative to the site directory. However, beware that links that begin with /docs/ or
+/blog/ are not portable as you would need to manually update them if you create new doc versions or localize them.
+
diff --git a/docs/platform/administration/server-certificates.md b/docs/platform/administration/server-certificates.md
index 3d7d51e3..4754045d 100644
--- a/docs/platform/administration/server-certificates.md
+++ b/docs/platform/administration/server-certificates.md
@@ -32,7 +32,7 @@ The key must be created at the Platform server and should never leave the system
 
     openssl ecparam -name prime256v1 -genkey -noout -out platform.key
 
-:::error
+:::danger
 Do not send the resulting private key file `platform.key` to anyone.
 :::
 
diff --git a/docs/platform/index.md b/docs/platform/index.md
index 68aad9e9..40541f9e 100644
--- a/docs/platform/index.md
+++ b/docs/platform/index.md
@@ -5,9 +5,7 @@ title: Overview
 ---
 
 # Lobaro IoT Platform
-
-<IIcon icon="oui:app-graph" height="64" /> 
-
+---
 
 The Lobaro IoT Platform operates as a **Head End System for IoT Devices**. The Platform is optimized for but not limited
 to handle Lobaro devices.
diff --git a/docs/products/img/MBusWirelessLogo.png b/docs/products/img/MBusWirelessLogo.png
new file mode 100644
index 00000000..af643954
Binary files /dev/null and b/docs/products/img/MBusWirelessLogo.png differ
diff --git a/docs/products/index.md b/docs/products/index.md
index 896af940..91747f23 100644
--- a/docs/products/index.md
+++ b/docs/products/index.md
@@ -3,10 +3,19 @@ sidebar_position: 0
 displayed_sidebar: productsSidebar
 title: Overview
 ---
-# Products Overview
 
-<IIcon icon="hugeicons:wireless" height="64" /> 
+# Lobaro IoT Products
+---
+
+## Metering Gateways
+
+### Wireless M-BUS Gateways
+
+<Image alt='Wireless M-BUS Logo'
+img={require('./img/MBusWirelessLogo.png')}
+style={{width: '15%', paddingTop: '0px', paddingBottom: '10px'}}/>
+
+| Name                                                                                 | Lobaro PN | Firmware                                                                    | Power Supply   | Antenna      | Notes |
+|:-------------------------------------------------------------------------------------|:----------|-----------------------------------------------------------------------------|----------------|--------------|-------|
+| [Wireless M-BUS Gateway V3](/products/metering-gateways/wireless-mbus-gateway-v3.md) | `8000162` | [app-nrf9160-wmbus](/components/firmware/app-nrf9160-wmbus/introduction.md) | 1x D-Cell 3.6V | Internal PCB |       |
 
-:::info
-This new documentation center is currently work in progress
-:::
diff --git a/docs/products/metering-gateways/img/GW_V3_Internal_Components.png b/docs/products/metering-gateways/img/GW_V3_Internal_Components.png
new file mode 100644
index 00000000..fec85a78
Binary files /dev/null and b/docs/products/metering-gateways/img/GW_V3_Internal_Components.png differ
diff --git a/docs/products/metering-gateways/img/HYB-DINRAIL-WMBUS-full.png b/docs/products/metering-gateways/img/HYB-DINRAIL-WMBUS-full.png
new file mode 100644
index 00000000..604d6143
Binary files /dev/null and b/docs/products/metering-gateways/img/HYB-DINRAIL-WMBUS-full.png differ
diff --git a/docs/products/metering-gateways/img/LOB-GW-HYB-WMBUS_wmbus-gateway-v3_Lorawan_NB-IoT_noBorder.jpg b/docs/products/metering-gateways/img/LOB-GW-HYB-WMBUS_wmbus-gateway-v3_Lorawan_NB-IoT_noBorder.jpg
new file mode 100644
index 00000000..6ae66415
Binary files /dev/null and b/docs/products/metering-gateways/img/LOB-GW-HYB-WMBUS_wmbus-gateway-v3_Lorawan_NB-IoT_noBorder.jpg differ
diff --git a/docs/products/metering-gateways/img/Lobaro-Solar-Gateway-wireless-Mbus.jpg b/docs/products/metering-gateways/img/Lobaro-Solar-Gateway-wireless-Mbus.jpg
new file mode 100644
index 00000000..950e0839
Binary files /dev/null and b/docs/products/metering-gateways/img/Lobaro-Solar-Gateway-wireless-Mbus.jpg differ
diff --git a/docs/products/metering-gateways/img/Lobaro_WMB_HYB-WMBUS-full_.jpg b/docs/products/metering-gateways/img/Lobaro_WMB_HYB-WMBUS-full_.jpg
new file mode 100644
index 00000000..9eac88f8
Binary files /dev/null and b/docs/products/metering-gateways/img/Lobaro_WMB_HYB-WMBUS-full_.jpg differ
diff --git a/docs/products/metering-gateways/img/labelv3.png b/docs/products/metering-gateways/img/labelv3.png
new file mode 100644
index 00000000..bc0e21c2
Binary files /dev/null and b/docs/products/metering-gateways/img/labelv3.png differ
diff --git a/docs/products/metering-gateways/index.md b/docs/products/metering-gateways/index.md
deleted file mode 100644
index 139d84d0..00000000
--- a/docs/products/metering-gateways/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-sidebar_position: 1
----
-
-# Metering Gateway
-
-:::info
-This new documentation center is currently work in progress
-:::
-
diff --git a/docs/products/metering-gateways/wireless-mbus-gateway-dinrail-230V.md b/docs/products/metering-gateways/wireless-mbus-gateway-dinrail-230V.md
new file mode 100644
index 00000000..c429e9ca
--- /dev/null
+++ b/docs/products/metering-gateways/wireless-mbus-gateway-dinrail-230V.md
@@ -0,0 +1,118 @@
+---
+sidebar_position: 3
+displayed_sidebar: productsSidebar
+title: wM-Bus GW (230V)
+---
+
+# Wireless M-Bus Gateway (230V)
+
+<Image alt='Wireless M-Bus Gateway (230V)'
+img={require('./img/HYB-DINRAIL-WMBUS-full.png')}
+style={{width: '40%', paddingTop: '0px', paddingBottom: '0px'}}/>
+
+## Product Identification
+
+<Image alt='Label Wireless M-BUS Gateway V3 (Battery)'
+img={require('./img/labelv3.png')}
+style={{width: '25%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+* Product Name: **Wireless M-Bus Gateway V3 (Battery)**
+* Product Type: **LOB-GW-HYB-WMBUS**
+* Lobaro PN: `8000162`
+
+## Description
+
+Battery-powered gateway for regular remote reading of up to 650...800 wireless M-Bus (868 MHz) and Sensus RF consumption
+meters (e.g. water meters, heat cost allocators) via NB-IoT, LTE-M mobile radio or LoRaWAN to the Internet. Suitable for
+indoor and weather-protected outdoor installation. Ideal for intra-year consumption information (uVI) and billing in the
+housing industry.
+
+### Used Components{#components}
+
+:::info
+This product is made from the following components, please see the individual common descriptions for
+further details!
+:::
+
+* Firmware:
+    * Manual: [app-nrf9160-wmbus](/components/firmware/app-nrf9160-wmbus/introduction.md)
+    * Latest Firmware Update: [Download](https://files.lobaro.com/s/9Zo3KQnXJDHNMgE) †
+* Housing:
+    * Type: [TG PC 1208-6-o](/components/enclosures/spelsberg_TG_PC_1208-6-o.md)
+
+:::tip[How to update the firmware]
+† Please see [Lobaro Tool description](/configuration/lobaro-config-tool#fwupdate) for information on how to update the
+firmware.
+:::
+
+## Datasheet & Quickstart
+
+| Document Type            | PDF Download                                                                                                                                                 |
+|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Data sheet + Quickstart  | [🇩🇪 Download](https://files.lobaro.com/index.php/s/SArz8mXdRTwyCHQ/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/zS2J32EZX6mTxtQ/download) |
+| 1-Page Printable version | [🇩🇪 Download](https://files.lobaro.com/index.php/s/r6M8kEsE2jwEQGx/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/yFiXeAX7yoBH67s/download) |
+
+* Print settings: DIN A4 double sided, flip on short side
+* Folding: You can fold it to a six page leaflet, using the marker next to "Initial operation".
+
+## DoC
+
+* EU declaration of conformity (DoC): [🇬🇧 Download](https://files.lobaro.com/index.php/s/BKTJMPwmcg9Hs3n/download)
+
+## Product specific details
+
+:::info
+Information provided in this chapter is only valid for the above product unless otherwise noted. In case of doubt,
+the information in this section takes precedence over the general [description of any component](#components).
+:::
+
+### Device Components{#devicecomponents}
+<Image alt='Gateway V3 Internal Components'
+img={require('./img/GW_V3_Internal_Components.png')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+1. Battery connector (XH)
+2. SIM card socket (4FF - nano)
+3. Reset button
+4. Status LED (Blue, Green, Red)
+5. Connector for [USB configuration adapter](/configuration/usb-config-adapter.md)
+6. MicroSD card socket (unused by firmware)
+7. Connector for internal PCB antenna
+8. 3.6V D-Cell battery incl. loop tape 
+9. Pressure compensation element (PCE)
+
+### LED signal patterns
+
+The device has 3 three LEDs (B, G, R = Blue, Green, Red), labeled `Status` on the PCB: 🔵🟢🔴. 
+
+See also item [(4)](#devicecomponents) under device components listing.
+
+#### Patterns during booting/restart
+
+* 🔵⚪🔴 B and R on: Device is in Bootloader Mode (not actively running, remove config adapter press reset to leave
+  Bootloader Mode).
+* ⚪🟢⚪ G on for ~2s and off again: Device just booted, either after power on, reset b button or software, or after a hard
+  failure.
+* ⚪⚪🔴 R flashes repeatedly on and off in 1s interval: critical failure during boot (failed to start application).
+
+#### Patterns during normal operation
+
+* 🔵⚪⚪ B flashes 1s on and 1s off in loop: building LTE connection to mobile provider. Followed by:
+    * ⚪🟢⚪ Short G flash on success.
+    * ⚪⚪🔴 Short R flash after connection failed.
+* There are no patterns during normal LoRaWAN operation.
+
+#### Exceptional patterns
+
+* 🔵⚪🔴/⚪🟢🔴 Quickly changing between R & B and G & B every 5s in a loop: Modem is in connection restriction mode - keep
+  device on power, will fix itself after 30min.
+
+### Battery Lifetime Calculator
+
+Please
+see [online spreadsheet](https://docs.google.com/spreadsheets/d/1BjEO0UShdWuhaDqwDWPEtqszOBqUVfBH85dvtvdCjlA/edit?usp=sharing).
+
+
+
+
+
diff --git a/docs/products/metering-gateways/wireless-mbus-gateway-dinrail-concentrator.md b/docs/products/metering-gateways/wireless-mbus-gateway-dinrail-concentrator.md
new file mode 100644
index 00000000..61dfaf76
--- /dev/null
+++ b/docs/products/metering-gateways/wireless-mbus-gateway-dinrail-concentrator.md
@@ -0,0 +1,118 @@
+---
+sidebar_position: 4
+displayed_sidebar: productsSidebar
+title: wM-Bus GW (Concentrator)
+---
+
+# Wireless M-Bus Concentrator Gateway
+
+<Image alt='Wireless M-BUS Gateway V3 (Battery)'
+img={require('./img/LOB-GW-HYB-WMBUS_wmbus-gateway-v3_Lorawan_NB-IoT_noBorder.jpg')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+## Product Identification
+
+<Image alt='Label Wireless M-BUS Gateway V3 (Battery)'
+img={require('./img/labelv3.png')}
+style={{width: '25%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+* Product Name: **Wireless M-Bus Gateway V3 (Battery)**
+* Product Type: **LOB-GW-HYB-WMBUS**
+* Lobaro PN: `8000162`
+
+## Description
+
+Battery-powered gateway for regular remote reading of up to 650...800 wireless M-Bus (868 MHz) and Sensus RF consumption
+meters (e.g. water meters, heat cost allocators) via NB-IoT, LTE-M mobile radio or LoRaWAN to the Internet. Suitable for
+indoor and weather-protected outdoor installation. Ideal for intra-year consumption information (uVI) and billing in the
+housing industry.
+
+### Used Components{#components}
+
+:::info
+This product is made from the following components, please see the individual common descriptions for
+further details!
+:::
+
+* Firmware:
+    * Manual: [app-nrf9160-wmbus](/components/firmware/app-nrf9160-wmbus/introduction.md)
+    * Latest Firmware Update: [Download](https://files.lobaro.com/s/9Zo3KQnXJDHNMgE) †
+* Housing:
+    * Type: [TG PC 1208-6-o](/components/enclosures/spelsberg_TG_PC_1208-6-o.md)
+
+:::tip[How to update the firmware]
+† Please see [Lobaro Tool description](/configuration/lobaro-config-tool#fwupdate) for information on how to update the
+firmware.
+:::
+
+## Datasheet & Quickstart
+
+| Document Type            | PDF Download                                                                                                                                                 |
+|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Data sheet + Quickstart  | [🇩🇪 Download](https://files.lobaro.com/index.php/s/SArz8mXdRTwyCHQ/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/zS2J32EZX6mTxtQ/download) |
+| 1-Page Printable version | [🇩🇪 Download](https://files.lobaro.com/index.php/s/r6M8kEsE2jwEQGx/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/yFiXeAX7yoBH67s/download) |
+
+* Print settings: DIN A4 double sided, flip on short side
+* Folding: You can fold it to a six page leaflet, using the marker next to "Initial operation".
+
+## DoC
+
+* EU declaration of conformity (DoC): [🇬🇧 Download](https://files.lobaro.com/index.php/s/BKTJMPwmcg9Hs3n/download)
+
+## Product specific details
+
+:::info
+Information provided in this chapter is only valid for the above product unless otherwise noted. In case of doubt,
+the information in this section takes precedence over the general [description of any component](#components).
+:::
+
+### Device Components{#devicecomponents}
+<Image alt='Gateway V3 Internal Components'
+img={require('./img/GW_V3_Internal_Components.png')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+1. Battery connector (XH)
+2. SIM card socket (4FF - nano)
+3. Reset button
+4. Status LED (Blue, Green, Red)
+5. Connector for [USB configuration adapter](/configuration/usb-config-adapter.md)
+6. MicroSD card socket (unused by firmware)
+7. Connector for internal PCB antenna
+8. 3.6V D-Cell battery incl. loop tape 
+9. Pressure compensation element (PCE)
+
+### LED signal patterns
+
+The device has 3 three LEDs (B, G, R = Blue, Green, Red), labeled `Status` on the PCB: 🔵🟢🔴. 
+
+See also item [(4)](#devicecomponents) under device components listing.
+
+#### Patterns during booting/restart
+
+* 🔵⚪🔴 B and R on: Device is in Bootloader Mode (not actively running, remove config adapter press reset to leave
+  Bootloader Mode).
+* ⚪🟢⚪ G on for ~2s and off again: Device just booted, either after power on, reset b button or software, or after a hard
+  failure.
+* ⚪⚪🔴 R flashes repeatedly on and off in 1s interval: critical failure during boot (failed to start application).
+
+#### Patterns during normal operation
+
+* 🔵⚪⚪ B flashes 1s on and 1s off in loop: building LTE connection to mobile provider. Followed by:
+    * ⚪🟢⚪ Short G flash on success.
+    * ⚪⚪🔴 Short R flash after connection failed.
+* There are no patterns during normal LoRaWAN operation.
+
+#### Exceptional patterns
+
+* 🔵⚪🔴/⚪🟢🔴 Quickly changing between R & B and G & B every 5s in a loop: Modem is in connection restriction mode - keep
+  device on power, will fix itself after 30min.
+
+### Battery Lifetime Calculator
+
+Please
+see [online spreadsheet](https://docs.google.com/spreadsheets/d/1BjEO0UShdWuhaDqwDWPEtqszOBqUVfBH85dvtvdCjlA/edit?usp=sharing).
+
+
+
+
+
diff --git a/docs/products/metering-gateways/wireless-mbus-gateway-dinrail.md b/docs/products/metering-gateways/wireless-mbus-gateway-dinrail.md
new file mode 100644
index 00000000..9008532a
--- /dev/null
+++ b/docs/products/metering-gateways/wireless-mbus-gateway-dinrail.md
@@ -0,0 +1,118 @@
+---
+sidebar_position: 2
+displayed_sidebar: productsSidebar
+title: wM-Bus GW (12V - 24V)
+---
+
+# Wireless M-Bus Gateway (12V - 24V)
+
+<Image alt='Wireless M-Bus Gateway (12V - 24V)'
+img={require('./img/Lobaro_WMB_HYB-WMBUS-full_.jpg')}
+style={{width: '40%', paddingTop: '0px', paddingBottom: '0px'}}/>
+
+## Product Identification
+
+<Image alt='Label Wireless M-BUS Gateway V3 (Battery)'
+img={require('./img/labelv3.png')}
+style={{width: '25%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+* Product Name: **Wireless M-Bus Gateway V3 (Battery)**
+* Product Type: **LOB-GW-HYB-WMBUS**
+* Lobaro PN: `8000162`
+
+## Description
+
+Battery-powered gateway for regular remote reading of up to 650...800 wireless M-Bus (868 MHz) and Sensus RF consumption
+meters (e.g. water meters, heat cost allocators) via NB-IoT, LTE-M mobile radio or LoRaWAN to the Internet. Suitable for
+indoor and weather-protected outdoor installation. Ideal for intra-year consumption information (uVI) and billing in the
+housing industry.
+
+### Used Components{#components}
+
+:::info
+This product is made from the following components, please see the individual common descriptions for
+further details!
+:::
+
+* Firmware:
+    * Manual: [app-nrf9160-wmbus](/components/firmware/app-nrf9160-wmbus/introduction.md)
+    * Latest Firmware Update: [Download](https://files.lobaro.com/s/9Zo3KQnXJDHNMgE) †
+* Housing:
+    * Type: [TG PC 1208-6-o](/components/enclosures/spelsberg_TG_PC_1208-6-o.md)
+
+:::tip[How to update the firmware]
+† Please see [Lobaro Tool description](/configuration/lobaro-config-tool#fwupdate) for information on how to update the
+firmware.
+:::
+
+## Datasheet & Quickstart
+
+| Document Type            | PDF Download                                                                                                                                                 |
+|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Data sheet + Quickstart  | [🇩🇪 Download](https://files.lobaro.com/index.php/s/SArz8mXdRTwyCHQ/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/zS2J32EZX6mTxtQ/download) |
+| 1-Page Printable version | [🇩🇪 Download](https://files.lobaro.com/index.php/s/r6M8kEsE2jwEQGx/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/yFiXeAX7yoBH67s/download) |
+
+* Print settings: DIN A4 double sided, flip on short side
+* Folding: You can fold it to a six page leaflet, using the marker next to "Initial operation".
+
+## DoC
+
+* EU declaration of conformity (DoC): [🇬🇧 Download](https://files.lobaro.com/index.php/s/BKTJMPwmcg9Hs3n/download)
+
+## Product specific details
+
+:::info
+Information provided in this chapter is only valid for the above product unless otherwise noted. In case of doubt,
+the information in this section takes precedence over the general [description of any component](#components).
+:::
+
+### Device Components{#devicecomponents}
+<Image alt='Gateway V3 Internal Components'
+img={require('./img/GW_V3_Internal_Components.png')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+1. Battery connector (XH)
+2. SIM card socket (4FF - nano)
+3. Reset button
+4. Status LED (Blue, Green, Red)
+5. Connector for [USB configuration adapter](/configuration/usb-config-adapter.md)
+6. MicroSD card socket (unused by firmware)
+7. Connector for internal PCB antenna
+8. 3.6V D-Cell battery incl. loop tape 
+9. Pressure compensation element (PCE)
+
+### LED signal patterns
+
+The device has 3 three LEDs (B, G, R = Blue, Green, Red), labeled `Status` on the PCB: 🔵🟢🔴. 
+
+See also item [(4)](#devicecomponents) under device components listing.
+
+#### Patterns during booting/restart
+
+* 🔵⚪🔴 B and R on: Device is in Bootloader Mode (not actively running, remove config adapter press reset to leave
+  Bootloader Mode).
+* ⚪🟢⚪ G on for ~2s and off again: Device just booted, either after power on, reset b button or software, or after a hard
+  failure.
+* ⚪⚪🔴 R flashes repeatedly on and off in 1s interval: critical failure during boot (failed to start application).
+
+#### Patterns during normal operation
+
+* 🔵⚪⚪ B flashes 1s on and 1s off in loop: building LTE connection to mobile provider. Followed by:
+    * ⚪🟢⚪ Short G flash on success.
+    * ⚪⚪🔴 Short R flash after connection failed.
+* There are no patterns during normal LoRaWAN operation.
+
+#### Exceptional patterns
+
+* 🔵⚪🔴/⚪🟢🔴 Quickly changing between R & B and G & B every 5s in a loop: Modem is in connection restriction mode - keep
+  device on power, will fix itself after 30min.
+
+### Battery Lifetime Calculator
+
+Please
+see [online spreadsheet](https://docs.google.com/spreadsheets/d/1BjEO0UShdWuhaDqwDWPEtqszOBqUVfBH85dvtvdCjlA/edit?usp=sharing).
+
+
+
+
+
diff --git a/docs/products/metering-gateways/wireless-mbus-gateway-sun-v1.md b/docs/products/metering-gateways/wireless-mbus-gateway-sun-v1.md
new file mode 100644
index 00000000..a70deed7
--- /dev/null
+++ b/docs/products/metering-gateways/wireless-mbus-gateway-sun-v1.md
@@ -0,0 +1,118 @@
+---
+sidebar_position: 5
+displayed_sidebar: productsSidebar
+title: wM-Bus GW (Solar)
+---
+
+# Wireless M-Bus Gateway (Solar)
+
+<Image alt='Wireless M-Bus Gateway (Solar)'
+img={require('./img/Lobaro-Solar-Gateway-wireless-Mbus.jpg')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+## Product Identification
+
+<Image alt='Label Wireless M-BUS Gateway V3 (Battery)'
+img={require('./img/labelv3.png')}
+style={{width: '25%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+* Product Name: **Wireless M-Bus Gateway V3 (Battery)**
+* Product Type: **LOB-GW-HYB-WMBUS**
+* Lobaro PN: `8000162`
+
+## Description
+
+Battery-powered gateway for regular remote reading of up to 650...800 wireless M-Bus (868 MHz) and Sensus RF consumption
+meters (e.g. water meters, heat cost allocators) via NB-IoT, LTE-M mobile radio or LoRaWAN to the Internet. Suitable for
+indoor and weather-protected outdoor installation. Ideal for intra-year consumption information (uVI) and billing in the
+housing industry.
+
+### Used Components{#components}
+
+:::info
+This product is made from the following components, please see the individual common descriptions for
+further details!
+:::
+
+* Firmware:
+    * Manual: [app-nrf9160-wmbus](/components/firmware/app-nrf9160-wmbus/introduction.md)
+    * Latest Firmware Update: [Download](https://files.lobaro.com/s/9Zo3KQnXJDHNMgE) †
+* Housing:
+    * Type: [TG PC 1208-6-o](/components/enclosures/spelsberg_TG_PC_1208-6-o.md)
+
+:::tip[How to update the firmware]
+† Please see [Lobaro Tool description](/configuration/lobaro-config-tool#fwupdate) for information on how to update the
+firmware.
+:::
+
+## Datasheet & Quickstart
+
+| Document Type            | PDF Download                                                                                                                                                 |
+|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Data sheet + Quickstart  | [🇩🇪 Download](https://files.lobaro.com/index.php/s/SArz8mXdRTwyCHQ/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/zS2J32EZX6mTxtQ/download) |
+| 1-Page Printable version | [🇩🇪 Download](https://files.lobaro.com/index.php/s/r6M8kEsE2jwEQGx/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/yFiXeAX7yoBH67s/download) |
+
+* Print settings: DIN A4 double sided, flip on short side
+* Folding: You can fold it to a six page leaflet, using the marker next to "Initial operation".
+
+## DoC
+
+* EU declaration of conformity (DoC): [🇬🇧 Download](https://files.lobaro.com/index.php/s/BKTJMPwmcg9Hs3n/download)
+
+## Product specific details
+
+:::info
+Information provided in this chapter is only valid for the above product unless otherwise noted. In case of doubt,
+the information in this section takes precedence over the general [description of any component](#components).
+:::
+
+### Device Components{#devicecomponents}
+<Image alt='Gateway V3 Internal Components'
+img={require('./img/GW_V3_Internal_Components.png')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+1. Battery connector (XH)
+2. SIM card socket (4FF - nano)
+3. Reset button
+4. Status LED (Blue, Green, Red)
+5. Connector for [USB configuration adapter](/configuration/usb-config-adapter.md)
+6. MicroSD card socket (unused by firmware)
+7. Connector for internal PCB antenna
+8. 3.6V D-Cell battery incl. loop tape 
+9. Pressure compensation element (PCE)
+
+### LED signal patterns
+
+The device has 3 three LEDs (B, G, R = Blue, Green, Red), labeled `Status` on the PCB: 🔵🟢🔴. 
+
+See also item [(4)](#devicecomponents) under device components listing.
+
+#### Patterns during booting/restart
+
+* 🔵⚪🔴 B and R on: Device is in Bootloader Mode (not actively running, remove config adapter press reset to leave
+  Bootloader Mode).
+* ⚪🟢⚪ G on for ~2s and off again: Device just booted, either after power on, reset b button or software, or after a hard
+  failure.
+* ⚪⚪🔴 R flashes repeatedly on and off in 1s interval: critical failure during boot (failed to start application).
+
+#### Patterns during normal operation
+
+* 🔵⚪⚪ B flashes 1s on and 1s off in loop: building LTE connection to mobile provider. Followed by:
+    * ⚪🟢⚪ Short G flash on success.
+    * ⚪⚪🔴 Short R flash after connection failed.
+* There are no patterns during normal LoRaWAN operation.
+
+#### Exceptional patterns
+
+* 🔵⚪🔴/⚪🟢🔴 Quickly changing between R & B and G & B every 5s in a loop: Modem is in connection restriction mode - keep
+  device on power, will fix itself after 30min.
+
+### Battery Lifetime Calculator
+
+Please
+see [online spreadsheet](https://docs.google.com/spreadsheets/d/1BjEO0UShdWuhaDqwDWPEtqszOBqUVfBH85dvtvdCjlA/edit?usp=sharing).
+
+
+
+
+
diff --git a/docs/products/metering-gateways/wireless-mbus-gateway-v3.md b/docs/products/metering-gateways/wireless-mbus-gateway-v3.md
new file mode 100644
index 00000000..510657ed
--- /dev/null
+++ b/docs/products/metering-gateways/wireless-mbus-gateway-v3.md
@@ -0,0 +1,118 @@
+---
+sidebar_position: 1
+displayed_sidebar: productsSidebar
+title: wM-Bus GW V3 (Battery)
+---
+
+# Wireless M-BUS Gateway V3 (Battery)
+
+<Image alt='Wireless M-BUS Gateway V3 (Battery)'
+img={require('./img/LOB-GW-HYB-WMBUS_wmbus-gateway-v3_Lorawan_NB-IoT_noBorder.jpg')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+## Product Identification
+
+<Image alt='Label Wireless M-BUS Gateway V3 (Battery)'
+img={require('./img/labelv3.png')}
+style={{width: '25%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+* Product Name: **Wireless M-Bus Gateway V3 (Battery)**
+* Product Type: **LOB-GW-HYB-WMBUS**
+* Lobaro PN: `8000162`
+
+## Description
+
+Battery-powered gateway for regular remote reading of up to 650...800 wireless M-Bus (868 MHz) and Sensus RF consumption
+meters (e.g. water meters, heat cost allocators) via NB-IoT, LTE-M mobile radio or LoRaWAN to the Internet. Suitable for
+indoor and weather-protected outdoor installation. Ideal for intra-year consumption information (uVI) and billing in the
+housing industry.
+
+### Used Components{#components}
+
+:::info
+This product is made from the following components, please see the individual common descriptions for
+further details!
+:::
+
+* Firmware:
+    * Manual: [app-nrf9160-wmbus](/components/firmware/app-nrf9160-wmbus/introduction.md)
+    * Latest Firmware Update: [Download](https://files.lobaro.com/s/9Zo3KQnXJDHNMgE) †
+* Housing:
+    * Type: [TG PC 1208-6-o](/components/enclosures/spelsberg_TG_PC_1208-6-o.md)
+
+:::tip[How to update the firmware]
+† Please see [Lobaro Tool description](/configuration/lobaro-config-tool#fwupdate) for information on how to update the
+firmware.
+:::
+
+## Datasheet & Quickstart
+
+| Document Type            | PDF Download                                                                                                                                                 |
+|:-------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Data sheet + Quickstart  | [🇩🇪 Download](https://files.lobaro.com/index.php/s/SArz8mXdRTwyCHQ/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/zS2J32EZX6mTxtQ/download) |
+| 1-Page Printable version | [🇩🇪 Download](https://files.lobaro.com/index.php/s/r6M8kEsE2jwEQGx/download) ⎮ [🇬🇧 Download](https://files.lobaro.com/index.php/s/yFiXeAX7yoBH67s/download) |
+
+* Print settings: DIN A4 double sided, flip on short side
+* Folding: You can fold it to a six page leaflet, using the marker next to "Initial operation".
+
+## DoC
+
+* EU declaration of conformity (DoC): [🇬🇧 Download](https://files.lobaro.com/index.php/s/BKTJMPwmcg9Hs3n/download)
+
+## Product specific details
+
+:::info
+Information provided in this chapter is only valid for the above product unless otherwise noted. In case of doubt,
+the information in this section takes precedence over the general [description of any component](#components).
+:::
+
+### Device Components{#devicecomponents}
+<Image alt='Gateway V3 Internal Components'
+img={require('./img/GW_V3_Internal_Components.png')}
+style={{width: '40%', paddingTop: '10px', paddingBottom: '10px'}}/>
+
+1. Battery connector (XH)
+2. SIM card socket (4FF - nano)
+3. Reset button
+4. Status LED (Blue, Green, Red)
+5. Connector for [USB configuration adapter](/configuration/usb-config-adapter.md)
+6. MicroSD card socket (unused by firmware)
+7. Connector for internal PCB antenna
+8. 3.6V D-Cell battery incl. loop tape 
+9. Pressure compensation element (PCE)
+
+### LED signal patterns
+
+The device has 3 three LEDs (B, G, R = Blue, Green, Red), labeled `Status` on the PCB: 🔵🟢🔴. 
+
+See also item [(4)](#devicecomponents) under device components listing.
+
+#### Patterns during booting/restart
+
+* 🔵⚪🔴 B and R on: Device is in Bootloader Mode (not actively running, remove config adapter press reset to leave
+  Bootloader Mode).
+* ⚪🟢⚪ G on for ~2s and off again: Device just booted, either after power on, reset b button or software, or after a hard
+  failure.
+* ⚪⚪🔴 R flashes repeatedly on and off in 1s interval: critical failure during boot (failed to start application).
+
+#### Patterns during normal operation
+
+* 🔵⚪⚪ B flashes 1s on and 1s off in loop: building LTE connection to mobile provider. Followed by:
+    * ⚪🟢⚪ Short G flash on success.
+    * ⚪⚪🔴 Short R flash after connection failed.
+* There are no patterns during normal LoRaWAN operation.
+
+#### Exceptional patterns
+
+* 🔵⚪🔴/⚪🟢🔴 Quickly changing between R & B and G & B every 5s in a loop: Modem is in connection restriction mode - keep
+  device on power, will fix itself after 30min.
+
+### Battery Lifetime Calculator
+
+Please
+see [online spreadsheet](https://docs.google.com/spreadsheets/d/1BjEO0UShdWuhaDqwDWPEtqszOBqUVfBH85dvtvdCjlA/edit?usp=sharing).
+
+
+
+
+
diff --git a/docs/products/sensor-gateways/index.md b/docs/products/sensor-gateways/index.md
deleted file mode 100644
index 139d84d0..00000000
--- a/docs/products/sensor-gateways/index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-sidebar_position: 1
----
-
-# Metering Gateway
-
-:::info
-This new documentation center is currently work in progress
-:::
-
diff --git a/docs/products/metering-gateways/wired-mbus-g1/_category_.json b/docs/products/sensor-gateways/wired-mbus-g1/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/_category_.json
rename to docs/products/sensor-gateways/wired-mbus-g1/_category_.json
diff --git a/docs/products/metering-gateways/wired-mbus-g1/hardware-variants/_category_.json b/docs/products/sensor-gateways/wired-mbus-g1/hardware-variants/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/hardware-variants/_category_.json
rename to docs/products/sensor-gateways/wired-mbus-g1/hardware-variants/_category_.json
diff --git a/docs/products/metering-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/_category_.json b/docs/products/sensor-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/_category_.json
rename to docs/products/sensor-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/_category_.json
diff --git a/docs/products/metering-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/index.md b/docs/products/sensor-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/index.md
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/index.md
rename to docs/products/sensor-gateways/wired-mbus-g1/hardware-variants/dinrail-v1/index.md
diff --git a/docs/products/metering-gateways/wired-mbus-g1/index.md b/docs/products/sensor-gateways/wired-mbus-g1/index.md
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/index.md
rename to docs/products/sensor-gateways/wired-mbus-g1/index.md
diff --git a/docs/products/metering-gateways/wired-mbus-g1/manual/_category_.json b/docs/products/sensor-gateways/wired-mbus-g1/manual/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/manual/_category_.json
rename to docs/products/sensor-gateways/wired-mbus-g1/manual/_category_.json
diff --git a/docs/products/metering-gateways/wired-mbus-g1/manual/cfg.md b/docs/products/sensor-gateways/wired-mbus-g1/manual/cfg.md
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/manual/cfg.md
rename to docs/products/sensor-gateways/wired-mbus-g1/manual/cfg.md
diff --git a/docs/products/metering-gateways/wired-mbus-g1/manual/index.md b/docs/products/sensor-gateways/wired-mbus-g1/manual/index.md
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/manual/index.md
rename to docs/products/sensor-gateways/wired-mbus-g1/manual/index.md
diff --git a/docs/products/metering-gateways/wired-mbus-g1/manual/workflow.md b/docs/products/sensor-gateways/wired-mbus-g1/manual/workflow.md
similarity index 100%
rename from docs/products/metering-gateways/wired-mbus-g1/manual/workflow.md
rename to docs/products/sensor-gateways/wired-mbus-g1/manual/workflow.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g2/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g2/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/hardware-variants/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g2/hardware-variants/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/hardware-variants/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g2/hardware-variants/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/index.md b/docs/products/sensor-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g2/hardware-variants/bridge-v2/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/index.md b/docs/products/sensor-gateways/wireless-mbus-g2/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g2/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/manual/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g2/manual/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/manual/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g2/manual/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/manual/cfg.md b/docs/products/sensor-gateways/wireless-mbus-g2/manual/cfg.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/manual/cfg.md
rename to docs/products/sensor-gateways/wireless-mbus-g2/manual/cfg.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/manual/index.md b/docs/products/sensor-gateways/wireless-mbus-g2/manual/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/manual/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g2/manual/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g2/manual/workflow.md b/docs/products/sensor-gateways/wireless-mbus-g2/manual/workflow.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g2/manual/workflow.md
rename to docs/products/sensor-gateways/wireless-mbus-g2/manual/workflow.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/concentrator-v1/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/dinrail-v1/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/bridge-v2/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/gw-v2/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/discontinued/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/discontinued/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v3/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v3/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v3/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v3/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v3/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v3/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v3/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v3/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/desc.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/desc.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/desc.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/desc.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/GW_V4.png b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/GW_V4.png
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/GW_V4.png
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/GW_V4.png
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/wMBusV4_Batterie.png b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/wMBusV4_Batterie.png
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/wMBusV4_Batterie.png
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/img/wMBusV4_Batterie.png
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/gw-v4/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/gw-v4/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/sun-v1/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/sun-v1/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/sun-v1/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/sun-v1/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/sun-v1/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/sun-v1/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/hardware-variants/sun-v1/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/hardware-variants/sun-v1/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/manual/_category_.json b/docs/products/sensor-gateways/wireless-mbus-g3/manual/_category_.json
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/manual/_category_.json
rename to docs/products/sensor-gateways/wireless-mbus-g3/manual/_category_.json
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/manual/cfg.md b/docs/products/sensor-gateways/wireless-mbus-g3/manual/cfg.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/manual/cfg.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/manual/cfg.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/manual/index.md b/docs/products/sensor-gateways/wireless-mbus-g3/manual/index.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/manual/index.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/manual/index.md
diff --git a/docs/products/metering-gateways/wireless-mbus-g3/manual/workflow.md b/docs/products/sensor-gateways/wireless-mbus-g3/manual/workflow.md
similarity index 100%
rename from docs/products/metering-gateways/wireless-mbus-g3/manual/workflow.md
rename to docs/products/sensor-gateways/wireless-mbus-g3/manual/workflow.md