diff --git a/README.md b/README.md
index fd4b5fa01b2ba2271adfa7a40205092f42a8ebde..f596fdb395f629b0f6a7dbf6168cabb9be50406e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[PACKAGE]: ../../raw/master/vzlogger-0.0.1-20230806.mkp "vzlogger-0.0.1-20230806.mkp"
+[PACKAGE]: ../../raw/master/mkp/vzlogger-0.0.1-20230806.mkp "vzlogger-0.0.1-20230806.mkp"
# Monitors values form the vzlogger middleware
see https://wiki.volkszaehler.org/software/controller/vzlogger
diff --git a/checkman/vzlogger b/checkman/vzlogger
deleted file mode 100644
index 08ef898bcf6eb7a7979de60090d54f9719bbbc5b..0000000000000000000000000000000000000000
--- a/checkman/vzlogger
+++ /dev/null
@@ -1,45 +0,0 @@
-title: Dummy check man page - used as template for new check manuals
-agents: linux, windows, aix, solaris, hpux, vms, freebsd, snmp
-catalog: see modules/catalog.py for possible values
-license: GPL
-distribution: check_mk
-description:
- Describe here: (1) what the check actually does, (2) under which
- circumstances it goes warning/critical, (3) which devices are supported
- by the check, (4) if the check requires a separated plugin or
- tool or separate configuration on the target host.
-
-item:
- Describe the syntax and meaning of the check's item here. Provide all
- information one needs if coding a manual check with {checks +=} in {main.mk}.
- Give an example. If the check uses {None} as sole item,
- then leave out this section.
-
-examples:
- # Give examples for configuration in {main.mk} here. If the check has
- # configuration variable, then give example for them here.
-
- # set default levels to 40 and 60 percent:
- foo_default_values = (40, 60)
-
- # another configuration variable here:
- inventory_foo_filter = [ "superfoo", "superfoo2" ]
-
-perfdata:
- Describe precisely the number and meaning of performance variables
- the check sends. If it outputs no performance data, then leave out this
- section.
-
-inventory:
- Describe how the inventory for the check works. Which items
- will it find? Describe the influence of check specific
- configuration parameters to the inventory.
-
-[parameters]
-foofirst(int): describe the first parameter here (if parameters are grouped
- as tuple)
-fooother(string): describe another parameter here.
-
-[configuration]
-foo_default_levels(int, int): Describe global configuration variable of
- foo here. Important: also tell the user how they are preset.
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/mkp/vzlogger-0.0.1-20230806.mkp b/mkp/vzlogger-0.0.1-20230806.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..b3261221c3eef34c6ab579914fc14470450a1bec
Binary files /dev/null and b/mkp/vzlogger-0.0.1-20230806.mkp differ
diff --git a/agent_based/vzlogger.py b/source/agent_based/vzlogger.py
similarity index 100%
rename from agent_based/vzlogger.py
rename to source/agent_based/vzlogger.py
diff --git a/agents/special/agent_vzlogger b/source/agents/special/agent_vzlogger
similarity index 100%
rename from agents/special/agent_vzlogger
rename to source/agents/special/agent_vzlogger
diff --git a/checks/agent_vzlogger b/source/checks/agent_vzlogger
similarity index 100%
rename from checks/agent_vzlogger
rename to source/checks/agent_vzlogger
diff --git a/gui/metrics/vzlogger.py b/source/gui/metrics/vzlogger.py
similarity index 100%
rename from gui/metrics/vzlogger.py
rename to source/gui/metrics/vzlogger.py
diff --git a/gui/wato/check_parameters/agent_vzlogger.py b/source/gui/wato/check_parameters/agent_vzlogger.py
similarity index 100%
rename from gui/wato/check_parameters/agent_vzlogger.py
rename to source/gui/wato/check_parameters/agent_vzlogger.py
diff --git a/gui/wato/check_parameters/vzlogger.py b/source/gui/wato/check_parameters/vzlogger.py
similarity index 100%
rename from gui/wato/check_parameters/vzlogger.py
rename to source/gui/wato/check_parameters/vzlogger.py
diff --git a/lib/python3/cmk/special_agents/agent_vzlogger.py b/source/lib/python3/cmk/special_agents/agent_vzlogger.py
similarity index 100%
rename from lib/python3/cmk/special_agents/agent_vzlogger.py
rename to source/lib/python3/cmk/special_agents/agent_vzlogger.py
diff --git a/packages/vzlogger b/source/packages/vzlogger
similarity index 95%
rename from packages/vzlogger
rename to source/packages/vzlogger
index 2b6fb27e67dfd6d594bfef767ae822a24c20eef3..87c40409d36f5bd0fd3bae1c76ddfdc8584f9071 100644
--- a/packages/vzlogger
+++ b/source/packages/vzlogger
@@ -14,5 +14,5 @@
'title': 'vzlogger',
'version': '0.0.1-20230806',
'version.min_required': '2.2.0b1',
- 'version.packaged': '2.2.0p7',
+ 'version.packaged': '2.2.0p17',
'version.usable_until': None}
diff --git a/vzlogger-0.0.1-20230806.mkp b/vzlogger-0.0.1-20230806.mkp
deleted file mode 100644
index e446552c58359b12e7018f9d0c339f88110b2343..0000000000000000000000000000000000000000
Binary files a/vzlogger-0.0.1-20230806.mkp and /dev/null differ
diff --git a/web/plugins/metrics/vzlogger.py b/web/plugins/metrics/vzlogger.py
deleted file mode 100644
index e073120b8b3102eebfcf73d4d581391053792faf..0000000000000000000000000000000000000000
--- a/web/plugins/metrics/vzlogger.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2019 tribe29 GmbH - License: GNU General Public License v2
-# This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
-# conditions defined in the file COPYING, which is part of this source code package.
-
-from cmk.gui.i18n import _
-from cmk.gui.plugins.metrics.utils import (
- metric_info,
- perfometer_info,
-)
-
-metric_info['meter_reading'] = {
- 'title': _('Meter reading'),
- 'unit': 'wh',
- 'color': '41/a',
-}
-
-
-perfometer_info.append({
- 'type': 'logarithmic',
- 'metric': 'meter_reading',
- 'half_value': 50000000.0, # 50MWh
- 'exponent': 4,
-})