diff --git a/docs/nix/render_options/__init__.py b/docs/nix/render_options/__init__.py
index 15109a7ee..aa5da870d 100644
--- a/docs/nix/render_options/__init__.py
+++ b/docs/nix/render_options/__init__.py
@@ -29,13 +29,13 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
 
-from clan_lib.api.modules import (
+from clan_lib.errors import ClanError
+from clan_lib.services.modules import (
     CategoryInfo,
     Frontmatter,
     extract_frontmatter,
     get_roles,
 )
-from clan_lib.errors import ClanError
 
 # Get environment variables
 CLAN_CORE_PATH = Path(os.environ["CLAN_CORE_PATH"])
diff --git a/pkgs/clan-cli/clan_cli/tests/test_modules.py b/pkgs/clan-cli/clan_cli/tests/test_modules.py
index d8374ba9a..c192d929d 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_modules.py
+++ b/pkgs/clan-cli/clan_cli/tests/test_modules.py
@@ -5,7 +5,6 @@ from typing import TYPE_CHECKING
 import pytest
 from clan_cli.machines.create import CreateOptions, create_machine
 from clan_cli.tests.fixtures_flakes import FlakeForTest
-from clan_lib.api.modules import list_modules
 from clan_lib.flake import Flake
 from clan_lib.nix import nix_eval, run
 from clan_lib.nix_models.clan import (
@@ -16,6 +15,7 @@ from clan_lib.nix_models.clan import (
 )
 from clan_lib.persist.inventory_store import InventoryStore
 from clan_lib.persist.util import set_value_by_path
+from clan_lib.services.modules import list_modules
 
 if TYPE_CHECKING:
     from .age_keys import KeyPair
diff --git a/pkgs/clan-cli/clan_lib/machines/list.py b/pkgs/clan-cli/clan_lib/machines/list.py
index 7fbe4b3ac..dd2b002b8 100644
--- a/pkgs/clan-cli/clan_lib/machines/list.py
+++ b/pkgs/clan-cli/clan_lib/machines/list.py
@@ -6,12 +6,12 @@ from clan_cli.machines.hardware import HardwareConfig
 
 from clan_lib.api import API
 from clan_lib.api.disk import MachineDiskMatter
-from clan_lib.api.modules import parse_frontmatter
 from clan_lib.dirs import specific_machine_dir
 from clan_lib.flake import Flake
 from clan_lib.machines.actions import get_machine, list_machines
 from clan_lib.machines.machines import Machine
 from clan_lib.nix_models.clan import InventoryMachine
+from clan_lib.services.modules import parse_frontmatter
 
 log = logging.getLogger(__name__)
 
diff --git a/pkgs/clan-cli/clan_lib/api/modules.py b/pkgs/clan-cli/clan_lib/services/modules.py
similarity index 99%
rename from pkgs/clan-cli/clan_lib/api/modules.py
rename to pkgs/clan-cli/clan_lib/services/modules.py
index 7ed03d95f..934d2d43a 100644
--- a/pkgs/clan-cli/clan_lib/api/modules.py
+++ b/pkgs/clan-cli/clan_lib/services/modules.py
@@ -4,11 +4,10 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any, TypedDict
 
+from clan_lib.api import API
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
 
-from . import API
-
 
 class CategoryInfo(TypedDict):
     color: str
diff --git a/pkgs/clan-cli/clan_lib/tests/test_create.py b/pkgs/clan-cli/clan_lib/tests/test_create.py
index 210b3bb21..7f0efcd1d 100644
--- a/pkgs/clan-cli/clan_lib/tests/test_create.py
+++ b/pkgs/clan-cli/clan_lib/tests/test_create.py
@@ -17,7 +17,6 @@ from clan_cli.secrets.users import add_user
 from clan_cli.vars.generate import get_generators, run_generators
 
 from clan_lib.api.disk import hw_main_disk_options, set_machine_disk_schema
-from clan_lib.api.modules import list_modules
 from clan_lib.cmd import RunOpts, run
 from clan_lib.dirs import specific_machine_dir
 from clan_lib.errors import ClanError
@@ -33,6 +32,7 @@ from clan_lib.nix_models.clan import (
 from clan_lib.nix_models.clan import InventoryMachineDeploy as MachineDeploy
 from clan_lib.persist.inventory_store import InventoryStore
 from clan_lib.persist.util import set_value_by_path
+from clan_lib.services.modules import list_modules
 from clan_lib.ssh.remote import Remote, check_machine_ssh_login
 
 log = logging.getLogger(__name__)