diff --git a/README.md b/README.md
index 221eec0e93486a8ba3cb04ab96fb45ce4f852916..fe24e1e8d9520c25e434bdee32effd18f662726b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/cisco_eigrp-0.3.0-20230607.mkp "cisco_eigrp-0.3.0-20230607.mkp"
 # Cisco EIGRP
 
 Collection of Cisco EIGRP checks
diff --git a/cisco_eigrp-0.3.0-20230607.mkp b/cisco_eigrp-0.3.0-20230607.mkp
deleted file mode 100644
index 8d4ee446a86e32292281946bc1a3e2eb5d16bdd4..0000000000000000000000000000000000000000
Binary files a/cisco_eigrp-0.3.0-20230607.mkp and /dev/null differ
diff --git a/cisco_eigrp.mkp b/cisco_eigrp.mkp
deleted file mode 100644
index 8d4ee446a86e32292281946bc1a3e2eb5d16bdd4..0000000000000000000000000000000000000000
Binary files a/cisco_eigrp.mkp and /dev/null differ
diff --git a/doc/sample_as_info.png b/img/sample_as_info.png
similarity index 100%
rename from doc/sample_as_info.png
rename to img/sample_as_info.png
diff --git a/doc/sample_interface.png b/img/sample_interface.png
similarity index 100%
rename from doc/sample_interface.png
rename to img/sample_interface.png
diff --git a/doc/sample_peers.png b/img/sample_peers.png
similarity index 100%
rename from doc/sample_peers.png
rename to img/sample_peers.png
diff --git a/doc/sample_topo_table.png b/img/sample_topo_table.png
similarity index 100%
rename from doc/sample_topo_table.png
rename to img/sample_topo_table.png
diff --git a/mkp/cisco_eigrp-0.3.0-20230607.mkp b/mkp/cisco_eigrp-0.3.0-20230607.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..4780b3b68e1b3adb455724f526b7e0ef3f76e401
Binary files /dev/null and b/mkp/cisco_eigrp-0.3.0-20230607.mkp differ
diff --git a/agent_based/cisco_eigrp_as_info.py b/source/agent_based/cisco_eigrp_as_info.py
similarity index 100%
rename from agent_based/cisco_eigrp_as_info.py
rename to source/agent_based/cisco_eigrp_as_info.py
diff --git a/agent_based/cisco_eigrp_interface.py b/source/agent_based/cisco_eigrp_interface.py
similarity index 100%
rename from agent_based/cisco_eigrp_interface.py
rename to source/agent_based/cisco_eigrp_interface.py
diff --git a/agent_based/cisco_eigrp_peers.py b/source/agent_based/cisco_eigrp_peers.py
similarity index 100%
rename from agent_based/cisco_eigrp_peers.py
rename to source/agent_based/cisco_eigrp_peers.py
diff --git a/agent_based/cisco_eigrp_topology_table.py b/source/agent_based/cisco_eigrp_topology_table.py
similarity index 100%
rename from agent_based/cisco_eigrp_topology_table.py
rename to source/agent_based/cisco_eigrp_topology_table.py
diff --git a/gui/metrics/cisco_eigrp.py b/source/gui/metrics/cisco_eigrp.py
similarity index 100%
rename from gui/metrics/cisco_eigrp.py
rename to source/gui/metrics/cisco_eigrp.py
diff --git a/gui/wato/cisco_eigrp_interface.py b/source/gui/wato/cisco_eigrp_interface.py
similarity index 100%
rename from gui/wato/cisco_eigrp_interface.py
rename to source/gui/wato/cisco_eigrp_interface.py
diff --git a/gui/wato/cisco_eigrp_peers.py b/source/gui/wato/cisco_eigrp_peers.py
similarity index 100%
rename from gui/wato/cisco_eigrp_peers.py
rename to source/gui/wato/cisco_eigrp_peers.py
diff --git a/gui/wato/cisco_eigrp_topology_table.py b/source/gui/wato/cisco_eigrp_topology_table.py
similarity index 100%
rename from gui/wato/cisco_eigrp_topology_table.py
rename to source/gui/wato/cisco_eigrp_topology_table.py
diff --git a/packages/cisco_eigrp b/source/packages/cisco_eigrp
similarity index 94%
rename from packages/cisco_eigrp
rename to source/packages/cisco_eigrp
index 912a9d0735d09223e9695fb6e368297fa6a78e0e..9b5e40c229294fcc7faa5b29f5e7ab2b87c2d161 100644
--- a/packages/cisco_eigrp
+++ b/source/packages/cisco_eigrp
@@ -21,5 +21,5 @@
  'title': 'Cisco EIGRP checks',
  'version': '0.3.0-20230607',
  '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}