diff --git a/README.md b/README.md
index 4dfac8b476b7cbb116b209e62943a08939894fb0..6bc700152985c53da6b98f2f9ce1913a0aa5f3f4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/inv_checkpoint_base-0.3.0-20230614.mkp "Download latest version inv_checkpoint_base-0.3.0-20230614.mkp"
+[PACKAGE]: ../../raw/master/mkp/inv_checkpoint_base-0.3.1-20240427.mkp "inv_checkpoint_base-0.3.1-20240427.mkp"
 
 # Inventory of Check Point Hardware Appliances
 
diff --git a/doc/.gitkeep b/img/.gitkeep
similarity index 100%
rename from doc/.gitkeep
rename to img/.gitkeep
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_checkpoint_base-0.3.0-20230614.mkp b/mkp/inv_checkpoint_base-0.3.0-20230614.mkp
similarity index 100%
rename from inv_checkpoint_base-0.3.0-20230614.mkp
rename to mkp/inv_checkpoint_base-0.3.0-20230614.mkp
diff --git a/mkp/inv_checkpoint_base-0.3.1-20240427.mkp b/mkp/inv_checkpoint_base-0.3.1-20240427.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..7fc34c738ee7ef4405192c346a41112a651cd981
Binary files /dev/null and b/mkp/inv_checkpoint_base-0.3.1-20240427.mkp differ
diff --git a/agent_based/inv_checkpoint_base.py b/source/agent_based/inv_checkpoint_base.py
similarity index 100%
rename from agent_based/inv_checkpoint_base.py
rename to source/agent_based/inv_checkpoint_base.py
diff --git a/packages/inv_checkpoint_base b/source/packages/inv_checkpoint_base
similarity index 78%
rename from packages/inv_checkpoint_base
rename to source/packages/inv_checkpoint_base
index a9787df0d5c11ca31fd3e2a21c8b130d83d8c5fc..e6c0ac31b46892a3d5d1e2bbe21605ab9447ddad 100644
--- a/packages/inv_checkpoint_base
+++ b/source/packages/inv_checkpoint_base
@@ -7,10 +7,10 @@
                 '- 2021-02-22: code cleanup\n',
  'download_url': 'https://thl-cmk.hopto.org',
  'files': {'agent_based': ['inv_checkpoint_base.py'],
-           'gui': ['views/inv_checkpoint_base.py']},
+           'web': ['plugins/views/inv_checkpoint_base.py']},
  'name': 'inv_checkpoint_base',
  'title': 'Check Point appliance base inventory plugin',
- 'version': '0.3.0-20230614',
- 'version.min_required': '2.1.0b1',
- 'version.packaged': '2.2.0p2',
+ 'version': '0.3.1-20240427',
+ 'version.min_required': '2.2.0b1',
+ 'version.packaged': '2.2.0p24',
  'version.usable_until': None}
diff --git a/gui/views/inv_checkpoint_base.py b/source/web/plugins/views/inv_checkpoint_base.py
similarity index 89%
rename from gui/views/inv_checkpoint_base.py
rename to source/web/plugins/views/inv_checkpoint_base.py
index 7d6049f316bd748aa5cd0ecede29bef17879baeb..129513a8c88d8b676ab5be73110ebda8cf2a0d28 100644
--- a/gui/views/inv_checkpoint_base.py
+++ b/source/web/plugins/views/inv_checkpoint_base.py
@@ -9,6 +9,7 @@
 
 # 2023-04-23: moved views file to ~/local/lib/check_mk/gui/plugins/views
 # 2023-06-14: changed inventory_displayhints import (see werk 15493)
+# 2024-04-27: moved back to ~/local/share/check_mk/web/plugins/views (ThX to andreas[dot]doehler[at]gmail[dot]com)
 
 from cmk.gui.i18n import _
 from cmk.gui.views.inventory.registry import inventory_displayhints