diff --git a/README.md b/README.md
index 2dece18bc3daf41e703c8e4f5c3bcbfe734632a0..1a9463d1ffa9c5245d8e855a548754c34859c6e0 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/checkpoint_securexl-0.2.0-20230529.mkp "checkpoint_securexl-0.2.0-20230529.mkp"
 # SecureXL
 
 Monitors status of Check Point SecureXL
diff --git a/checkpoint_securexl-0.2.0-20230529.mkp b/checkpoint_securexl-0.2.0-20230529.mkp
deleted file mode 100644
index 63264fe28fc457485c517faca47381733fa6e7d4..0000000000000000000000000000000000000000
Binary files a/checkpoint_securexl-0.2.0-20230529.mkp and /dev/null differ
diff --git a/checkpoint_securexl.mkp b/checkpoint_securexl.mkp
deleted file mode 100644
index 63264fe28fc457485c517faca47381733fa6e7d4..0000000000000000000000000000000000000000
Binary files a/checkpoint_securexl.mkp and /dev/null differ
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/mkp/checkpoint_securexl-0.2.0-20230529.mkp b/mkp/checkpoint_securexl-0.2.0-20230529.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..86564cb6faa3fe5b6b258fa6e8c615f82f58b6b7
Binary files /dev/null and b/mkp/checkpoint_securexl-0.2.0-20230529.mkp differ
diff --git a/agent_based/checkpoint_securexl.py b/source/agent_based/checkpoint_securexl.py
similarity index 100%
rename from agent_based/checkpoint_securexl.py
rename to source/agent_based/checkpoint_securexl.py
diff --git a/gui/metrics/checkpoint_securexl.py b/source/gui/metrics/checkpoint_securexl.py
similarity index 100%
rename from gui/metrics/checkpoint_securexl.py
rename to source/gui/metrics/checkpoint_securexl.py
diff --git a/packages/checkpoint_securexl b/source/packages/checkpoint_securexl
similarity index 89%
rename from packages/checkpoint_securexl
rename to source/packages/checkpoint_securexl
index 4f6c3bdf0840367a9f94d7c9ffd8e2059304def2..0a4c2c09f513b6e2d65a93ade29393c71bacd7c7 100644
--- a/packages/checkpoint_securexl
+++ b/source/packages/checkpoint_securexl
@@ -9,5 +9,5 @@
  'title': 'Check Point SecureXL status',
  'version': '0.2.0-20230529',
  'version.min_required': '2.1.0b1',
- 'version.packaged': '2.1.0p21',
- 'version.usable_until': None}
\ No newline at end of file
+ 'version.packaged': '2.2.0p24',
+ 'version.usable_until': None}
diff --git a/web/plugins/metrics/checkpoint_securexl.py b/web/plugins/metrics/checkpoint_securexl.py
deleted file mode 100644
index 86345973aab8e357cb5fd4bd1ca1eb4b03d3e7e1..0000000000000000000000000000000000000000
--- a/web/plugins/metrics/checkpoint_securexl.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# License: GNU General Public License v2
-#
-# Author: thl-cmk[at]outlook[dot]com
-# URL   : https://thl-cmk.hopto.org
-# Date  : 2018-03-14
-#
-# Check Point SecureXL staus metrics plugin
-# checkpoint_securexl
-#
-from cmk.gui.i18n import _
-
-from cmk.gui.plugins.metrics import (
-    metric_info,
-    graph_info,
-    perfometer_info,
-)
-
-metric_info['checkpoint_securexl_active'] = {
-    'title': _('Connections active'),
-    'unit': 'count',
-    'color': '26/a',
-}
-metric_info['checkpoint_securexl_added'] = {
-    'title': _('Connections added'),
-    'unit': '1/s',
-    'color': '21/a',
-}
-metric_info['checkpoint_securexl_deleted'] = {
-    'title': _('Connections deleted'),
-    'unit': '1/s',
-    'color': '31/a',
-}
-
-graph_info['checkpoint_securexl_connections_active'] = {
-    'title': _('Check Point SecureXL Connections active'),
-    'metrics': [
-        ('checkpoint_securexl_active', 'area'),
-
-    ],
-}
-
-graph_info['checkpoint_securexl_connections_rate'] = {
-    'title': _('Check Point SecureXL Connections added/deleted'),
-    'metrics': [
-        ('checkpoint_securexl_deleted', '-area'),
-        ('checkpoint_securexl_added', 'area'),
-    ],
-}
-
-perfometer_info.append({
-    'type': 'logarithmic',
-    'metric': 'checkpoint_securexl_active',
-    'half_value': 2000.0,
-    'exponent': 2,
-}, )