diff --git a/src/ado_proxy/catalog.rs b/src/ado_proxy/catalog.rs
index 576823db..5c603356 100644
--- a/src/ado_proxy/catalog.rs
+++ b/src/ado_proxy/catalog.rs
@@ -249,6 +249,17 @@ pub fn catalog() -> Catalog {
 }
 
 pub fn operations() -> Vec<Operation> {
+    let mut ops = discovery_operations();
+    ops.extend(core_operations());
+    ops.extend(repos_operations());
+    ops.extend(pipelines_operations());
+    ops.extend(boards_operations());
+    ops
+}
+
+/// Discovery-capability operations: resource-area lookup and connection
+/// negotiation performed before any data call.
+fn discovery_operations() -> Vec<Operation> {
     vec![
         Operation {
             id: "discovery.host-options",
@@ -325,6 +336,12 @@ pub fn operations() -> Vec<Operation> {
             Json,
             &["connectOptions", "lastChangeId", "lastChangeId64"]
         ),
+    ]
+}
+
+/// Core-capability operations: project lookup and validation.
+fn core_operations() -> Vec<Operation> {
+    vec![
         get!(
             "core.project-get",
             Core,
@@ -352,6 +369,13 @@ pub fn operations() -> Vec<Operation> {
                 "getDefaultTeamImageUrl",
             ]
         ),
+    ]
+}
+
+/// Repos-capability operations: repository, ref, commit, and pull-request
+/// read routes.
+fn repos_operations() -> Vec<Operation> {
+    vec![
         get!(
             "repos.repository-get",
             Repos,
@@ -498,6 +522,13 @@ pub fn operations() -> Vec<Operation> {
             Json,
             NO_QUERY
         ),
+    ]
+}
+
+/// Pipelines-capability operations: build/pipeline definition, run, and
+/// timeline read routes.
+fn pipelines_operations() -> Vec<Operation> {
+    vec![
         get!(
             "pipelines.definitions-list",
             Pipelines,
@@ -601,6 +632,13 @@ pub fn operations() -> Vec<Operation> {
             Json,
             NO_QUERY
         ),
+    ]
+}
+
+/// Boards-capability operations: work-item read, comment, and revision
+/// routes.
+fn boards_operations() -> Vec<Operation> {
+    vec![
         get!(
             "boards.work-item-get",
             Boards,