diff --git a/src/tools/atlas/createAccessList.ts b/src/tools/atlas/create/createAccessList.ts
similarity index 96%
rename from src/tools/atlas/createAccessList.ts
rename to src/tools/atlas/create/createAccessList.ts
index 46eb9af6..1c38279a 100644
--- a/src/tools/atlas/createAccessList.ts
+++ b/src/tools/atlas/create/createAccessList.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
 
 const DEFAULT_COMMENT = "Added by Atlas MCP";
 
diff --git a/src/tools/atlas/createDBUser.ts b/src/tools/atlas/create/createDBUser.ts
similarity index 91%
rename from src/tools/atlas/createDBUser.ts
rename to src/tools/atlas/create/createDBUser.ts
index 0b0122c9..a477862b 100644
--- a/src/tools/atlas/createDBUser.ts
+++ b/src/tools/atlas/create/createDBUser.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
-import { CloudDatabaseUser, DatabaseUserRole } from "../../common/atlas/openapi.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
+import { CloudDatabaseUser, DatabaseUserRole } from "../../../common/atlas/openapi.js";
 
 export class CreateDBUserTool extends AtlasToolBase {
     protected name = "atlas-create-db-user";
diff --git a/src/tools/atlas/createFreeCluster.ts b/src/tools/atlas/create/createFreeCluster.ts
similarity index 90%
rename from src/tools/atlas/createFreeCluster.ts
rename to src/tools/atlas/create/createFreeCluster.ts
index ccf13856..4dbfff89 100644
--- a/src/tools/atlas/createFreeCluster.ts
+++ b/src/tools/atlas/create/createFreeCluster.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
-import { ClusterDescription20240805 } from "../../common/atlas/openapi.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
+import { ClusterDescription20240805 } from "../../../common/atlas/openapi.js";
 
 export class CreateFreeClusterTool extends AtlasToolBase {
     protected name = "atlas-create-free-cluster";
diff --git a/src/tools/atlas/createProject.ts b/src/tools/atlas/create/createProject.ts
similarity index 92%
rename from src/tools/atlas/createProject.ts
rename to src/tools/atlas/create/createProject.ts
index f1c4da31..8cb6e1a9 100644
--- a/src/tools/atlas/createProject.ts
+++ b/src/tools/atlas/create/createProject.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
-import { Group } from "../../common/atlas/openapi.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
+import { Group } from "../../../common/atlas/openapi.js";
 
 export class CreateProjectTool extends AtlasToolBase {
     protected name = "atlas-create-project";
diff --git a/src/tools/atlas/inspectAccessList.ts b/src/tools/atlas/read/inspectAccessList.ts
similarity index 92%
rename from src/tools/atlas/inspectAccessList.ts
rename to src/tools/atlas/read/inspectAccessList.ts
index 755da768..94c85228 100644
--- a/src/tools/atlas/inspectAccessList.ts
+++ b/src/tools/atlas/read/inspectAccessList.ts
@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
 
 export class InspectAccessListTool extends AtlasToolBase {
     protected name = "atlas-inspect-access-list";
diff --git a/src/tools/atlas/inspectCluster.ts b/src/tools/atlas/read/inspectCluster.ts
similarity index 88%
rename from src/tools/atlas/inspectCluster.ts
rename to src/tools/atlas/read/inspectCluster.ts
index c435beaf..7d18a1c2 100644
--- a/src/tools/atlas/inspectCluster.ts
+++ b/src/tools/atlas/read/inspectCluster.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
-import { ClusterDescription20240805 } from "../../common/atlas/openapi.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
+import { ClusterDescription20240805 } from "../../../common/atlas/openapi.js";
 
 export class InspectClusterTool extends AtlasToolBase {
     protected name = "atlas-inspect-cluster";
diff --git a/src/tools/atlas/listClusters.ts b/src/tools/atlas/read/listClusters.ts
similarity index 95%
rename from src/tools/atlas/listClusters.ts
rename to src/tools/atlas/read/listClusters.ts
index 82a59fd4..8f6d7c4c 100644
--- a/src/tools/atlas/listClusters.ts
+++ b/src/tools/atlas/read/listClusters.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
-import { PaginatedClusterDescription20240805, PaginatedOrgGroupView, Group } from "../../common/atlas/openapi.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
+import { PaginatedClusterDescription20240805, PaginatedOrgGroupView, Group } from "../../../common/atlas/openapi.js";
 
 export class ListClustersTool extends AtlasToolBase {
     protected name = "atlas-list-clusters";
diff --git a/src/tools/atlas/listDBUsers.ts b/src/tools/atlas/read/listDBUsers.ts
similarity index 90%
rename from src/tools/atlas/listDBUsers.ts
rename to src/tools/atlas/read/listDBUsers.ts
index c3013162..7650cbf0 100644
--- a/src/tools/atlas/listDBUsers.ts
+++ b/src/tools/atlas/read/listDBUsers.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { ToolArgs, OperationType } from "../tool.js";
-import { DatabaseUserRole, UserScope } from "../../common/atlas/openapi.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { ToolArgs, OperationType } from "../../tool.js";
+import { DatabaseUserRole, UserScope } from "../../../common/atlas/openapi.js";
 
 export class ListDBUsersTool extends AtlasToolBase {
     protected name = "atlas-list-db-users";
diff --git a/src/tools/atlas/listOrgs.ts b/src/tools/atlas/read/listOrgs.ts
similarity index 91%
rename from src/tools/atlas/listOrgs.ts
rename to src/tools/atlas/read/listOrgs.ts
index 2bfa95c2..c55738d7 100644
--- a/src/tools/atlas/listOrgs.ts
+++ b/src/tools/atlas/read/listOrgs.ts
@@ -1,6 +1,6 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { OperationType } from "../tool.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { OperationType } from "../../tool.js";
 
 export class ListOrganizationsTool extends AtlasToolBase {
     protected name = "atlas-list-orgs";
diff --git a/src/tools/atlas/listProjects.ts b/src/tools/atlas/read/listProjects.ts
similarity index 93%
rename from src/tools/atlas/listProjects.ts
rename to src/tools/atlas/read/listProjects.ts
index 01cd9b42..3e30d38d 100644
--- a/src/tools/atlas/listProjects.ts
+++ b/src/tools/atlas/read/listProjects.ts
@@ -1,8 +1,8 @@
 import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
-import { AtlasToolBase } from "./atlasTool.js";
-import { OperationType } from "../tool.js";
+import { AtlasToolBase } from "../atlasTool.js";
+import { OperationType } from "../../tool.js";
 import { z } from "zod";
-import { ToolArgs } from "../tool.js";
+import { ToolArgs } from "../../tool.js";
 
 export class ListProjectsTool extends AtlasToolBase {
     protected name = "atlas-list-projects";
diff --git a/src/tools/atlas/tools.ts b/src/tools/atlas/tools.ts
index 4a3772ef..d8018dfb 100644
--- a/src/tools/atlas/tools.ts
+++ b/src/tools/atlas/tools.ts
@@ -1,13 +1,13 @@
-import { ListClustersTool } from "./listClusters.js";
-import { ListProjectsTool } from "./listProjects.js";
-import { InspectClusterTool } from "./inspectCluster.js";
-import { CreateFreeClusterTool } from "./createFreeCluster.js";
-import { CreateAccessListTool } from "./createAccessList.js";
-import { InspectAccessListTool } from "./inspectAccessList.js";
-import { ListDBUsersTool } from "./listDBUsers.js";
-import { CreateDBUserTool } from "./createDBUser.js";
-import { CreateProjectTool } from "./createProject.js";
-import { ListOrganizationsTool } from "./listOrgs.js";
+import { ListClustersTool } from "./read/listClusters.js";
+import { ListProjectsTool } from "./read/listProjects.js";
+import { InspectClusterTool } from "./read/inspectCluster.js";
+import { CreateFreeClusterTool } from "./create/createFreeCluster.js";
+import { CreateAccessListTool } from "./create/createAccessList.js";
+import { InspectAccessListTool } from "./read/inspectAccessList.js";
+import { ListDBUsersTool } from "./read/listDBUsers.js";
+import { CreateDBUserTool } from "./create/createDBUser.js";
+import { CreateProjectTool } from "./create/createProject.js";
+import { ListOrganizationsTool } from "./read/listOrgs.js";
 
 export const AtlasTools = [
     ListClustersTool,