diff --git a/README.md b/README.md
index 8ecb7b90854e642778c5dc0fbffce21b54fff32c..73f317f14a28e1bda7cc3d7579732da9358e5ffb 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/checkpoint_log_server-0.3.0-20230423.mkp "checkpoint_log_server-0.3.0-20230423.mkp"
 # Check Point Log server
 
 Collection of Check Point Log server checks
diff --git a/checkman/checkpoint_log_server b/checkman/checkpoint_log_server
deleted file mode 100644
index 08ef898bcf6eb7a7979de60090d54f9719bbbc5b..0000000000000000000000000000000000000000
--- a/checkman/checkpoint_log_server
+++ /dev/null
@@ -1,45 +0,0 @@
-title: Dummy check man page - used as template for new check manuals
-agents: linux, windows, aix, solaris, hpux, vms, freebsd, snmp
-catalog: see modules/catalog.py for possible values
-license: GPL
-distribution: check_mk
-description:
- Describe here: (1) what the check actually does, (2) under which
- circumstances it goes warning/critical, (3) which devices are supported
- by the check, (4) if the check requires a separated plugin or
- tool or separate configuration on the target host.
-
-item:
- Describe the syntax and meaning of the check's item here. Provide all
- information one needs if coding a manual check with {checks +=} in {main.mk}.
- Give an example.  If the check uses {None} as sole item,
- then leave out this section.
-
-examples:
- # Give examples for configuration in {main.mk} here. If the check has
- # configuration variable, then give example for them here.
-
- # set default levels to 40 and 60 percent:
- foo_default_values = (40, 60)
-
- # another configuration variable here:
- inventory_foo_filter = [ "superfoo", "superfoo2" ]
-
-perfdata:
- Describe precisely the number and meaning of performance variables
- the check sends. If it outputs no performance data, then leave out this
- section.
-
-inventory:
- Describe how the inventory for the check works. Which items
- will it find? Describe the influence of check specific
- configuration parameters to the inventory.
-
-[parameters]
-foofirst(int): describe the first parameter here (if parameters are grouped
-        as tuple)
-fooother(string): describe another parameter here.
-
-[configuration]
-foo_default_levels(int, int): Describe global configuration variable of
-    foo here. Important: also tell the user how they are preset.
diff --git a/checkpoint_log_server.mkp b/checkpoint_log_server.mkp
deleted file mode 100644
index f19e0886c6f0ff252a002943cb6b2437864ffcdd..0000000000000000000000000000000000000000
Binary files a/checkpoint_log_server.mkp and /dev/null differ
diff --git a/doc/.gitkeep b/img/.gitkeep
similarity index 100%
rename from doc/.gitkeep
rename to img/.gitkeep
diff --git a/doc/sample-gw.png b/img/sample-gw.png
similarity index 100%
rename from doc/sample-gw.png
rename to img/sample-gw.png
diff --git a/doc/sample-mgmt.png b/img/sample-mgmt.png
similarity index 100%
rename from doc/sample-mgmt.png
rename to img/sample-mgmt.png
diff --git a/mkp/checkpoint_log_server-0.3.0-20230423.mkp b/mkp/checkpoint_log_server-0.3.0-20230423.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..2e54f532c6cede082a594919a86d67dfdd3763ae
Binary files /dev/null and b/mkp/checkpoint_log_server-0.3.0-20230423.mkp differ
diff --git a/agent_based/checkpoint_fw_ls.py b/source/agent_based/checkpoint_fw_ls.py
similarity index 100%
rename from agent_based/checkpoint_fw_ls.py
rename to source/agent_based/checkpoint_fw_ls.py
diff --git a/agent_based/checkpoint_fwm_ls.py b/source/agent_based/checkpoint_fwm_ls.py
similarity index 100%
rename from agent_based/checkpoint_fwm_ls.py
rename to source/agent_based/checkpoint_fwm_ls.py
diff --git a/checkman/checkpoint_fw_ls b/source/checkman/checkpoint_fw_ls
similarity index 100%
rename from checkman/checkpoint_fw_ls
rename to source/checkman/checkpoint_fw_ls
diff --git a/checkman/checkpoint_fwm_ls b/source/checkman/checkpoint_fwm_ls
similarity index 100%
rename from checkman/checkpoint_fwm_ls
rename to source/checkman/checkpoint_fwm_ls
diff --git a/gui/metrics/checkpoint_fw_log.py b/source/gui/metrics/checkpoint_fw_log.py
similarity index 100%
rename from gui/metrics/checkpoint_fw_log.py
rename to source/gui/metrics/checkpoint_fw_log.py
diff --git a/gui/wato/checkpoint_fw_ls.py b/source/gui/wato/checkpoint_fw_ls.py
similarity index 100%
rename from gui/wato/checkpoint_fw_ls.py
rename to source/gui/wato/checkpoint_fw_ls.py
diff --git a/gui/wato/checkpoint_fwm_ls.py b/source/gui/wato/checkpoint_fwm_ls.py
similarity index 100%
rename from gui/wato/checkpoint_fwm_ls.py
rename to source/gui/wato/checkpoint_fwm_ls.py
diff --git a/packages/checkpoint_log_server b/source/packages/checkpoint_log_server
similarity index 91%
rename from packages/checkpoint_log_server
rename to source/packages/checkpoint_log_server
index 398a3525080ac5a797a4834cb4dad575408e082b..fcb5b38ff3219f679b8aa4f8fcbf45f720b6cb24 100644
--- a/packages/checkpoint_log_server
+++ b/source/packages/checkpoint_log_server
@@ -12,5 +12,5 @@
  'title': 'Check Point Log service status',
  'version': '0.3.0-20230423',
  '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}