diff --git a/README.md b/README.md
index 2dea8acb387a4696e0418bbccd31dfedc455ad81..12641708363e6f94402adf58ca71f36413bf1f19 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/checkpoint_raid-1.0.0-20230422.mkp "checkpoint_raid-1.0.0-20230422.mkp"
 # RAID
 
 Monitors status of Check Point RAID arrays
diff --git a/checkpoint_raid.mkp b/checkpoint_raid.mkp
deleted file mode 100644
index c8f84d18809f37ebc6735eb3b15877554ae4d312..0000000000000000000000000000000000000000
Binary files a/checkpoint_raid.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.png b/img/wato.png
similarity index 100%
rename from doc/wato.png
rename to img/wato.png
diff --git a/mkp/checkpoint_raid-1.0.0-20230422.mkp b/mkp/checkpoint_raid-1.0.0-20230422.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..d999944652065f32ef33a5fc42a689b8aec77985
Binary files /dev/null and b/mkp/checkpoint_raid-1.0.0-20230422.mkp differ
diff --git a/agent_based/checkpoint_raid.py b/source/agent_based/checkpoint_raid.py
similarity index 100%
rename from agent_based/checkpoint_raid.py
rename to source/agent_based/checkpoint_raid.py
diff --git a/gui/wato/checkpoint_raid.py b/source/gui/wato/checkpoint_raid.py
similarity index 100%
rename from gui/wato/checkpoint_raid.py
rename to source/gui/wato/checkpoint_raid.py
diff --git a/packages/checkpoint_raid b/source/packages/checkpoint_raid
similarity index 85%
rename from packages/checkpoint_raid
rename to source/packages/checkpoint_raid
index 1665477c8a5db38225aadb35aa9251728cc41daa..4447569918b6aa88a66c02fe6cb0f9bf18eed179 100644
--- a/packages/checkpoint_raid
+++ b/source/packages/checkpoint_raid
@@ -7,5 +7,5 @@
  'title': 'Check Point appliance RAID',
  'version': '1.0.0-20230422',
  '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}