diff --git a/README.md b/README.md
index dd9b896e124e52638ae27f3f2ada5240aa5ef792..1bfb78c39993f893d7692c2588b4cee7ccf56fdc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/bgp_peer-2.2.2-20230817.mkp "bgp_peer-2.2.2-20230817.mkp"
+[PACKAGE]: ../../raw/master/mkp/bgp_peer-2.2.2-20240308.mkp "bgp_peer-2.2.2-20240308.mkp"
 # BGP Peer
 
 Check plugin to monitor the status of BGP peers and inventory plugin for static BGP peer data.
diff --git a/bgp_peer-2.2.1-20230613.mkp b/mkp/bgp_peer-2.2.1-20230613.mkp
similarity index 100%
rename from bgp_peer-2.2.1-20230613.mkp
rename to mkp/bgp_peer-2.2.1-20230613.mkp
diff --git a/bgp_peer-2.2.2-20230817.mkp b/mkp/bgp_peer-2.2.2-20230817.mkp
similarity index 100%
rename from bgp_peer-2.2.2-20230817.mkp
rename to mkp/bgp_peer-2.2.2-20230817.mkp
diff --git a/mkp/bgp_peer-2.2.2-20240308.mkp b/mkp/bgp_peer-2.2.2-20240308.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..9d1a05f45e2ce62ef62e862032c77fda361adc3d
Binary files /dev/null and b/mkp/bgp_peer-2.2.2-20240308.mkp differ
diff --git a/agent_based/bgp_peer.py b/source/agent_based/bgp_peer.py
similarity index 100%
rename from agent_based/bgp_peer.py
rename to source/agent_based/bgp_peer.py
diff --git a/agent_based/inv_bgp_peer.py b/source/agent_based/inv_bgp_peer.py
similarity index 100%
rename from agent_based/inv_bgp_peer.py
rename to source/agent_based/inv_bgp_peer.py
diff --git a/agent_based/utils/bgp_peer.py b/source/agent_based/utils/bgp_peer.py
similarity index 100%
rename from agent_based/utils/bgp_peer.py
rename to source/agent_based/utils/bgp_peer.py
diff --git a/checkman/bgp_peer b/source/checkman/bgp_peer
similarity index 100%
rename from checkman/bgp_peer
rename to source/checkman/bgp_peer
diff --git a/gui/metrics/bgp_peer.py b/source/gui/metrics/bgp_peer.py
similarity index 100%
rename from gui/metrics/bgp_peer.py
rename to source/gui/metrics/bgp_peer.py
diff --git a/gui/wato/check_parameters/bgp_peer.py b/source/gui/wato/check_parameters/bgp_peer.py
similarity index 100%
rename from gui/wato/check_parameters/bgp_peer.py
rename to source/gui/wato/check_parameters/bgp_peer.py
diff --git a/gui/wato/check_parameters/inv_bgp_peer.py b/source/gui/wato/check_parameters/inv_bgp_peer.py
similarity index 100%
rename from gui/wato/check_parameters/inv_bgp_peer.py
rename to source/gui/wato/check_parameters/inv_bgp_peer.py
diff --git a/packages/bgp_peer b/source/packages/bgp_peer
similarity index 91%
rename from packages/bgp_peer
rename to source/packages/bgp_peer
index d11ad2248f9de72d36c34d6926133c061ae66827..d56270f46f2172be4679ce52b7fd0639c19dc57a 100644
--- a/packages/bgp_peer
+++ b/source/packages/bgp_peer
@@ -32,12 +32,12 @@
                            'utils/bgp_peer.py'],
            'checkman': ['bgp_peer'],
            'gui': ['metrics/bgp_peer.py',
-                   'views/inv_bgp_peer.py',
                    'wato/check_parameters/bgp_peer.py',
-                   'wato/check_parameters/inv_bgp_peer.py']},
+                   'wato/check_parameters/inv_bgp_peer.py'],
+           'web': ['plugins/views/inv_bgp_peer.py']},
  'name': 'bgp_peer',
  'title': 'BGP Peer',
- 'version': '2.2.2-20230817',
+ 'version': '2.2.2-20240308',
  'version.min_required': '2.2.0b1',
- 'version.packaged': '2.2.0p7',
+ 'version.packaged': '2.2.0p17',
  'version.usable_until': None}
diff --git a/gui/views/inv_bgp_peer.py b/source/web/plugins/views/inv_bgp_peer.py
similarity index 100%
rename from gui/views/inv_bgp_peer.py
rename to source/web/plugins/views/inv_bgp_peer.py