89 files changed, 103 insertions, 100 deletions

diff --git a/python/knot_resolver_manager/__init__.py b/python/knot_resolver_manager/__init__.py
index 3dc1f76b..511e8d44 100644
--- a/python/knot_resolver_manager/__init__.py
+++ b/python/knot_resolver_manager/__init__.py
@@ -1 +1,5 @@
+from .datamodel.config_schema import KresConfig
+
 __version__ = "0.1.0"
+
+__all__ = ["KresConfig"]
diff --git a/python/knot_resolver_manager/client/__init__.py b/python/knot_resolver_manager/client/__init__.py
index 2b1eb0f6..d3c6280d 100644
--- a/python/knot_resolver_manager/client/__init__.py
+++ b/python/knot_resolver_manager/client/__init__.py
@@ -1,5 +1,5 @@
 from pathlib import Path
 
-from knot_resolver_manager.manager.datamodel.globals import Context, set_global_validation_context
+from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context
 
 set_global_validation_context(Context(Path("."), False))
diff --git a/python/knot_resolver_manager/client/command.py b/python/knot_resolver_manager/client/command.py
index 6adb0dd9..df772858 100644
--- a/python/knot_resolver_manager/client/command.py
+++ b/python/knot_resolver_manager/client/command.py
@@ -6,8 +6,8 @@ from typing import Dict, List, Optional, Tuple, Type, TypeVar
 from urllib.parse import quote
 
 from knot_resolver_manager.manager.constants import API_SOCK_ENV_VAR, CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE
-from knot_resolver_manager.manager.datamodel.config_schema import DEFAULT_MANAGER_API_SOCK
-from knot_resolver_manager.manager.datamodel.types import IPAddressPort
+from knot_resolver_manager.datamodel.config_schema import DEFAULT_MANAGER_API_SOCK
+from knot_resolver_manager.datamodel.types import IPAddressPort
 from knot_resolver_manager.utils.modeling import parsing
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 from knot_resolver_manager.utils.requests import SocketDesc
diff --git a/python/knot_resolver_manager/client/commands/cache.py b/python/knot_resolver_manager/client/commands/cache.py
index 42d28ce6..493c46d8 100644
--- a/python/knot_resolver_manager/client/commands/cache.py
+++ b/python/knot_resolver_manager/client/commands/cache.py
@@ -4,7 +4,7 @@ from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple, Type
 
 from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.manager.datamodel.cache_schema import CacheClearRPCSchema
+from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema
 from knot_resolver_manager.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError
 from knot_resolver_manager.utils.modeling.parsing import DataFormat, parse_json
 from knot_resolver_manager.utils.requests import request
diff --git a/python/knot_resolver_manager/client/commands/convert.py b/python/knot_resolver_manager/client/commands/convert.py
index 157e0731..a468bf56 100644
--- a/python/knot_resolver_manager/client/commands/convert.py
+++ b/python/knot_resolver_manager/client/commands/convert.py
@@ -4,8 +4,8 @@ from pathlib import Path
 from typing import List, Optional, Tuple, Type
 
 from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.manager.datamodel import KresConfig
-from knot_resolver_manager.manager.datamodel.globals import (
+from knot_resolver_manager.datamodel import KresConfig
+from knot_resolver_manager.datamodel.globals import (
     Context,
     reset_global_validation_context,
     set_global_validation_context,
diff --git a/python/knot_resolver_manager/client/commands/schema.py b/python/knot_resolver_manager/client/commands/schema.py
index 8e48022b..af7ad618 100644
--- a/python/knot_resolver_manager/client/commands/schema.py
+++ b/python/knot_resolver_manager/client/commands/schema.py
@@ -4,7 +4,7 @@ import sys
 from typing import List, Optional, Tuple, Type
 
 from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.config_schema import KresConfig
 from knot_resolver_manager.utils.requests import request
 
 
diff --git a/python/knot_resolver_manager/client/commands/validate.py b/python/knot_resolver_manager/client/commands/validate.py
index 0b327b34..924244bd 100644
--- a/python/knot_resolver_manager/client/commands/validate.py
+++ b/python/knot_resolver_manager/client/commands/validate.py
@@ -4,8 +4,8 @@ from pathlib import Path
 from typing import List, Tuple, Type
 
 from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.manager.datamodel import KresConfig
-from knot_resolver_manager.manager.datamodel.globals import (
+from knot_resolver_manager.datamodel import KresConfig
+from knot_resolver_manager.datamodel.globals import (
     Context,
     reset_global_validation_context,
     set_global_validation_context,
diff --git a/python/knot_resolver_manager/controller/__init__.py b/python/knot_resolver_manager/controller/__init__.py
index 621ea702..cfefa48f 100644
--- a/python/knot_resolver_manager/controller/__init__.py
+++ b/python/knot_resolver_manager/controller/__init__.py
@@ -12,7 +12,7 @@ import asyncio
 import logging
 from typing import List, Optional
 
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.config_schema import KresConfig
 from knot_resolver_manager.controller.interface import SubprocessController
 
 logger = logging.getLogger(__name__)
diff --git a/python/knot_resolver_manager/controller/interface.py b/python/knot_resolver_manager/controller/interface.py
index f5ca8c15..dfedb4b2 100644
--- a/python/knot_resolver_manager/controller/interface.py
+++ b/python/knot_resolver_manager/controller/interface.py
@@ -11,7 +11,7 @@ from typing import Dict, Iterable, Optional, Type, TypeVar
 from weakref import WeakValueDictionary
 
 from knot_resolver_manager.manager.constants import kresd_config_file, policy_loader_config_file
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.config_schema import KresConfig
 from knot_resolver_manager.manager.exceptions import SubprocessControllerException
 from knot_resolver_manager.controller.registered_workers import register_worker, unregister_worker
 from knot_resolver_manager.utils.async_utils import writefile
diff --git a/python/knot_resolver_manager/controller/supervisord/__init__.py b/python/knot_resolver_manager/controller/supervisord/__init__.py
index 1d6f586c..bf1429e3 100644
--- a/python/knot_resolver_manager/controller/supervisord/__init__.py
+++ b/python/knot_resolver_manager/controller/supervisord/__init__.py
@@ -8,7 +8,7 @@ import supervisor.xmlrpc  # type: ignore[import]
 
 from knot_resolver_manager.compat.asyncio import async_in_a_thread
 from knot_resolver_manager.manager.constants import supervisord_config_file, supervisord_pid_file, supervisord_sock_file
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.config_schema import KresConfig
 from knot_resolver_manager.manager.exceptions import CancelStartupExecInsteadException, SubprocessControllerException
 from knot_resolver_manager.controller.interface import (
     KresID,
diff --git a/python/knot_resolver_manager/controller/supervisord/config_file.py b/python/knot_resolver_manager/controller/supervisord/config_file.py
index 388ac94d..27da636c 100644
--- a/python/knot_resolver_manager/controller/supervisord/config_file.py
+++ b/python/knot_resolver_manager/controller/supervisord/config_file.py
@@ -19,8 +19,8 @@ from knot_resolver_manager.manager.constants import (
     supervisord_subprocess_log_dir,
     user_constants,
 )
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.manager.datamodel.logging_schema import LogTargetEnum
+from knot_resolver_manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.logging_schema import LogTargetEnum
 from knot_resolver_manager.controller.interface import KresID, SubprocessType
 from knot_resolver_manager.utils.async_utils import read_resource, writefile
 
diff --git a/python/knot_resolver_manager/manager/datamodel/__init__.py b/python/knot_resolver_manager/datamodel/__init__.py
index a0174acc..a0174acc 100644
--- a/python/knot_resolver_manager/manager/datamodel/__init__.py
+++ b/python/knot_resolver_manager/datamodel/__init__.py
diff --git a/python/knot_resolver_manager/manager/datamodel/cache_schema.py b/python/knot_resolver_manager/datamodel/cache_schema.py
index fd0247aa..4ed9fc3a 100644
--- a/python/knot_resolver_manager/manager/datamodel/cache_schema.py
+++ b/python/knot_resolver_manager/datamodel/cache_schema.py
@@ -2,8 +2,8 @@ from typing import List, Optional, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.templates import template_from_str
-from knot_resolver_manager.manager.datamodel.types import (
+from knot_resolver_manager.datamodel.templates import template_from_str
+from knot_resolver_manager.datamodel.types import (
     DNSRecordTypeEnum,
     DomainName,
     EscapedStr,
diff --git a/python/knot_resolver_manager/manager/datamodel/config_schema.py b/python/knot_resolver_manager/datamodel/config_schema.py
index 4201447b..2f633d72 100644
--- a/python/knot_resolver_manager/manager/datamodel/config_schema.py
+++ b/python/knot_resolver_manager/datamodel/config_schema.py
@@ -6,21 +6,21 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 from typing_extensions import Literal
 
 from knot_resolver_manager.manager.constants import MAX_WORKERS
-from knot_resolver_manager.manager.datamodel.cache_schema import CacheSchema
-from knot_resolver_manager.manager.datamodel.dns64_schema import Dns64Schema
-from knot_resolver_manager.manager.datamodel.dnssec_schema import DnssecSchema
-from knot_resolver_manager.manager.datamodel.forward_schema import ForwardSchema
-from knot_resolver_manager.manager.datamodel.local_data_schema import LocalDataSchema, RPZSchema, RuleSchema
-from knot_resolver_manager.manager.datamodel.logging_schema import LoggingSchema
-from knot_resolver_manager.manager.datamodel.lua_schema import LuaSchema
-from knot_resolver_manager.manager.datamodel.management_schema import ManagementSchema
-from knot_resolver_manager.manager.datamodel.monitoring_schema import MonitoringSchema
-from knot_resolver_manager.manager.datamodel.network_schema import NetworkSchema
-from knot_resolver_manager.manager.datamodel.options_schema import OptionsSchema
-from knot_resolver_manager.manager.datamodel.templates import POLICY_CONFIG_TEMPLATE, WORKER_CONFIG_TEMPLATE
-from knot_resolver_manager.manager.datamodel.types import EscapedStr, IntPositive, WritableDir
-from knot_resolver_manager.manager.datamodel.view_schema import ViewSchema
-from knot_resolver_manager.manager.datamodel.webmgmt_schema import WebmgmtSchema
+from knot_resolver_manager.datamodel.cache_schema import CacheSchema
+from knot_resolver_manager.datamodel.dns64_schema import Dns64Schema
+from knot_resolver_manager.datamodel.dnssec_schema import DnssecSchema
+from knot_resolver_manager.datamodel.forward_schema import ForwardSchema
+from knot_resolver_manager.datamodel.local_data_schema import LocalDataSchema, RPZSchema, RuleSchema
+from knot_resolver_manager.datamodel.logging_schema import LoggingSchema
+from knot_resolver_manager.datamodel.lua_schema import LuaSchema
+from knot_resolver_manager.datamodel.management_schema import ManagementSchema
+from knot_resolver_manager.datamodel.monitoring_schema import MonitoringSchema
+from knot_resolver_manager.datamodel.network_schema import NetworkSchema
+from knot_resolver_manager.datamodel.options_schema import OptionsSchema
+from knot_resolver_manager.datamodel.templates import POLICY_CONFIG_TEMPLATE, WORKER_CONFIG_TEMPLATE
+from knot_resolver_manager.datamodel.types import EscapedStr, IntPositive, WritableDir
+from knot_resolver_manager.datamodel.view_schema import ViewSchema
+from knot_resolver_manager.datamodel.webmgmt_schema import WebmgmtSchema
 from knot_resolver_manager.utils.modeling import ConfigSchema
 from knot_resolver_manager.utils.modeling.base_schema import lazy_default
 from knot_resolver_manager.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError
diff --git a/python/knot_resolver_manager/manager/datamodel/design-notes.yml b/python/knot_resolver_manager/datamodel/design-notes.yml
index e4424bc8..e4424bc8 100644
--- a/python/knot_resolver_manager/manager/datamodel/design-notes.yml
+++ b/python/knot_resolver_manager/datamodel/design-notes.yml
diff --git a/python/knot_resolver_manager/manager/datamodel/dns64_schema.py b/python/knot_resolver_manager/datamodel/dns64_schema.py
index 35eb1fa6..60b92f2b 100644
--- a/python/knot_resolver_manager/manager/datamodel/dns64_schema.py
+++ b/python/knot_resolver_manager/datamodel/dns64_schema.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from knot_resolver_manager.manager.datamodel.types import IPv6Network, IPv6Network96, TimeUnit
+from knot_resolver_manager.datamodel.types import IPv6Network, IPv6Network96, TimeUnit
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/dnssec_schema.py b/python/knot_resolver_manager/datamodel/dnssec_schema.py
index 44f7ee31..e51500e1 100644
--- a/python/knot_resolver_manager/manager/datamodel/dnssec_schema.py
+++ b/python/knot_resolver_manager/datamodel/dnssec_schema.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from knot_resolver_manager.manager.datamodel.types import DomainName, EscapedStr, IntNonNegative, ReadableFile, TimeUnit
+from knot_resolver_manager.datamodel.types import DomainName, EscapedStr, IntNonNegative, ReadableFile, TimeUnit
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/forward_schema.py b/python/knot_resolver_manager/datamodel/forward_schema.py
index 923217f4..0804ef25 100644
--- a/python/knot_resolver_manager/manager/datamodel/forward_schema.py
+++ b/python/knot_resolver_manager/datamodel/forward_schema.py
@@ -2,7 +2,7 @@ from typing import Any, List, Optional, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.types import (
+from knot_resolver_manager.datamodel.types import (
     DomainName,
     IPAddressOptionalPort,
     ListOrItem,
diff --git a/python/knot_resolver_manager/manager/datamodel/globals.py b/python/knot_resolver_manager/datamodel/globals.py
index 610323fa..610323fa 100644
--- a/python/knot_resolver_manager/manager/datamodel/globals.py
+++ b/python/knot_resolver_manager/datamodel/globals.py
diff --git a/python/knot_resolver_manager/manager/datamodel/local_data_schema.py b/python/knot_resolver_manager/datamodel/local_data_schema.py
index 6e1a966c..fafa7ebe 100644
--- a/python/knot_resolver_manager/manager/datamodel/local_data_schema.py
+++ b/python/knot_resolver_manager/datamodel/local_data_schema.py
@@ -2,7 +2,7 @@ from typing import Dict, List, Optional
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.types import (
+from knot_resolver_manager.datamodel.types import (
     DomainName,
     EscapedStr,
     IDPattern,
diff --git a/python/knot_resolver_manager/manager/datamodel/logging_schema.py b/python/knot_resolver_manager/datamodel/logging_schema.py
index 46f36d5a..601cd4a5 100644
--- a/python/knot_resolver_manager/manager/datamodel/logging_schema.py
+++ b/python/knot_resolver_manager/datamodel/logging_schema.py
@@ -3,7 +3,7 @@ from typing import Any, List, Optional, Set, Type, Union, cast
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.types import TimeUnit, WritableFilePath
+from knot_resolver_manager.datamodel.types import TimeUnit, WritableFilePath
 from knot_resolver_manager.utils.modeling import ConfigSchema
 from knot_resolver_manager.utils.modeling.base_schema import is_obj_type_valid
 
diff --git a/python/knot_resolver_manager/manager/datamodel/lua_schema.py b/python/knot_resolver_manager/datamodel/lua_schema.py
index 0dccc184..079333ae 100644
--- a/python/knot_resolver_manager/manager/datamodel/lua_schema.py
+++ b/python/knot_resolver_manager/datamodel/lua_schema.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from knot_resolver_manager.manager.datamodel.types import ReadableFile
+from knot_resolver_manager.datamodel.types import ReadableFile
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/management_schema.py b/python/knot_resolver_manager/datamodel/management_schema.py
index 4df4afa1..44f8f3e8 100644
--- a/python/knot_resolver_manager/manager/datamodel/management_schema.py
+++ b/python/knot_resolver_manager/datamodel/management_schema.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from knot_resolver_manager.manager.datamodel.types import WritableFilePath, IPAddressPort
+from knot_resolver_manager.datamodel.types import WritableFilePath, IPAddressPort
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/monitoring_schema.py b/python/knot_resolver_manager/datamodel/monitoring_schema.py
index 6e33b2f5..dfc4a116 100644
--- a/python/knot_resolver_manager/manager/datamodel/monitoring_schema.py
+++ b/python/knot_resolver_manager/datamodel/monitoring_schema.py
@@ -2,7 +2,7 @@ from typing import Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.types import DomainName, EscapedStr, IPAddress, PortNumber, TimeUnit
+from knot_resolver_manager.datamodel.types import DomainName, EscapedStr, IPAddress, PortNumber, TimeUnit
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/network_schema.py b/python/knot_resolver_manager/datamodel/network_schema.py
index ae006f41..b9a35090 100644
--- a/python/knot_resolver_manager/manager/datamodel/network_schema.py
+++ b/python/knot_resolver_manager/datamodel/network_schema.py
@@ -2,7 +2,7 @@ from typing import List, Optional, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.types import (
+from knot_resolver_manager.datamodel.types import (
     EscapedStr32B,
     WritableFilePath,
     Int0_512,
diff --git a/python/knot_resolver_manager/manager/datamodel/options_schema.py b/python/knot_resolver_manager/datamodel/options_schema.py
index d0bb0399..d0bb0399 100644
--- a/python/knot_resolver_manager/manager/datamodel/options_schema.py
+++ b/python/knot_resolver_manager/datamodel/options_schema.py
diff --git a/python/knot_resolver_manager/manager/datamodel/policy_schema.py b/python/knot_resolver_manager/datamodel/policy_schema.py
index fb215188..bbc61cd1 100644
--- a/python/knot_resolver_manager/manager/datamodel/policy_schema.py
+++ b/python/knot_resolver_manager/datamodel/policy_schema.py
@@ -1,8 +1,8 @@
 from typing import List, Optional, Union
 
-from knot_resolver_manager.manager.datamodel.forward_schema import ForwardServerSchema
-from knot_resolver_manager.manager.datamodel.network_schema import AddressRenumberingSchema
-from knot_resolver_manager.manager.datamodel.types import (
+from knot_resolver_manager.datamodel.forward_schema import ForwardServerSchema
+from knot_resolver_manager.datamodel.network_schema import AddressRenumberingSchema
+from knot_resolver_manager.datamodel.types import (
     DNSRecordTypeEnum,
     IPAddressOptionalPort,
     PolicyActionEnum,
diff --git a/python/knot_resolver_manager/manager/datamodel/rpz_schema.py b/python/knot_resolver_manager/datamodel/rpz_schema.py
index e5dfe60e..bf98bd0c 100644
--- a/python/knot_resolver_manager/manager/datamodel/rpz_schema.py
+++ b/python/knot_resolver_manager/datamodel/rpz_schema.py
@@ -1,6 +1,6 @@
 from typing import List, Optional
 
-from knot_resolver_manager.manager.datamodel.types import PolicyActionEnum, PolicyFlagEnum, ReadableFile
+from knot_resolver_manager.datamodel.types import PolicyActionEnum, PolicyFlagEnum, ReadableFile
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/slice_schema.py b/python/knot_resolver_manager/datamodel/slice_schema.py
index 3dacde98..0c7cdea1 100644
--- a/python/knot_resolver_manager/manager/datamodel/slice_schema.py
+++ b/python/knot_resolver_manager/datamodel/slice_schema.py
@@ -2,7 +2,7 @@ from typing import List, Optional
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.policy_schema import ActionSchema
+from knot_resolver_manager.datamodel.policy_schema import ActionSchema
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/static_hints_schema.py b/python/knot_resolver_manager/datamodel/static_hints_schema.py
index 7a14aab3..89db49bb 100644
--- a/python/knot_resolver_manager/manager/datamodel/static_hints_schema.py
+++ b/python/knot_resolver_manager/datamodel/static_hints_schema.py
@@ -1,6 +1,6 @@
 from typing import Dict, List, Optional
 
-from knot_resolver_manager.manager.datamodel.types import DomainName, IPAddress, ReadableFile, TimeUnit
+from knot_resolver_manager.datamodel.types import DomainName, IPAddress, ReadableFile, TimeUnit
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/stub_zone_schema.py b/python/knot_resolver_manager/datamodel/stub_zone_schema.py
index 9e48efe8..b9945ecc 100644
--- a/python/knot_resolver_manager/manager/datamodel/stub_zone_schema.py
+++ b/python/knot_resolver_manager/datamodel/stub_zone_schema.py
@@ -1,6 +1,6 @@
 from typing import List, Optional, Union
 
-from knot_resolver_manager.manager.datamodel.types import DomainName, IPAddressOptionalPort, PolicyFlagEnum
+from knot_resolver_manager.datamodel.types import DomainName, IPAddressOptionalPort, PolicyFlagEnum
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/__init__.py b/python/knot_resolver_manager/datamodel/templates/__init__.py
index dc7b91e0..832503b7 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/__init__.py
+++ b/python/knot_resolver_manager/datamodel/templates/__init__.py
@@ -5,13 +5,13 @@ from jinja2 import Environment, FileSystemLoader, Template
 
 
 def _get_templates_dir() -> str:
-    module = sys.modules["knot_resolver_manager.manager.datamodel"].__file__
+    module = sys.modules["knot_resolver_manager.datamodel"].__file__
     if module:
         templates_dir = os.path.join(os.path.dirname(module), "templates")
         if os.path.isdir(templates_dir):
             return templates_dir
         raise NotADirectoryError(f"the templates dir '{templates_dir}' is not a directory or does not exist")
-    raise OSError("package 'knot_resolver_manager.manager.datamodel' cannot be located or loaded")
+    raise OSError("package 'knot_resolver_manager.datamodel' cannot be located or loaded")
 
 
 _TEMPLATES_DIR = _get_templates_dir()
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/cache.lua.j2 b/python/knot_resolver_manager/datamodel/templates/cache.lua.j2
index f0176a59..f0176a59 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/cache.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/cache.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/dns64.lua.j2 b/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2
index c5239f00..c5239f00 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/dns64.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/dnssec.lua.j2 b/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
index 05d1fa68..05d1fa68 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/dnssec.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/forward.lua.j2 b/python/knot_resolver_manager/datamodel/templates/forward.lua.j2
index 24311da1..24311da1 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/forward.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/forward.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/local_data.lua.j2 b/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2
index 8882471f..8882471f 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/local_data.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/logging.lua.j2 b/python/knot_resolver_manager/datamodel/templates/logging.lua.j2
index 2d5937a8..2d5937a8 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/logging.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/logging.lua.j2
diff --git a/python/knot_resolver_manager/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/python/knot_resolver_manager/manager/datamodel/templates/macros/cache_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2
diff --git a/python/knot_resolver_manager/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/python/knot_resolver_manager/manager/datamodel/templates/macros/common_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
diff --git a/python/knot_resolver_manager/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/python/knot_resolver_manager/manager/datamodel/templates/macros/forward_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2
diff --git a/python/knot_resolver_manager/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/python/knot_resolver_manager/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/python/knot_resolver_manager/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/python/knot_resolver_manager/manager/datamodel/templates/macros/network_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2
diff --git a/python/knot_resolver_manager/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/python/knot_resolver_manager/manager/datamodel/templates/macros/policy_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
diff --git a/python/knot_resolver_manager/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/python/knot_resolver_manager/manager/datamodel/templates/macros/view_macros.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/monitoring.lua.j2 b/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
index 624b59ab..624b59ab 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/monitoring.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/network.lua.j2 b/python/knot_resolver_manager/datamodel/templates/network.lua.j2
index 665ee454..665ee454 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/network.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/network.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/options.lua.j2 b/python/knot_resolver_manager/datamodel/templates/options.lua.j2
index 8210fb6d..8210fb6d 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/options.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/options.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/policy-config.lua.j2 b/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2
index 4c5c9048..4c5c9048 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/policy-config.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/static_hints.lua.j2 b/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
index 130facf9..130facf9 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/static_hints.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/views.lua.j2 b/python/knot_resolver_manager/datamodel/templates/views.lua.j2
index 81de8c7b..81de8c7b 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/views.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/views.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/webmgmt.lua.j2 b/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
index 938ea8da..938ea8da 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/webmgmt.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/templates/worker-config.lua.j2 b/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2
index 17c49fb0..17c49fb0 100644
--- a/python/knot_resolver_manager/manager/datamodel/templates/worker-config.lua.j2
+++ b/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2
diff --git a/python/knot_resolver_manager/manager/datamodel/types/__init__.py b/python/knot_resolver_manager/datamodel/types/__init__.py
index a3d7db3e..a3d7db3e 100644
--- a/python/knot_resolver_manager/manager/datamodel/types/__init__.py
+++ b/python/knot_resolver_manager/datamodel/types/__init__.py
diff --git a/python/knot_resolver_manager/manager/datamodel/types/base_types.py b/python/knot_resolver_manager/datamodel/types/base_types.py
index 91f53406..91f53406 100644
--- a/python/knot_resolver_manager/manager/datamodel/types/base_types.py
+++ b/python/knot_resolver_manager/datamodel/types/base_types.py
diff --git a/python/knot_resolver_manager/manager/datamodel/types/enums.py b/python/knot_resolver_manager/datamodel/types/enums.py
index bc93ae2f..bc93ae2f 100644
--- a/python/knot_resolver_manager/manager/datamodel/types/enums.py
+++ b/python/knot_resolver_manager/datamodel/types/enums.py
diff --git a/python/knot_resolver_manager/manager/datamodel/types/files.py b/python/knot_resolver_manager/datamodel/types/files.py
index 94ce04de..db496d20 100644
--- a/python/knot_resolver_manager/manager/datamodel/types/files.py
+++ b/python/knot_resolver_manager/datamodel/types/files.py
@@ -7,7 +7,7 @@ from pwd import getpwnam
 from typing import Any, Dict, Tuple, Type, TypeVar
 
 from knot_resolver_manager.manager.constants import kresd_group, kresd_user
-from knot_resolver_manager.manager.datamodel.globals import get_resolve_root, get_strict_validation
+from knot_resolver_manager.datamodel.globals import get_resolve_root, get_strict_validation
 from knot_resolver_manager.utils.modeling.base_value_type import BaseValueType
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/types/generic_types.py b/python/knot_resolver_manager/datamodel/types/generic_types.py
index 549b11a8..549b11a8 100644
--- a/python/knot_resolver_manager/manager/datamodel/types/generic_types.py
+++ b/python/knot_resolver_manager/datamodel/types/generic_types.py
diff --git a/python/knot_resolver_manager/manager/datamodel/types/types.py b/python/knot_resolver_manager/datamodel/types/types.py
index 1d0199b7..d9a0b910 100644
--- a/python/knot_resolver_manager/manager/datamodel/types/types.py
+++ b/python/knot_resolver_manager/datamodel/types/types.py
@@ -2,7 +2,7 @@ import ipaddress
 import re
 from typing import Any, Dict, Optional, Type, Union
 
-from knot_resolver_manager.manager.datamodel.types.base_types import (
+from knot_resolver_manager.datamodel.types.base_types import (
     IntRangeBase,
     PatternBase,
     StrBase,
diff --git a/python/knot_resolver_manager/manager/datamodel/view_schema.py b/python/knot_resolver_manager/datamodel/view_schema.py
index 166306df..ad44eb3b 100644
--- a/python/knot_resolver_manager/manager/datamodel/view_schema.py
+++ b/python/knot_resolver_manager/datamodel/view_schema.py
@@ -2,7 +2,7 @@ from typing import List, Optional
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.datamodel.types import IDPattern, IPNetwork
+from knot_resolver_manager.datamodel.types import IDPattern, IPNetwork
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/datamodel/webmgmt_schema.py b/python/knot_resolver_manager/datamodel/webmgmt_schema.py
index 54a561f3..2e75c3b7 100644
--- a/python/knot_resolver_manager/manager/datamodel/webmgmt_schema.py
+++ b/python/knot_resolver_manager/datamodel/webmgmt_schema.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from knot_resolver_manager.manager.datamodel.types import WritableFilePath, InterfacePort, ReadableFile
+from knot_resolver_manager.datamodel.types import WritableFilePath, InterfacePort, ReadableFile
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 
diff --git a/python/knot_resolver_manager/manager/__init__.py b/python/knot_resolver_manager/manager/__init__.py
index 3dc1f76b..e69de29b 100644
--- a/python/knot_resolver_manager/manager/__init__.py
+++ b/python/knot_resolver_manager/manager/__init__.py
@@ -1 +0,0 @@
-__version__ = "0.1.0"
diff --git a/python/knot_resolver_manager/manager/config_store.py b/python/knot_resolver_manager/manager/config_store.py
index 93786e96..0491bf46 100644
--- a/python/knot_resolver_manager/manager/config_store.py
+++ b/python/knot_resolver_manager/manager/config_store.py
@@ -2,7 +2,7 @@ import asyncio
 from asyncio import Lock
 from typing import Any, Awaitable, Callable, List, Tuple
 
-from knot_resolver_manager.manager.datamodel import KresConfig
+from knot_resolver_manager.datamodel import KresConfig
 from knot_resolver_manager.manager.exceptions import KresManagerException
 from knot_resolver_manager.utils.functional import Result
 from knot_resolver_manager.utils.modeling.exceptions import DataParsingError
diff --git a/python/knot_resolver_manager/manager/constants.py b/python/knot_resolver_manager/manager/constants.py
index e83a777b..4d63a736 100644
--- a/python/knot_resolver_manager/manager/constants.py
+++ b/python/knot_resolver_manager/manager/constants.py
@@ -12,7 +12,7 @@ else:
 
 if TYPE_CHECKING:
     from knot_resolver_manager.manager.config_store import ConfigStore
-    from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
+    from knot_resolver_manager.datamodel.config_schema import KresConfig
     from knot_resolver_manager.controller.interface import KresID
 
 STARTUP_LOG_LEVEL = logging.DEBUG
diff --git a/python/knot_resolver_manager/manager/kres_manager.py b/python/knot_resolver_manager/manager/kres_manager.py
index 78459bd2..e3d91513 100644
--- a/python/knot_resolver_manager/manager/kres_manager.py
+++ b/python/knot_resolver_manager/manager/kres_manager.py
@@ -31,7 +31,7 @@ from knot_resolver_manager.controller.registered_workers import (
 from knot_resolver_manager.utils.functional import Result
 from knot_resolver_manager.utils.modeling.types import NoneType
 
-from .datamodel import KresConfig
+from knot_resolver_manager import KresConfig
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver_manager/manager/log.py b/python/knot_resolver_manager/manager/log.py
index 95043f89..cd432e15 100644
--- a/python/knot_resolver_manager/manager/log.py
+++ b/python/knot_resolver_manager/manager/log.py
@@ -6,8 +6,8 @@ from typing import Optional
 
 from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update
 from knot_resolver_manager.manager.constants import STARTUP_LOG_LEVEL
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.manager.datamodel.logging_schema import LogTargetEnum
+from knot_resolver_manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.logging_schema import LogTargetEnum
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver_manager/manager/server.py b/python/knot_resolver_manager/manager/server.py
index 9570f536..92569eeb 100644
--- a/python/knot_resolver_manager/manager/server.py
+++ b/python/knot_resolver_manager/manager/server.py
@@ -23,10 +23,10 @@ from knot_resolver_manager.manager import log, statistics
 from knot_resolver_manager.compat import asyncio as asyncio_compat
 from knot_resolver_manager.manager.config_store import ConfigStore
 from knot_resolver_manager.manager.constants import DEFAULT_MANAGER_CONFIG_FILE, PID_FILE_NAME, init_user_constants
-from knot_resolver_manager.manager.datamodel.cache_schema import CacheClearRPCSchema
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig, get_rundir_without_validation
-from knot_resolver_manager.manager.datamodel.globals import Context, set_global_validation_context
-from knot_resolver_manager.manager.datamodel.management_schema import ManagementSchema
+from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema
+from knot_resolver_manager.datamodel.config_schema import KresConfig, get_rundir_without_validation
+from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context
+from knot_resolver_manager.datamodel.management_schema import ManagementSchema
 from knot_resolver_manager.manager.exceptions import CancelStartupExecInsteadException, KresManagerException
 from knot_resolver_manager.controller import get_best_controller_implementation
 from knot_resolver_manager.controller.registered_workers import command_single_registered_worker
diff --git a/python/knot_resolver_manager/manager/statistics.py b/python/knot_resolver_manager/manager/statistics.py
index 5aa09b30..f3e9e425 100644
--- a/python/knot_resolver_manager/manager/statistics.py
+++ b/python/knot_resolver_manager/manager/statistics.py
@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Tuple
 
 from knot_resolver_manager import compat
 from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.config_schema import KresConfig
 from knot_resolver_manager.controller.registered_workers import (
     command_registered_workers,
     get_registered_workers_kresids,
diff --git a/setup.py b/setup.py
index bf1fb25e..c2c4dfe6 100644
--- a/setup.py
+++ b/setup.py
@@ -12,15 +12,15 @@ packages = \
  'knot_resolver_manager.controller',
  'knot_resolver_manager.controller.supervisord',
  'knot_resolver_manager.controller.supervisord.plugin',
+ 'knot_resolver_manager.datamodel',
+ 'knot_resolver_manager.datamodel.templates',
+ 'knot_resolver_manager.datamodel.types',
  'knot_resolver_manager.manager',
- 'knot_resolver_manager.manager.datamodel',
- 'knot_resolver_manager.manager.datamodel.templates',
- 'knot_resolver_manager.manager.datamodel.types',
  'knot_resolver_manager.utils',
  'knot_resolver_manager.utils.modeling']
 
 package_data = \
-{'': ['*'], 'knot_resolver_manager.manager.datamodel.templates': ['macros/*']}
+{'': ['*'], 'knot_resolver_manager.datamodel.templates': ['macros/*']}
 
 install_requires = \
 ['aiohttp', 'jinja2', 'pyyaml', 'supervisor', 'typing-extensions']
diff --git a/tests/manager/__init__.py b/tests/manager/__init__.py
index 2b1eb0f6..d3c6280d 100644
--- a/tests/manager/__init__.py
+++ b/tests/manager/__init__.py
@@ -1,5 +1,5 @@
 from pathlib import Path
 
-from knot_resolver_manager.manager.datamodel.globals import Context, set_global_validation_context
+from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context
 
 set_global_validation_context(Context(Path("."), False))
diff --git a/tests/manager/datamodel/templates/test_cache_macros.py b/tests/manager/datamodel/templates/test_cache_macros.py
index 48a3882d..155905c6 100644
--- a/tests/manager/datamodel/templates/test_cache_macros.py
+++ b/tests/manager/datamodel/templates/test_cache_macros.py
@@ -2,8 +2,8 @@ from typing import Any
 
 import pytest
 
-from knot_resolver_manager.manager.datamodel.cache_schema import CacheClearRPCSchema
-from knot_resolver_manager.manager.datamodel.templates import template_from_str
+from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema
+from knot_resolver_manager.datamodel.templates import template_from_str
 
 
 @pytest.mark.parametrize(
diff --git a/tests/manager/datamodel/templates/test_common_macros.py b/tests/manager/datamodel/templates/test_common_macros.py
index 370b6847..e64b278f 100644
--- a/tests/manager/datamodel/templates/test_common_macros.py
+++ b/tests/manager/datamodel/templates/test_common_macros.py
@@ -1,5 +1,5 @@
-from knot_resolver_manager.manager.datamodel.forward_schema import ForwardServerSchema
-from knot_resolver_manager.manager.datamodel.templates import template_from_str
+from knot_resolver_manager.datamodel.forward_schema import ForwardServerSchema
+from knot_resolver_manager.datamodel.templates import template_from_str
 
 
 def test_boolean():
diff --git a/tests/manager/datamodel/templates/test_forward_macros.py b/tests/manager/datamodel/templates/test_forward_macros.py
index b4516d1d..534c6007 100644
--- a/tests/manager/datamodel/templates/test_forward_macros.py
+++ b/tests/manager/datamodel/templates/test_forward_macros.py
@@ -1,6 +1,6 @@
-from knot_resolver_manager.manager.datamodel.forward_schema import ForwardSchema
-from knot_resolver_manager.manager.datamodel.templates import template_from_str
-from knot_resolver_manager.manager.datamodel.types import IPAddressOptionalPort
+from knot_resolver_manager.datamodel.forward_schema import ForwardSchema
+from knot_resolver_manager.datamodel.templates import template_from_str
+from knot_resolver_manager.datamodel.types import IPAddressOptionalPort
 
 
 def test_policy_rule_forward_add():
diff --git a/tests/manager/datamodel/templates/test_network_macros.py b/tests/manager/datamodel/templates/test_network_macros.py
index df14eb2d..066463df 100644
--- a/tests/manager/datamodel/templates/test_network_macros.py
+++ b/tests/manager/datamodel/templates/test_network_macros.py
@@ -1,5 +1,5 @@
-from knot_resolver_manager.manager.datamodel.network_schema import ListenSchema
-from knot_resolver_manager.manager.datamodel.templates import template_from_str
+from knot_resolver_manager.datamodel.network_schema import ListenSchema
+from knot_resolver_manager.datamodel.templates import template_from_str
 
 
 def test_network_listen():
diff --git a/tests/manager/datamodel/templates/test_policy_macros.py b/tests/manager/datamodel/templates/test_policy_macros.py
index 28aa7b30..a9804cd3 100644
--- a/tests/manager/datamodel/templates/test_policy_macros.py
+++ b/tests/manager/datamodel/templates/test_policy_macros.py
@@ -1,9 +1,9 @@
 from typing import List
 
-from knot_resolver_manager.manager.datamodel.network_schema import AddressRenumberingSchema
-from knot_resolver_manager.manager.datamodel.policy_schema import AnswerSchema
-from knot_resolver_manager.manager.datamodel.templates import template_from_str
-from knot_resolver_manager.manager.datamodel.types import PolicyFlagEnum
+from knot_resolver_manager.datamodel.network_schema import AddressRenumberingSchema
+from knot_resolver_manager.datamodel.policy_schema import AnswerSchema
+from knot_resolver_manager.datamodel.templates import template_from_str
+from knot_resolver_manager.datamodel.types import PolicyFlagEnum
 
 
 def test_policy_add():
diff --git a/tests/manager/datamodel/templates/test_types_render.py b/tests/manager/datamodel/templates/test_types_render.py
index e7fc9254..f83b41e3 100644
--- a/tests/manager/datamodel/templates/test_types_render.py
+++ b/tests/manager/datamodel/templates/test_types_render.py
@@ -3,7 +3,7 @@ from typing import Any
 import pytest
 from jinja2 import Template
 
-from knot_resolver_manager.manager.datamodel.types import EscapedStr
+from knot_resolver_manager.datamodel.types import EscapedStr
 from knot_resolver_manager.utils.modeling import ConfigSchema
 
 str_template = Template("'{{ string }}'")
diff --git a/tests/manager/datamodel/templates/test_view_macros.py b/tests/manager/datamodel/templates/test_view_macros.py
index c7547eba..5f4956f8 100644
--- a/tests/manager/datamodel/templates/test_view_macros.py
+++ b/tests/manager/datamodel/templates/test_view_macros.py
@@ -2,8 +2,8 @@ from typing import Any
 
 import pytest
 
-from knot_resolver_manager.manager.datamodel.templates import template_from_str
-from knot_resolver_manager.manager.datamodel.view_schema import ViewOptionsSchema, ViewSchema
+from knot_resolver_manager.datamodel.templates import template_from_str
+from knot_resolver_manager.datamodel.view_schema import ViewOptionsSchema, ViewSchema
 
 
 def test_view_flags():
diff --git a/tests/manager/datamodel/test_config_schema.py b/tests/manager/datamodel/test_config_schema.py
index 8cc430c5..13a20f33 100644
--- a/tests/manager/datamodel/test_config_schema.py
+++ b/tests/manager/datamodel/test_config_schema.py
@@ -2,8 +2,8 @@ import inspect
 import json
 from typing import Any, Dict, Type, cast
 
-from knot_resolver_manager.manager.datamodel import KresConfig
-from knot_resolver_manager.manager.datamodel.lua_schema import LuaSchema
+from knot_resolver_manager.datamodel import KresConfig
+from knot_resolver_manager.datamodel.lua_schema import LuaSchema
 from knot_resolver_manager.utils.modeling import BaseSchema
 from knot_resolver_manager.utils.modeling.types import (
     get_generic_type_argument,
diff --git a/tests/manager/datamodel/test_forward_schema.py b/tests/manager/datamodel/test_forward_schema.py
index b1f62720..9ae77fe8 100644
--- a/tests/manager/datamodel/test_forward_schema.py
+++ b/tests/manager/datamodel/test_forward_schema.py
@@ -1,7 +1,7 @@
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.forward_schema import ForwardSchema
+from knot_resolver_manager.datamodel.forward_schema import ForwardSchema
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 
 
diff --git a/tests/manager/datamodel/test_local_data.py b/tests/manager/datamodel/test_local_data.py
index ed02c813..9842b0b2 100644
--- a/tests/manager/datamodel/test_local_data.py
+++ b/tests/manager/datamodel/test_local_data.py
@@ -3,7 +3,7 @@ from typing import Any
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.local_data_schema import RuleSchema
+from knot_resolver_manager.datamodel.local_data_schema import RuleSchema
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 
 
diff --git a/tests/manager/datamodel/test_lua_schema.py b/tests/manager/datamodel/test_lua_schema.py
index 4e174aff..30d69bd9 100644
--- a/tests/manager/datamodel/test_lua_schema.py
+++ b/tests/manager/datamodel/test_lua_schema.py
@@ -1,6 +1,6 @@
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.lua_schema import LuaSchema
+from knot_resolver_manager.datamodel.lua_schema import LuaSchema
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 
 
diff --git a/tests/manager/datamodel/test_management_schema.py b/tests/manager/datamodel/test_management_schema.py
index beef7b5f..870e7208 100644
--- a/tests/manager/datamodel/test_management_schema.py
+++ b/tests/manager/datamodel/test_management_schema.py
@@ -2,7 +2,7 @@ from typing import Any, Dict, Optional
 
 import pytest
 
-from knot_resolver_manager.manager.datamodel.management_schema import ManagementSchema
+from knot_resolver_manager.datamodel.management_schema import ManagementSchema
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 
 
diff --git a/tests/manager/datamodel/test_network_schema.py b/tests/manager/datamodel/test_network_schema.py
index fb309384..7b616f34 100644
--- a/tests/manager/datamodel/test_network_schema.py
+++ b/tests/manager/datamodel/test_network_schema.py
@@ -3,8 +3,8 @@ from typing import Any, Dict, Optional
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.network_schema import ListenSchema, NetworkSchema
-from knot_resolver_manager.manager.datamodel.types import InterfaceOptionalPort, PortNumber
+from knot_resolver_manager.datamodel.network_schema import ListenSchema, NetworkSchema
+from knot_resolver_manager.datamodel.types import InterfaceOptionalPort, PortNumber
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 
 
diff --git a/tests/manager/datamodel/test_policy_schema.py b/tests/manager/datamodel/test_policy_schema.py
index bbf1ab1b..aeb98a71 100644
--- a/tests/manager/datamodel/test_policy_schema.py
+++ b/tests/manager/datamodel/test_policy_schema.py
@@ -3,8 +3,8 @@ from typing import Any, Dict
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.policy_schema import ActionSchema, PolicySchema
-from knot_resolver_manager.manager.datamodel.types import PolicyActionEnum
+from knot_resolver_manager.datamodel.policy_schema import ActionSchema, PolicySchema
+from knot_resolver_manager.datamodel.types import PolicyActionEnum
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 from knot_resolver_manager.utils.modeling.types import get_generic_type_arguments
 
diff --git a/tests/manager/datamodel/test_rpz_schema.py b/tests/manager/datamodel/test_rpz_schema.py
index 16e23ca5..6603deed 100644
--- a/tests/manager/datamodel/test_rpz_schema.py
+++ b/tests/manager/datamodel/test_rpz_schema.py
@@ -1,7 +1,7 @@
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.rpz_schema import RPZSchema
+from knot_resolver_manager.datamodel.rpz_schema import RPZSchema
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 
 
diff --git a/tests/manager/datamodel/types/test_base_types.py b/tests/manager/datamodel/types/test_base_types.py
index 3479659f..bee030c6 100644
--- a/tests/manager/datamodel/types/test_base_types.py
+++ b/tests/manager/datamodel/types/test_base_types.py
@@ -5,7 +5,7 @@ from typing import List, Optional
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.types.base_types import IntRangeBase, StringLengthBase
+from knot_resolver_manager.datamodel.types.base_types import IntRangeBase, StringLengthBase
 from knot_resolver_manager.manager.exceptions import KresManagerException
 
 
diff --git a/tests/manager/datamodel/types/test_custom_types.py b/tests/manager/datamodel/types/test_custom_types.py
index f11d6ea5..c82779c8 100644
--- a/tests/manager/datamodel/types/test_custom_types.py
+++ b/tests/manager/datamodel/types/test_custom_types.py
@@ -6,7 +6,7 @@ from typing import Any
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.types import (
+from knot_resolver_manager.datamodel.types import (
     Dir,
     DomainName,
     EscapedStr,
diff --git a/tests/manager/datamodel/types/test_generic_types.py b/tests/manager/datamodel/types/test_generic_types.py
index 39e1d655..40b40189 100644
--- a/tests/manager/datamodel/types/test_generic_types.py
+++ b/tests/manager/datamodel/types/test_generic_types.py
@@ -3,7 +3,7 @@ from typing import Any, List, Optional, Union
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.manager.datamodel.types import ListOrItem
+from knot_resolver_manager.datamodel.types import ListOrItem
 from knot_resolver_manager.utils.modeling import BaseSchema
 from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
 from knot_resolver_manager.utils.modeling.types import get_generic_type_wrapper_argument
diff --git a/tests/manager/test_config_store.py b/tests/manager/test_config_store.py
index 343ce142..28a1a4c8 100644
--- a/tests/manager/test_config_store.py
+++ b/tests/manager/test_config_store.py
@@ -1,7 +1,7 @@
 import pytest
 
 from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update
-from knot_resolver_manager.manager.datamodel.config_schema import KresConfig
+from knot_resolver_manager.datamodel.config_schema import KresConfig
 
 
 @pytest.mark.asyncio  # type: ignore