diff --git a/doc/sample_ospfv3_area.png b/img/sample_ospfv3_area.png
similarity index 100%
rename from doc/sample_ospfv3_area.png
rename to img/sample_ospfv3_area.png
diff --git a/doc/sample_ospfv3_general.png b/img/sample_ospfv3_general.png
similarity index 100%
rename from doc/sample_ospfv3_general.png
rename to img/sample_ospfv3_general.png
diff --git a/doc/sample_ospfv3_interface.png b/img/sample_ospfv3_interface.png
similarity index 100%
rename from doc/sample_ospfv3_interface.png
rename to img/sample_ospfv3_interface.png
diff --git a/doc/sample_ospfv3_neighbor.png b/img/sample_ospfv3_neighbor.png
similarity index 100%
rename from doc/sample_ospfv3_neighbor.png
rename to img/sample_ospfv3_neighbor.png
diff --git a/doc/sample_ospfv3_virtuallink.png b/img/sample_ospfv3_virtuallink.png
similarity index 100%
rename from doc/sample_ospfv3_virtuallink.png
rename to img/sample_ospfv3_virtuallink.png
diff --git a/doc/wato-general-discovery.png b/img/wato-general-discovery.png
similarity index 100%
rename from doc/wato-general-discovery.png
rename to img/wato-general-discovery.png
diff --git a/doc/wato-general.png b/img/wato-general.png
similarity index 100%
rename from doc/wato-general.png
rename to img/wato-general.png
diff --git a/doc/wato-interface.png b/img/wato-interface.png
similarity index 100%
rename from doc/wato-interface.png
rename to img/wato-interface.png
diff --git a/doc/wato-neighbor.png b/img/wato-neighbor.png
similarity index 100%
rename from doc/wato-neighbor.png
rename to img/wato-neighbor.png
diff --git a/doc/wato-virtual-link.png b/img/wato-virtual-link.png
similarity index 100%
rename from doc/wato-virtual-link.png
rename to img/wato-virtual-link.png
diff --git a/mkp/ospfv3-0.4.0-20231221.mkp b/mkp/ospfv3-0.4.0-20231221.mkp
index 2c625df5adf3544dae83d25ef95c78d0714c2c58..1a4b52dc0a7c6c1f753382b261c9e3e93e6b7d07 100644
Binary files a/mkp/ospfv3-0.4.0-20231221.mkp and b/mkp/ospfv3-0.4.0-20231221.mkp differ
diff --git a/agent_based/ospfv3_area.py b/source/agent_based/ospfv3_area.py
similarity index 100%
rename from agent_based/ospfv3_area.py
rename to source/agent_based/ospfv3_area.py
diff --git a/agent_based/ospfv3_general.py b/source/agent_based/ospfv3_general.py
similarity index 100%
rename from agent_based/ospfv3_general.py
rename to source/agent_based/ospfv3_general.py
diff --git a/agent_based/ospfv3_interface.py b/source/agent_based/ospfv3_interface.py
similarity index 100%
rename from agent_based/ospfv3_interface.py
rename to source/agent_based/ospfv3_interface.py
diff --git a/agent_based/ospfv3_neighbor.py b/source/agent_based/ospfv3_neighbor.py
similarity index 100%
rename from agent_based/ospfv3_neighbor.py
rename to source/agent_based/ospfv3_neighbor.py
diff --git a/agent_based/ospfv3_virtuallink.py b/source/agent_based/ospfv3_virtuallink.py
similarity index 100%
rename from agent_based/ospfv3_virtuallink.py
rename to source/agent_based/ospfv3_virtuallink.py
diff --git a/agent_based/utils/ospfv3.py b/source/agent_based/utils/ospfv3.py
similarity index 100%
rename from agent_based/utils/ospfv3.py
rename to source/agent_based/utils/ospfv3.py
diff --git a/gui/metrics/ospfv3.py b/source/gui/metrics/ospfv3.py
similarity index 100%
rename from gui/metrics/ospfv3.py
rename to source/gui/metrics/ospfv3.py
diff --git a/gui/wato/ospfv3.py b/source/gui/wato/ospfv3.py
similarity index 100%
rename from gui/wato/ospfv3.py
rename to source/gui/wato/ospfv3.py
diff --git a/packages/ospfv3 b/source/packages/ospfv3
similarity index 97%
rename from packages/ospfv3
rename to source/packages/ospfv3
index 45f218f6be50dbafa6371e722da160473ff08fea..b812b1cedc2e33a94d7148f0771240d06a6a958b 100644
--- a/packages/ospfv3
+++ b/source/packages/ospfv3
@@ -19,5 +19,5 @@
  'title': 'Collection of OSPFv3 checks',
  'version': '0.4.0-20231221',
  'version.min_required': '2.1.0b1',
- 'version.packaged': '2.2.0p14',
+ 'version.packaged': '2.2.0p24',
  'version.usable_until': None}