diff --git a/README.md b/README.md
index 1196d52f752dbbea37bc1d7ce14fad87c611f01a..9d1d932d95583b561feed0fa332fd6a1eaac6ff8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/checkpoint_mho_buffers-0.0.2-20230529.mkp "checkpoint_mho_buffers-0.0.2-20230529.mkp"
 # Check Point MHO buffers
 
 Monitors status of Check Point Orchestrator (MHO) port RX buffers
diff --git a/checkpoint_mho_buffers-0.0.2-20230529.mkp b/checkpoint_mho_buffers-0.0.2-20230529.mkp
deleted file mode 100644
index 4552a472c32472218e7180734397142c222d9551..0000000000000000000000000000000000000000
Binary files a/checkpoint_mho_buffers-0.0.2-20230529.mkp and /dev/null differ
diff --git a/checkpoint_mho_buffers.mkp b/checkpoint_mho_buffers.mkp
deleted file mode 100644
index 4552a472c32472218e7180734397142c222d9551..0000000000000000000000000000000000000000
Binary files a/checkpoint_mho_buffers.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.png b/img/sample.png
similarity index 100%
rename from doc/sample.png
rename to img/sample.png
diff --git a/doc/wato-discovery.png b/img/wato-discovery.png
similarity index 100%
rename from doc/wato-discovery.png
rename to img/wato-discovery.png
diff --git a/mkp/checkpoint_mho_buffers-0.0.2-20230529.mkp b/mkp/checkpoint_mho_buffers-0.0.2-20230529.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..a0854dc861dd0d2f67d8ec715c0a9455d83268b6
Binary files /dev/null and b/mkp/checkpoint_mho_buffers-0.0.2-20230529.mkp differ
diff --git a/agent_based/checkpoint_mho_buffers.py b/source/agent_based/checkpoint_mho_buffers.py
similarity index 100%
rename from agent_based/checkpoint_mho_buffers.py
rename to source/agent_based/checkpoint_mho_buffers.py
diff --git a/gui/metrics/checkpoint_mho_buffers.py b/source/gui/metrics/checkpoint_mho_buffers.py
similarity index 100%
rename from gui/metrics/checkpoint_mho_buffers.py
rename to source/gui/metrics/checkpoint_mho_buffers.py
diff --git a/gui/wato/checkpoint_mho_buffers.py b/source/gui/wato/checkpoint_mho_buffers.py
similarity index 100%
rename from gui/wato/checkpoint_mho_buffers.py
rename to source/gui/wato/checkpoint_mho_buffers.py
diff --git a/packages/checkpoint_mho_buffers b/source/packages/checkpoint_mho_buffers
similarity index 89%
rename from packages/checkpoint_mho_buffers
rename to source/packages/checkpoint_mho_buffers
index ae8a74bb259590edbaf76b4a84ec0b329dbaea76..5c4454afa9d710eaa0f671842b0681d1ffee74fb 100644
--- a/packages/checkpoint_mho_buffers
+++ b/source/packages/checkpoint_mho_buffers
@@ -10,5 +10,5 @@
  'title': 'Check Point MHO port RX buffers',
  'version': '0.0.2-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}