diff --git a/README.md b/README.md
index 9127f00ea8a6d7e271d87f2fa23f7ef5bdb30c19..d1a09302c499af5fb25710b05aee1562d35cb6cb 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/checkpoint_asg_sg_diag-0.4.0-20230530.mkp "checkpoint_asg_sg_diag-0.4.0-20230530.mkp"
 # Check Point Maestro Security Group ASG tests
 
 Monitors status of Check Point Maestro SG ASG Diag.
diff --git a/checkpoint_asg_sg_diag-0.4.0-20230530.mkp b/checkpoint_asg_sg_diag-0.4.0-20230530.mkp
deleted file mode 100644
index 91ed23e564ad38ab8eed2bd8c5c0ba2e705a560e..0000000000000000000000000000000000000000
Binary files a/checkpoint_asg_sg_diag-0.4.0-20230530.mkp and /dev/null differ
diff --git a/checkpoint_asg_sg_diag.mkp b/checkpoint_asg_sg_diag.mkp
deleted file mode 100644
index 91ed23e564ad38ab8eed2bd8c5c0ba2e705a560e..0000000000000000000000000000000000000000
Binary files a/checkpoint_asg_sg_diag.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/doc/wato.png b/img/wato.png
similarity index 100%
rename from doc/wato.png
rename to img/wato.png
diff --git a/mkp/checkpoint_asg_sg_diag-0.4.0-20230530.mkp b/mkp/checkpoint_asg_sg_diag-0.4.0-20230530.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..bcee4741791db3d2c77da41ff35e67c647b00097
Binary files /dev/null and b/mkp/checkpoint_asg_sg_diag-0.4.0-20230530.mkp differ
diff --git a/agent_based/checkpoint_asg_sg_diag.py b/source/agent_based/checkpoint_asg_sg_diag.py
similarity index 100%
rename from agent_based/checkpoint_asg_sg_diag.py
rename to source/agent_based/checkpoint_asg_sg_diag.py
diff --git a/gui/wato/checkpoint_asg_sg_diag.py b/source/gui/wato/checkpoint_asg_sg_diag.py
similarity index 100%
rename from gui/wato/checkpoint_asg_sg_diag.py
rename to source/gui/wato/checkpoint_asg_sg_diag.py
diff --git a/packages/checkpoint_asg_sg_diag b/source/packages/checkpoint_asg_sg_diag
similarity index 87%
rename from packages/checkpoint_asg_sg_diag
rename to source/packages/checkpoint_asg_sg_diag
index 89ff7446f294524965e0428929b1dd850de9bf03..8b11994af3faeca0c9efe73bcf5a5c8a40159c43 100644
--- a/packages/checkpoint_asg_sg_diag
+++ b/source/packages/checkpoint_asg_sg_diag
@@ -8,5 +8,5 @@
  'title': 'Check Point Maestro SG ASG Diag',
  'version': '0.4.0-20230530',
  '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}