diff --git a/README.md b/README.md
index e7c97102b14a16b73646cc7994d02dd5304582b7..2e4d2aaab4584cb25f0a7a034b2aebb87299c799 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/inv_huawei_hw_components-0.2.1-20240614.mkp "inv_huawei_hw_components-0.2.1-20240614.mkp"
 # Extended inventory of Huawei hardware components
 
 adds a extended list of hardware components to the inventory
diff --git a/doc/sample.png b/img/sample.png
similarity index 100%
rename from doc/sample.png
rename to img/sample.png
diff --git a/inv_huawei_hw_components.mkp b/inv_huawei_hw_components.mkp
deleted file mode 100644
index aa676f3dc822dfbfacb4a2f2508a03f7f70839bd..0000000000000000000000000000000000000000
Binary files a/inv_huawei_hw_components.mkp and /dev/null differ
diff --git a/inv_huawei_hw_components-0.2.0-20230602.mkp b/mkp/inv_huawei_hw_components-0.2.0-20230602.mkp
similarity index 100%
rename from inv_huawei_hw_components-0.2.0-20230602.mkp
rename to mkp/inv_huawei_hw_components-0.2.0-20230602.mkp
diff --git a/mkp/inv_huawei_hw_components-0.2.1-20240614.mkp b/mkp/inv_huawei_hw_components-0.2.1-20240614.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..9a3e56455f57fdaf43394b0d453073bc40ed03fa
Binary files /dev/null and b/mkp/inv_huawei_hw_components-0.2.1-20240614.mkp differ
diff --git a/agent_based/inv_huawei_hw_components.py b/source/agent_based/inv_huawei_hw_components.py
similarity index 100%
rename from agent_based/inv_huawei_hw_components.py
rename to source/agent_based/inv_huawei_hw_components.py
diff --git a/packages/inv_huawei_hw_components b/source/packages/inv_huawei_hw_components
similarity index 60%
rename from packages/inv_huawei_hw_components
rename to source/packages/inv_huawei_hw_components
index acd8777cca6395703892380bfe1fe9b95cfcc09d..ad8e2ff21a5756a7be7318335b3becf238657ebd 100644
--- a/packages/inv_huawei_hw_components
+++ b/source/packages/inv_huawei_hw_components
@@ -2,10 +2,10 @@
  'description': 'SNMP inventory for Huawei hardware components.\n',
  'download_url': 'https://thl-cmk.hopto.org',
  'files': {'agent_based': ['inv_huawei_hw_components.py'],
-           'gui': ['views/inv_huawei_hw_components.py']},
+           'web': ['plugins/views/inv_huawei_hw_components.py']},
  'name': 'inv_huawei_hw_components',
  'title': 'Inventory for Huawei hardware components',
- 'version': '0.2.0-20230602',
- 'version.min_required': '2.1.0b1',
- 'version.packaged': '2.1.0p21',
- 'version.usable_until': '2.2.0b1'}
\ No newline at end of file
+ 'version': '0.2.1-20240614',
+ 'version.min_required': '2.2.0b1',
+ 'version.packaged': '2.2.0p24',
+ 'version.usable_until': '2.3.0b1'}
diff --git a/gui/views/inv_huawei_hw_components.py b/source/web/plugins/views/inv_huawei_hw_components.py
similarity index 57%
rename from gui/views/inv_huawei_hw_components.py
rename to source/web/plugins/views/inv_huawei_hw_components.py
index aa33b5b68014e5717e75defcadb89c1cb44fbfd8..bac44e47850d6f7230959d2572e892691ee7a2cd 100644
--- a/gui/views/inv_huawei_hw_components.py
+++ b/source/web/plugins/views/inv_huawei_hw_components.py
@@ -1,22 +1,25 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-; py-indent-offset: 4 -*-
+# -*- coding: utf-8 -*-
+#
+# License: GNU General Public License v2
+#
+# Author: thl-cmk[at]outlook[dot]com
+# URL   : https://thl-cmk.hopto.org
+# Date  : 2020-07-14
 
-from cmk.gui.plugins.views.utils import (
-    inventory_displayhints,
-)
-from cmk.gui.plugins.views.inventory import (
-    declare_invtable_view,
-    )
-from cmk.gui.i18n import _
+# 2024-06-14: moved back to ~/local/share/check_mk/web/plugins/views
 
+from cmk.gui.i18n import _
+from cmk.gui.views.inventory.registry import inventory_displayhints
 
 inventory_displayhints.update({
-    '.hardware.components.huawei:': {'title': _('Huawei'),
-                                     'keyorder': ['index', 'name', 'description', 'board_type', 'serial_number',
-                                                  'manufactured_date', 'vendor',
-                                                  ],
-                                     'view': 'invhuaweicomponents_of_host',
-                                     },
+    '.hardware.components.huawei:': {
+        'title': _('Huawei'),
+        'keyorder': ['index', 'name', 'description', 'board_type', 'serial_number',
+                     'manufactured_date', 'vendor',
+                     ],
+        'view': 'invhuaweicomponents_of_host',
+    },
     '.hardware.components.huawei:*.index': {'title': _('Index'), },
     '.hardware.components.huawei:*.name': {'title': _('Name')},
     '.hardware.components.huawei:*.description': {'title': _('Description'), },
@@ -29,8 +32,4 @@ inventory_displayhints.update({
     '.hardware.components.huawei:*.hardware_revision': {'title': _('Hardware Revision'), },
     '.hardware.components.huawei:*.serial_number': {'title': _('Serial Number'), },
     '.hardware.components.huawei:*.vendor': {'title': _('Vendor'), },
-
 })
-
-declare_invtable_view('invhuaweicomponents', '.hardware.components.huawei:', _('Huawei hardware components'),
-                      _('Huawei hardware components'))