122 files changed, 16 insertions, 17 deletions
diff --git a/manager/.gitlab-ci.yml b/.gitlab-ci.manager.yml
index 369035c8..cc94c0bf 100644
--- a/manager/.gitlab-ci.yml
+++ b/.gitlab-ci.manager.yml
@@ -4,7 +4,6 @@ stages:
 default:
   image: $IMAGE_PREFIX/manager:$IMAGE_TAG
   before_script:
-    - cd manager
     - poetry --version
     - poetry env use $PYTHON_INTERPRETER
   tags:
@@ -36,15 +35,15 @@ lint:py3.12:
     - mkdir -p /var/cache/knot-resolver
     - poe test
     # the following command makes sure that the source root of the coverage file is at $gitroot
-    - poetry run bash -c "cd ..; coverage combine manager/.coverage; coverage xml"
+    - poetry run bash -c "coverage combine .coverage; coverage xml"
   artifacts:
     reports:
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
-      junit: manager/unit.junit.xml
+      junit: unit.junit.xml
     paths:
-      - manager/unit.junit.xml
+      - unit.junit.xml
 
 unit:py3.8:
   <<: *unit
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e34ba7e0..12222fe2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -381,7 +381,7 @@ manager:
   stage: test
   needs: []
   trigger:
-    include: manager/.gitlab-ci.yml
+    include: .gitlab-ci.manager.yml
     strategy: depend
   except:
     refs:
diff --git a/manager/ARCHITECTURE.md b/ARCHITECTURE.md
index 18df7885..18df7885 100644
--- a/manager/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
diff --git a/manager/ERROR_HANDLING.md b/ERROR_HANDLING.md
index 770227b8..770227b8 100644
--- a/manager/ERROR_HANDLING.md
+++ b/ERROR_HANDLING.md
diff --git a/build_c_extensions.py b/build_c_extensions.py
index 40d281f5..ad63013a 100644
--- a/build_c_extensions.py
+++ b/build_c_extensions.py
@@ -9,7 +9,7 @@ def build(setup_kwargs: Dict[Any, Any]) -> None:
             "ext_modules": [
                 Extension(
                     name="knot_resolver_manager.kresd_controller.supervisord.plugin.notify",
-                    sources=["manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c"],
+                    sources=["python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c"],
                 ),
             ]
         }
diff --git a/pyproject.toml b/pyproject.toml
index 2a4bedf2..013b300d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ repository = "https://gitlab.nic.cz/knot/knot-resolver"
 documentation = "https://www.knot-resolver.cz/documentation"
 
 packages = [
-    {include = "knot_resolver_manager", from = "manager"}
+    {include = "knot_resolver_manager", from = "python"}
 ]
 
 # See currently open issue about building C extensions here:
diff --git a/manager/knot_resolver_manager/__init__.py b/python/knot_resolver_manager/__init__.py
index 3dc1f76b..3dc1f76b 100644
--- a/manager/knot_resolver_manager/__init__.py
+++ b/python/knot_resolver_manager/__init__.py
diff --git a/manager/knot_resolver_manager/__main__.py b/python/knot_resolver_manager/__main__.py
index 89eabd56..89eabd56 100644
--- a/manager/knot_resolver_manager/__main__.py
+++ b/python/knot_resolver_manager/__main__.py
diff --git a/manager/knot_resolver_manager/cli/__init__.py b/python/knot_resolver_manager/cli/__init__.py
index d3c6280d..d3c6280d 100644
--- a/manager/knot_resolver_manager/cli/__init__.py
+++ b/python/knot_resolver_manager/cli/__init__.py
diff --git a/manager/knot_resolver_manager/cli/__main__.py b/python/knot_resolver_manager/cli/__main__.py
index 88a83a67..88a83a67 100644
--- a/manager/knot_resolver_manager/cli/__main__.py
+++ b/python/knot_resolver_manager/cli/__main__.py
diff --git a/manager/knot_resolver_manager/cli/cmd/cache.py b/python/knot_resolver_manager/cli/cmd/cache.py
index e5a15035..e5a15035 100644
--- a/manager/knot_resolver_manager/cli/cmd/cache.py
+++ b/python/knot_resolver_manager/cli/cmd/cache.py
diff --git a/manager/knot_resolver_manager/cli/cmd/completion.py b/python/knot_resolver_manager/cli/cmd/completion.py
index 87a91838..87a91838 100644
--- a/manager/knot_resolver_manager/cli/cmd/completion.py
+++ b/python/knot_resolver_manager/cli/cmd/completion.py
diff --git a/manager/knot_resolver_manager/cli/cmd/config.py b/python/knot_resolver_manager/cli/cmd/config.py
index f0be2cbc..f0be2cbc 100644
--- a/manager/knot_resolver_manager/cli/cmd/config.py
+++ b/python/knot_resolver_manager/cli/cmd/config.py
diff --git a/manager/knot_resolver_manager/cli/cmd/convert.py b/python/knot_resolver_manager/cli/cmd/convert.py
index 7bb2858f..7bb2858f 100644
--- a/manager/knot_resolver_manager/cli/cmd/convert.py
+++ b/python/knot_resolver_manager/cli/cmd/convert.py
diff --git a/manager/knot_resolver_manager/cli/cmd/help.py b/python/knot_resolver_manager/cli/cmd/help.py
index d374005e..d374005e 100644
--- a/manager/knot_resolver_manager/cli/cmd/help.py
+++ b/python/knot_resolver_manager/cli/cmd/help.py
diff --git a/manager/knot_resolver_manager/cli/cmd/metrics.py b/python/knot_resolver_manager/cli/cmd/metrics.py
index 7f466ec3..7f466ec3 100644
--- a/manager/knot_resolver_manager/cli/cmd/metrics.py
+++ b/python/knot_resolver_manager/cli/cmd/metrics.py
diff --git a/manager/knot_resolver_manager/cli/cmd/reload.py b/python/knot_resolver_manager/cli/cmd/reload.py
index 89782f4e..89782f4e 100644
--- a/manager/knot_resolver_manager/cli/cmd/reload.py
+++ b/python/knot_resolver_manager/cli/cmd/reload.py
diff --git a/manager/knot_resolver_manager/cli/cmd/schema.py b/python/knot_resolver_manager/cli/cmd/schema.py
index 25369946..25369946 100644
--- a/manager/knot_resolver_manager/cli/cmd/schema.py
+++ b/python/knot_resolver_manager/cli/cmd/schema.py
diff --git a/manager/knot_resolver_manager/cli/cmd/stop.py b/python/knot_resolver_manager/cli/cmd/stop.py
index a3f46354..a3f46354 100644
--- a/manager/knot_resolver_manager/cli/cmd/stop.py
+++ b/python/knot_resolver_manager/cli/cmd/stop.py
diff --git a/manager/knot_resolver_manager/cli/cmd/validate.py b/python/knot_resolver_manager/cli/cmd/validate.py
index aacd1989..aacd1989 100644
--- a/manager/knot_resolver_manager/cli/cmd/validate.py
+++ b/python/knot_resolver_manager/cli/cmd/validate.py
diff --git a/manager/knot_resolver_manager/cli/command.py b/python/knot_resolver_manager/cli/command.py
index 72154a40..72154a40 100644
--- a/manager/knot_resolver_manager/cli/command.py
+++ b/python/knot_resolver_manager/cli/command.py
diff --git a/manager/knot_resolver_manager/cli/kresctl.py b/python/knot_resolver_manager/cli/kresctl.py
index cbcc12a3..cbcc12a3 100644
--- a/manager/knot_resolver_manager/cli/kresctl.py
+++ b/python/knot_resolver_manager/cli/kresctl.py
diff --git a/manager/knot_resolver_manager/cli/main.py b/python/knot_resolver_manager/cli/main.py
index 301a9539..301a9539 100644
--- a/manager/knot_resolver_manager/cli/main.py
+++ b/python/knot_resolver_manager/cli/main.py
diff --git a/manager/knot_resolver_manager/compat/__init__.py b/python/knot_resolver_manager/compat/__init__.py
index 53993f6c..53993f6c 100644
--- a/manager/knot_resolver_manager/compat/__init__.py
+++ b/python/knot_resolver_manager/compat/__init__.py
diff --git a/manager/knot_resolver_manager/compat/asyncio.py b/python/knot_resolver_manager/compat/asyncio.py
index 9e10e6c6..9e10e6c6 100644
--- a/manager/knot_resolver_manager/compat/asyncio.py
+++ b/python/knot_resolver_manager/compat/asyncio.py
diff --git a/manager/knot_resolver_manager/config_store.py b/python/knot_resolver_manager/config_store.py
index e5fbaf60..e5fbaf60 100644
--- a/manager/knot_resolver_manager/config_store.py
+++ b/python/knot_resolver_manager/config_store.py
diff --git a/manager/knot_resolver_manager/constants.py b/python/knot_resolver_manager/constants.py
index 9253c2db..9253c2db 100644
--- a/manager/knot_resolver_manager/constants.py
+++ b/python/knot_resolver_manager/constants.py
diff --git a/manager/knot_resolver_manager/datamodel/__init__.py b/python/knot_resolver_manager/datamodel/__init__.py
index a0174acc..a0174acc 100644
--- a/manager/knot_resolver_manager/datamodel/__init__.py
+++ b/python/knot_resolver_manager/datamodel/__init__.py
diff --git a/manager/knot_resolver_manager/datamodel/cache_schema.py b/python/knot_resolver_manager/datamodel/cache_schema.py
index 4ed9fc3a..4ed9fc3a 100644
--- a/manager/knot_resolver_manager/datamodel/cache_schema.py
+++ b/python/knot_resolver_manager/datamodel/cache_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/config_schema.py b/python/knot_resolver_manager/datamodel/config_schema.py
index c8398569..c8398569 100644
--- a/manager/knot_resolver_manager/datamodel/config_schema.py
+++ b/python/knot_resolver_manager/datamodel/config_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/design-notes.yml b/python/knot_resolver_manager/datamodel/design-notes.yml
index e4424bc8..e4424bc8 100644
--- a/manager/knot_resolver_manager/datamodel/design-notes.yml
+++ b/python/knot_resolver_manager/datamodel/design-notes.yml
diff --git a/manager/knot_resolver_manager/datamodel/dns64_schema.py b/python/knot_resolver_manager/datamodel/dns64_schema.py
index 60b92f2b..60b92f2b 100644
--- a/manager/knot_resolver_manager/datamodel/dns64_schema.py
+++ b/python/knot_resolver_manager/datamodel/dns64_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/dnssec_schema.py b/python/knot_resolver_manager/datamodel/dnssec_schema.py
index e51500e1..e51500e1 100644
--- a/manager/knot_resolver_manager/datamodel/dnssec_schema.py
+++ b/python/knot_resolver_manager/datamodel/dnssec_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/forward_schema.py b/python/knot_resolver_manager/datamodel/forward_schema.py
index 52a05f36..52a05f36 100644
--- a/manager/knot_resolver_manager/datamodel/forward_schema.py
+++ b/python/knot_resolver_manager/datamodel/forward_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/globals.py b/python/knot_resolver_manager/datamodel/globals.py
index 610323fa..610323fa 100644
--- a/manager/knot_resolver_manager/datamodel/globals.py
+++ b/python/knot_resolver_manager/datamodel/globals.py
diff --git a/manager/knot_resolver_manager/datamodel/local_data_schema.py b/python/knot_resolver_manager/datamodel/local_data_schema.py
index fafa7ebe..fafa7ebe 100644
--- a/manager/knot_resolver_manager/datamodel/local_data_schema.py
+++ b/python/knot_resolver_manager/datamodel/local_data_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/logging_schema.py b/python/knot_resolver_manager/datamodel/logging_schema.py
index 601cd4a5..601cd4a5 100644
--- a/manager/knot_resolver_manager/datamodel/logging_schema.py
+++ b/python/knot_resolver_manager/datamodel/logging_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/lua_schema.py b/python/knot_resolver_manager/datamodel/lua_schema.py
index 079333ae..079333ae 100644
--- a/manager/knot_resolver_manager/datamodel/lua_schema.py
+++ b/python/knot_resolver_manager/datamodel/lua_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/management_schema.py b/python/knot_resolver_manager/datamodel/management_schema.py
index 44f8f3e8..44f8f3e8 100644
--- a/manager/knot_resolver_manager/datamodel/management_schema.py
+++ b/python/knot_resolver_manager/datamodel/management_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/monitoring_schema.py b/python/knot_resolver_manager/datamodel/monitoring_schema.py
index dfc4a116..dfc4a116 100644
--- a/manager/knot_resolver_manager/datamodel/monitoring_schema.py
+++ b/python/knot_resolver_manager/datamodel/monitoring_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/network_schema.py b/python/knot_resolver_manager/datamodel/network_schema.py
index b9a35090..b9a35090 100644
--- a/manager/knot_resolver_manager/datamodel/network_schema.py
+++ b/python/knot_resolver_manager/datamodel/network_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/options_schema.py b/python/knot_resolver_manager/datamodel/options_schema.py
index d0bb0399..d0bb0399 100644
--- a/manager/knot_resolver_manager/datamodel/options_schema.py
+++ b/python/knot_resolver_manager/datamodel/options_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/policy_schema.py b/python/knot_resolver_manager/datamodel/policy_schema.py
index bbc61cd1..bbc61cd1 100644
--- a/manager/knot_resolver_manager/datamodel/policy_schema.py
+++ b/python/knot_resolver_manager/datamodel/policy_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/rpz_schema.py b/python/knot_resolver_manager/datamodel/rpz_schema.py
index bf98bd0c..bf98bd0c 100644
--- a/manager/knot_resolver_manager/datamodel/rpz_schema.py
+++ b/python/knot_resolver_manager/datamodel/rpz_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/slice_schema.py b/python/knot_resolver_manager/datamodel/slice_schema.py
index 0c7cdea1..0c7cdea1 100644
--- a/manager/knot_resolver_manager/datamodel/slice_schema.py
+++ b/python/knot_resolver_manager/datamodel/slice_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/static_hints_schema.py b/python/knot_resolver_manager/datamodel/static_hints_schema.py
index 89db49bb..89db49bb 100644
--- a/manager/knot_resolver_manager/datamodel/static_hints_schema.py
+++ b/python/knot_resolver_manager/datamodel/static_hints_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/stub_zone_schema.py b/python/knot_resolver_manager/datamodel/stub_zone_schema.py
index b9945ecc..b9945ecc 100644
--- a/manager/knot_resolver_manager/datamodel/stub_zone_schema.py
+++ b/python/knot_resolver_manager/datamodel/stub_zone_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/templates/__init__.py b/python/knot_resolver_manager/datamodel/templates/__init__.py
index 832503b7..832503b7 100644
--- a/manager/knot_resolver_manager/datamodel/templates/__init__.py
+++ b/python/knot_resolver_manager/datamodel/templates/__init__.py
diff --git a/manager/knot_resolver_manager/datamodel/templates/cache.lua.j2 b/python/knot_resolver_manager/datamodel/templates/cache.lua.j2
index f0176a59..f0176a59 100644
--- a/manager/knot_resolver_manager/datamodel/templates/cache.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/cache.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2 b/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2
index c5239f00..c5239f00 100644
--- a/manager/knot_resolver_manager/datamodel/templates/dns64.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 b/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
index 05d1fa68..05d1fa68 100644
--- a/manager/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/forward.lua.j2 b/python/knot_resolver_manager/datamodel/templates/forward.lua.j2
index 24311da1..24311da1 100644
--- a/manager/knot_resolver_manager/datamodel/templates/forward.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/forward.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/local_data.lua.j2 b/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2
index 8882471f..8882471f 100644
--- a/manager/knot_resolver_manager/datamodel/templates/local_data.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2 b/python/knot_resolver_manager/datamodel/templates/logging.lua.j2
index 2d5937a8..2d5937a8 100644
--- a/manager/knot_resolver_manager/datamodel/templates/logging.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/logging.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2
index 51df48da..51df48da 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
index 4c2ba11a..4c2ba11a 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2
index b7723fb0..b7723fb0 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
index 0898571c..0898571c 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2
index 79800f7d..79800f7d 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
index 347532e6..347532e6 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 b/python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
index 2f1a7964..2f1a7964 100644
--- a/manager/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 b/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
index 624b59ab..624b59ab 100644
--- a/manager/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2 b/python/knot_resolver_manager/datamodel/templates/network.lua.j2
index 665ee454..665ee454 100644
--- a/manager/knot_resolver_manager/datamodel/templates/network.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/network.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/options.lua.j2 b/python/knot_resolver_manager/datamodel/templates/options.lua.j2
index 8210fb6d..8210fb6d 100644
--- a/manager/knot_resolver_manager/datamodel/templates/options.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/options.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 b/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2
index 4c5c9048..4c5c9048 100644
--- a/manager/knot_resolver_manager/datamodel/templates/policy-config.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 b/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
index 130facf9..130facf9 100644
--- a/manager/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/views.lua.j2 b/python/knot_resolver_manager/datamodel/templates/views.lua.j2
index 81de8c7b..81de8c7b 100644
--- a/manager/knot_resolver_manager/datamodel/templates/views.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/views.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 b/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
index 938ea8da..938ea8da 100644
--- a/manager/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 b/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2
index 17c49fb0..17c49fb0 100644
--- a/manager/knot_resolver_manager/datamodel/templates/worker-config.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2
diff --git a/manager/knot_resolver_manager/datamodel/types/__init__.py b/python/knot_resolver_manager/datamodel/types/__init__.py
index a3d7db3e..a3d7db3e 100644
--- a/manager/knot_resolver_manager/datamodel/types/__init__.py
+++ b/python/knot_resolver_manager/datamodel/types/__init__.py
diff --git a/manager/knot_resolver_manager/datamodel/types/base_types.py b/python/knot_resolver_manager/datamodel/types/base_types.py
index 91f53406..91f53406 100644
--- a/manager/knot_resolver_manager/datamodel/types/base_types.py
+++ b/python/knot_resolver_manager/datamodel/types/base_types.py
diff --git a/manager/knot_resolver_manager/datamodel/types/enums.py b/python/knot_resolver_manager/datamodel/types/enums.py
index bc93ae2f..bc93ae2f 100644
--- a/manager/knot_resolver_manager/datamodel/types/enums.py
+++ b/python/knot_resolver_manager/datamodel/types/enums.py
diff --git a/manager/knot_resolver_manager/datamodel/types/files.py b/python/knot_resolver_manager/datamodel/types/files.py
index 4c6e7186..4c6e7186 100644
--- a/manager/knot_resolver_manager/datamodel/types/files.py
+++ b/python/knot_resolver_manager/datamodel/types/files.py
diff --git a/manager/knot_resolver_manager/datamodel/types/generic_types.py b/python/knot_resolver_manager/datamodel/types/generic_types.py
index 549b11a8..549b11a8 100644
--- a/manager/knot_resolver_manager/datamodel/types/generic_types.py
+++ b/python/knot_resolver_manager/datamodel/types/generic_types.py
diff --git a/manager/knot_resolver_manager/datamodel/types/types.py b/python/knot_resolver_manager/datamodel/types/types.py
index d9a0b910..d9a0b910 100644
--- a/manager/knot_resolver_manager/datamodel/types/types.py
+++ b/python/knot_resolver_manager/datamodel/types/types.py
diff --git a/manager/knot_resolver_manager/datamodel/view_schema.py b/python/knot_resolver_manager/datamodel/view_schema.py
index ad44eb3b..ad44eb3b 100644
--- a/manager/knot_resolver_manager/datamodel/view_schema.py
+++ b/python/knot_resolver_manager/datamodel/view_schema.py
diff --git a/manager/knot_resolver_manager/datamodel/webmgmt_schema.py b/python/knot_resolver_manager/datamodel/webmgmt_schema.py
index 2e75c3b7..2e75c3b7 100644
--- a/manager/knot_resolver_manager/datamodel/webmgmt_schema.py
+++ b/python/knot_resolver_manager/datamodel/webmgmt_schema.py
diff --git a/manager/knot_resolver_manager/exceptions.py b/python/knot_resolver_manager/exceptions.py
index 5b05d98e..5b05d98e 100644
--- a/manager/knot_resolver_manager/exceptions.py
+++ b/python/knot_resolver_manager/exceptions.py
diff --git a/manager/knot_resolver_manager/kres_manager.py b/python/knot_resolver_manager/kres_manager.py
index f916dfaa..f916dfaa 100644
--- a/manager/knot_resolver_manager/kres_manager.py
+++ b/python/knot_resolver_manager/kres_manager.py
diff --git a/manager/knot_resolver_manager/kresd_controller/__init__.py b/python/knot_resolver_manager/kresd_controller/__init__.py
index a21bc44c..a21bc44c 100644
--- a/manager/knot_resolver_manager/kresd_controller/__init__.py
+++ b/python/knot_resolver_manager/kresd_controller/__init__.py
diff --git a/manager/knot_resolver_manager/kresd_controller/interface.py b/python/knot_resolver_manager/kresd_controller/interface.py
index 63caea49..63caea49 100644
--- a/manager/knot_resolver_manager/kresd_controller/interface.py
+++ b/python/knot_resolver_manager/kresd_controller/interface.py
diff --git a/manager/knot_resolver_manager/kresd_controller/registered_workers.py b/python/knot_resolver_manager/kresd_controller/registered_workers.py
index b6ea834e..b6ea834e 100644
--- a/manager/knot_resolver_manager/kresd_controller/registered_workers.py
+++ b/python/knot_resolver_manager/kresd_controller/registered_workers.py
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/__init__.py b/python/knot_resolver_manager/kresd_controller/supervisord/__init__.py
index 5fb4d81d..5fb4d81d 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/__init__.py
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/__init__.py
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py b/python/knot_resolver_manager/kresd_controller/supervisord/config_file.py
index 2fb7a99b..2fb7a99b 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/config_file.py
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/config_file.py
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py
index c3834784..c3834784 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/fast_rpcinterface.py
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py
index 81115617..81115617 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/manager_integration.py
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c
index d56ee7d2..d56ee7d2 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/notifymodule.c
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py
index 411f232e..411f232e 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/patch_logger.py
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py
index cffe6fd3..cffe6fd3 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/plugin/sd_notify.py
diff --git a/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2 b/python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2
index b1fed1aa..b1fed1aa 100644
--- a/manager/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2
+++ b/python/knot_resolver_manager/kresd_controller/supervisord/supervisord.conf.j2
diff --git a/manager/knot_resolver_manager/log.py b/python/knot_resolver_manager/log.py
index 19271c52..19271c52 100644
--- a/manager/knot_resolver_manager/log.py
+++ b/python/knot_resolver_manager/log.py
diff --git a/manager/knot_resolver_manager/main.py b/python/knot_resolver_manager/main.py
index 9428c880..9428c880 100644
--- a/manager/knot_resolver_manager/main.py
+++ b/python/knot_resolver_manager/main.py
diff --git a/manager/knot_resolver_manager/server.py b/python/knot_resolver_manager/server.py
index b27cadb3..b27cadb3 100644
--- a/manager/knot_resolver_manager/server.py
+++ b/python/knot_resolver_manager/server.py
diff --git a/manager/knot_resolver_manager/statistics.py b/python/knot_resolver_manager/statistics.py
index ae9d9811..ae9d9811 100644
--- a/manager/knot_resolver_manager/statistics.py
+++ b/python/knot_resolver_manager/statistics.py
diff --git a/manager/knot_resolver_manager/utils/__init__.py b/python/knot_resolver_manager/utils/__init__.py
index edc36fca..edc36fca 100644
--- a/manager/knot_resolver_manager/utils/__init__.py
+++ b/python/knot_resolver_manager/utils/__init__.py
diff --git a/manager/knot_resolver_manager/utils/async_utils.py b/python/knot_resolver_manager/utils/async_utils.py
index 1cd7303e..1cd7303e 100644
--- a/manager/knot_resolver_manager/utils/async_utils.py
+++ b/python/knot_resolver_manager/utils/async_utils.py
diff --git a/manager/knot_resolver_manager/utils/custom_atexit.py b/python/knot_resolver_manager/utils/custom_atexit.py
index 2fe55433..2fe55433 100644
--- a/manager/knot_resolver_manager/utils/custom_atexit.py
+++ b/python/knot_resolver_manager/utils/custom_atexit.py
diff --git a/manager/knot_resolver_manager/utils/etag.py b/python/knot_resolver_manager/utils/etag.py
index bb80700b..bb80700b 100644
--- a/manager/knot_resolver_manager/utils/etag.py
+++ b/python/knot_resolver_manager/utils/etag.py
diff --git a/manager/knot_resolver_manager/utils/functional.py b/python/knot_resolver_manager/utils/functional.py
index 43abd705..43abd705 100644
--- a/manager/knot_resolver_manager/utils/functional.py
+++ b/python/knot_resolver_manager/utils/functional.py
diff --git a/manager/knot_resolver_manager/utils/modeling/README.md b/python/knot_resolver_manager/utils/modeling/README.md
index 97c68b54..97c68b54 100644
--- a/manager/knot_resolver_manager/utils/modeling/README.md
+++ b/python/knot_resolver_manager/utils/modeling/README.md
diff --git a/manager/knot_resolver_manager/utils/modeling/__init__.py b/python/knot_resolver_manager/utils/modeling/__init__.py
index d16f6c12..d16f6c12 100644
--- a/manager/knot_resolver_manager/utils/modeling/__init__.py
+++ b/python/knot_resolver_manager/utils/modeling/__init__.py
diff --git a/manager/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py b/python/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py
index 1f2c1767..1f2c1767 100644
--- a/manager/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py
+++ b/python/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py
diff --git a/manager/knot_resolver_manager/utils/modeling/base_schema.py b/python/knot_resolver_manager/utils/modeling/base_schema.py
index 477a6a69..477a6a69 100644
--- a/manager/knot_resolver_manager/utils/modeling/base_schema.py
+++ b/python/knot_resolver_manager/utils/modeling/base_schema.py
diff --git a/manager/knot_resolver_manager/utils/modeling/base_value_type.py b/python/knot_resolver_manager/utils/modeling/base_value_type.py
index dff4a3fe..dff4a3fe 100644
--- a/manager/knot_resolver_manager/utils/modeling/base_value_type.py
+++ b/python/knot_resolver_manager/utils/modeling/base_value_type.py
diff --git a/manager/knot_resolver_manager/utils/modeling/exceptions.py b/python/knot_resolver_manager/utils/modeling/exceptions.py
index c2a28817..c2a28817 100644
--- a/manager/knot_resolver_manager/utils/modeling/exceptions.py
+++ b/python/knot_resolver_manager/utils/modeling/exceptions.py
diff --git a/manager/knot_resolver_manager/utils/modeling/json_pointer.py b/python/knot_resolver_manager/utils/modeling/json_pointer.py
index a60ba5d1..a60ba5d1 100644
--- a/manager/knot_resolver_manager/utils/modeling/json_pointer.py
+++ b/python/knot_resolver_manager/utils/modeling/json_pointer.py
diff --git a/manager/knot_resolver_manager/utils/modeling/parsing.py b/python/knot_resolver_manager/utils/modeling/parsing.py
index 185a53a1..185a53a1 100644
--- a/manager/knot_resolver_manager/utils/modeling/parsing.py
+++ b/python/knot_resolver_manager/utils/modeling/parsing.py
diff --git a/manager/knot_resolver_manager/utils/modeling/query.py b/python/knot_resolver_manager/utils/modeling/query.py
index cfea82f6..cfea82f6 100644
--- a/manager/knot_resolver_manager/utils/modeling/query.py
+++ b/python/knot_resolver_manager/utils/modeling/query.py
diff --git a/manager/knot_resolver_manager/utils/modeling/renaming.py b/python/knot_resolver_manager/utils/modeling/renaming.py
index 2420ed04..2420ed04 100644
--- a/manager/knot_resolver_manager/utils/modeling/renaming.py
+++ b/python/knot_resolver_manager/utils/modeling/renaming.py
diff --git a/manager/knot_resolver_manager/utils/modeling/types.py b/python/knot_resolver_manager/utils/modeling/types.py
index 4ce9aecc..4ce9aecc 100644
--- a/manager/knot_resolver_manager/utils/modeling/types.py
+++ b/python/knot_resolver_manager/utils/modeling/types.py
diff --git a/manager/knot_resolver_manager/utils/requests.py b/python/knot_resolver_manager/utils/requests.py
index e52e54a3..e52e54a3 100644
--- a/manager/knot_resolver_manager/utils/requests.py
+++ b/python/knot_resolver_manager/utils/requests.py
diff --git a/manager/knot_resolver_manager/utils/systemd_notify.py b/python/knot_resolver_manager/utils/systemd_notify.py
index 44e8dee1..44e8dee1 100644
--- a/manager/knot_resolver_manager/utils/systemd_notify.py
+++ b/python/knot_resolver_manager/utils/systemd_notify.py
diff --git a/manager/knot_resolver_manager/utils/which.py b/python/knot_resolver_manager/utils/which.py
index 450102f3..450102f3 100644
--- a/manager/knot_resolver_manager/utils/which.py
+++ b/python/knot_resolver_manager/utils/which.py
diff --git a/scripts/meson/make-doc.sh b/scripts/meson/make-doc.sh
index aecf0410..a472d4cb 100755
--- a/scripts/meson/make-doc.sh
+++ b/scripts/meson/make-doc.sh
@@ -4,7 +4,7 @@ set -o errexit -o nounset
 cd "$(dirname "${0}")/../.."
 
 # generate JSON schema for the manager's declarative config
-pushd manager
+pushd python
 ## the following python command should hopefully run without any dependencies except for standard python
 mkdir -p ../doc/_static/
 python3 -m knot_resolver_manager.cli schema > ../doc/_static/config.schema.json
diff --git a/scripts/poe-tasks/check b/scripts/poe-tasks/check
index ff7bdf9f..49491c11 100755
--- a/scripts/poe-tasks/check
+++ b/scripts/poe-tasks/check
@@ -32,25 +32,25 @@ fi
 
 # check formatting using black
 echo -e "${yellow}Checking formatting using black...${reset}"
-black manager/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff
+black python/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff
 check_rv $?
 echo
 
 # check code with pylint
 echo -e "${yellow}Linting using pylint...${reset}"
-pylint manager/knot_resolver_manager
+pylint python/knot_resolver_manager
 check_rv $?
 echo
 
 # check code with flake8
 echo -e "${yellow}Linting using flake8...${reset}"
-flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 manager/knot_resolver_manager
+flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 python/knot_resolver_manager
 check_rv $?
 echo
 
 # check types with mypy
 echo -e "${yellow}Type checking using mypy...${reset}"
-mypy manager/knot_resolver_manager
+mypy python/knot_resolver_manager
 check_rv $?
 echo
 
diff --git a/scripts/poe-tasks/format b/scripts/poe-tasks/format
index 80b2da0d..e9e19287 100755
--- a/scripts/poe-tasks/format
+++ b/scripts/poe-tasks/format
@@ -4,7 +4,7 @@
 src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/utils/_env.sh
 
-dirs="manager/knot_resolver_manager/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py"
+dirs="python/knot_resolver_manager/ tests/manager scripts/poe-tasks/utils/create_setup.py build_c_extensions.py"
 
 # run black code formater
 black $dirs
diff --git a/scripts/poe-tasks/run b/scripts/poe-tasks/run
index 23a33959..a3f08177 100755
--- a/scripts/poe-tasks/run
+++ b/scripts/poe-tasks/run
@@ -14,8 +14,8 @@ poetry build
 shopt -s globstar
 shopt -s nullglob
 for d in build/lib*; do
-    for f in "manager/$d/"**/*.so; do
-        cp -v "$f" ${f#"manager/$d/"}
+    for f in "python/$d/"**/*.so; do
+        cp -v "$f" ${f#"python/$d/"}
     done
 done
 shopt -u globstar
diff --git a/scripts/poe-tasks/test b/scripts/poe-tasks/test
index 43aa403a..6b37dff7 100755
--- a/scripts/poe-tasks/test
+++ b/scripts/poe-tasks/test
@@ -5,4 +5,4 @@ src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/utils/_env.sh
 
 # run pytest
-env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=manager/knot_resolver_manager --show-capture=all tests/manager
+env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=python/knot_resolver_manager --show-capture=all tests/manager
diff --git a/setup.py b/setup.py
index 16b3c3a1..04eb40ee 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 package_dir = \
-{'': 'manager'}
+{'': 'python'}
 
 packages = \
 ['knot_resolver_manager',
diff --git a/manager/shell-completion/client.bash b/utils/shell-completion/client.bash
index b3c19419..b3c19419 100644
--- a/manager/shell-completion/client.bash
+++ b/utils/shell-completion/client.bash
diff --git a/manager/shell-completion/client.fish b/utils/shell-completion/client.fish
index ec3a0ab7..ec3a0ab7 100644
--- a/manager/shell-completion/client.fish
+++ b/utils/shell-completion/client.fish
diff --git a/manager/shell-completion/meson.build b/utils/shell-completion/meson.build
index 6c35ffe3..6c35ffe3 100644
--- a/manager/shell-completion/meson.build
+++ b/utils/shell-completion/meson.build