diff --git a/apps/api/src/schemas/__init__.py b/apps/api/src/schemas/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/apps/api/src/services/__init__.py b/apps/api/src/services/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/apps/api/src/utils/__init__.py b/apps/api/src/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/apps/web/src/api/config_profiles.ts b/apps/web/src/api/config-profiles.ts
similarity index 100%
rename from apps/web/src/api/config_profiles.ts
rename to apps/web/src/api/config-profiles.ts
diff --git a/apps/web/src/api/tool_definitions.ts b/apps/web/src/api/tool-definitions.ts
similarity index 100%
rename from apps/web/src/api/tool_definitions.ts
rename to apps/web/src/api/tool-definitions.ts
diff --git a/apps/web/src/components/features/git/git-mount-editor.tsx b/apps/web/src/components/features/git/git-mount-editor.tsx
index 35c2601..22b5fc3 100644
--- a/apps/web/src/components/features/git/git-mount-editor.tsx
+++ b/apps/web/src/components/features/git/git-mount-editor.tsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { Icon } from "../../icon";
-import { validateGitUrl } from "../../../api/config_profiles";
-import type { GitMount, GitMountMapping } from "../../../api/config_profiles";
+import { validateGitUrl } from "../../../api/config-profiles";
+import type { GitMount, GitMountMapping } from "../../../api/config-profiles";
 
 interface GitMountEditorProps {
 	mounts: GitMount[];
diff --git a/apps/web/src/components/features/notification/event-toast-bridge.test.tsx b/apps/web/src/components/features/notification/event-toast-bridge.test.tsx
index 03abd6a..2d71f75 100644
--- a/apps/web/src/components/features/notification/event-toast-bridge.test.tsx
+++ b/apps/web/src/components/features/notification/event-toast-bridge.test.tsx
@@ -1,12 +1,12 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { render, act } from "@testing-library/react";
 import { EventToastBridge } from "./event-toast-bridge";
-import { useEventContext } from "../state/events";
+import { useEventContext } from "../../../state/events";
 import { getUserConfig } from "../../../api/settings";
-import { handleEventToast } from "./toast-rules";
+import { handleEventToast } from "../../toast-rules";
 import type { InstanceEventPayload } from "../../../types/events";
 
-vi.mock("../state/events", () => ({
+vi.mock("../../../state/events", () => ({
 	useEventContext: vi.fn(),
 }));
 
@@ -14,8 +14,8 @@ vi.mock("../../../api/settings", () => ({
 	getUserConfig: vi.fn(),
 }));
 
-vi.mock("./toast-rules", async (importOriginal) => {
-	const actual = await importOriginal<typeof import("./toast-rules")>();
+vi.mock("../../toast-rules", async (importOriginal) => {
+	const actual = await importOriginal<typeof import("../../toast-rules")>();
 	return {
 		...actual,
 		handleEventToast: vi.fn(),
diff --git a/apps/web/src/components/features/notification/notification-center.test.tsx b/apps/web/src/components/features/notification/notification-center.test.tsx
index d3dd662..c26b5a3 100644
--- a/apps/web/src/components/features/notification/notification-center.test.tsx
+++ b/apps/web/src/components/features/notification/notification-center.test.tsx
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { render, screen, fireEvent, cleanup } from "@testing-library/react";
 import { NotificationCenter } from "./notification-center";
-import { NotificationProvider } from "../state/notifications";
+import { NotificationProvider } from "../../../state/notifications";
 
 vi.mock("../../../api/notifications", () => ({
 	getNotifications: vi.fn(),
diff --git a/apps/web/src/components/features/session/create-session-form.tsx b/apps/web/src/components/features/session/create-session-form.tsx
index eb20cf5..89e4188 100644
--- a/apps/web/src/components/features/session/create-session-form.tsx
+++ b/apps/web/src/components/features/session/create-session-form.tsx
@@ -5,7 +5,7 @@ import type { Project } from "../../../types";
 import { listRepositoryBranches, type GitRepository, type Branch } from "../../../api/git-repositories";
 import type { ToolType } from "../../../api/tool-types";
 import { listSSHKeys, type SSHKey } from "../../../api/ssh-keys";
-import { listConfigProfiles, type ConfigProfile } from "../../../api/config_profiles";
+import { listConfigProfiles, type ConfigProfile } from "../../../api/config-profiles";
 
 interface CreateSessionFormProps {
   projects: Project[];
diff --git a/apps/web/src/components/features/tool/instance-list.tsx b/apps/web/src/components/features/tool/instance-list.tsx
index 527b427..2a1eed0 100644
--- a/apps/web/src/components/features/tool/instance-list.tsx
+++ b/apps/web/src/components/features/tool/instance-list.tsx
@@ -11,7 +11,7 @@ import {
 } from "../../../api/sessions";
 import type { ToolType } from "../../../api/tool-types";
 import { CreateSessionForm } from "../session/create-session-form";
-import { listConfigProfiles, type ConfigProfile } from "../../../api/config_profiles";
+import { listConfigProfiles, type ConfigProfile } from "../../../api/config-profiles";
 import { listSSHKeys, type SSHKey } from "../../../api/ssh-keys";
 import { useEventContext } from "../../../state/events";
 
diff --git a/apps/web/src/components/features/tool/manifest-editor.tsx b/apps/web/src/components/features/tool/manifest-editor.tsx
index 3d33196..7efeb43 100644
--- a/apps/web/src/components/features/tool/manifest-editor.tsx
+++ b/apps/web/src/components/features/tool/manifest-editor.tsx
@@ -4,7 +4,7 @@ import { extractErrorMessage } from "../../../utils/errors";
 import {
 	compileToolDefinition,
 	type ToolDefinitionManifest,
-} from "../../../api/tool_definitions";
+} from "../../../api/tool-definitions";
 
 interface PackageEntry {
 	name: string;
diff --git a/apps/web/src/components/features/tool/tool-starter.tsx b/apps/web/src/components/features/tool/tool-starter.tsx
index a6102f2..d5b0b4c 100644
--- a/apps/web/src/components/features/tool/tool-starter.tsx
+++ b/apps/web/src/components/features/tool/tool-starter.tsx
@@ -3,7 +3,7 @@
 import { useState, useEffect, useCallback } from "react";
 import { Icon } from "../../icon";
 import { listToolTypes, type ToolType } from "../../../api/tool-types";
-import { listConfigProfiles, type ConfigProfile } from "../../../api/config_profiles";
+import { listConfigProfiles, type ConfigProfile } from "../../../api/config-profiles";
 import { listSSHKeys, type SSHKey } from "../../../api/ssh-keys";
 import type { Workspace } from "../../../types/workspace";
 import type { ToolInstance } from "../../../api/sessions";
diff --git a/apps/web/src/pages/ConfigProfilesPage.tsx b/apps/web/src/pages/ConfigProfilesPage.tsx
index 2ba8356..9c64ae5 100644
--- a/apps/web/src/pages/ConfigProfilesPage.tsx
+++ b/apps/web/src/pages/ConfigProfilesPage.tsx
@@ -17,7 +17,7 @@ import {
 	type ConfigProfile,
 	type CreateConfigProfileRequest,
 	type ResolvedProfile,
-} from "../api/config_profiles";
+} from "../api/config-profiles";
 import { listProjects } from "../api/projects";
 import type { ProjectWithRepos } from "../types";
 import { listToolTypes, type ToolType } from "../api/tool-types";
diff --git a/apps/web/src/pages/DashboardPage.test.tsx b/apps/web/src/pages/DashboardPage.test.tsx
index 4bb5517..c07532d 100644
--- a/apps/web/src/pages/DashboardPage.test.tsx
+++ b/apps/web/src/pages/DashboardPage.test.tsx
@@ -2,7 +2,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { MemoryRouter } from "react-router-dom";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
-import { HomePage } from "./dashboard";
+import { HomePage } from "./DashboardPage";
 
 const mockDashboard = vi.fn();
 const mockSessions = vi.fn();
diff --git a/apps/web/src/pages/ProjectsPage.test.tsx b/apps/web/src/pages/ProjectsPage.test.tsx
index a476576..dc51c46 100644
--- a/apps/web/src/pages/ProjectsPage.test.tsx
+++ b/apps/web/src/pages/ProjectsPage.test.tsx
@@ -2,7 +2,7 @@ import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-li
 import { MemoryRouter } from "react-router-dom";
 import { afterEach, describe, expect, it, vi } from "vitest";
 
-import { ProjectsPage } from "./projects";
+import { ProjectsPage } from "./ProjectsPage";
 import * as projectsApi from "../api/projects";
 
 const mockProjects = [
diff --git a/apps/web/src/pages/ToolWorkshopPage.tsx b/apps/web/src/pages/ToolWorkshopPage.tsx
index a7b4ed5..1505207 100644
--- a/apps/web/src/pages/ToolWorkshopPage.tsx
+++ b/apps/web/src/pages/ToolWorkshopPage.tsx
@@ -23,7 +23,7 @@ import {
 	listToolDefinitions,
 	updateToolDefinition,
 	type ToolDefinitionManifest,
-} from "../api/tool_definitions";
+} from "../api/tool-definitions";
 import { ManifestEditor } from "../components/features/tool/manifest-editor";
 type Status = "loading" | "ready" | "error";