diff --git a/hermes/src/api.rs b/hermes/src/api.rs
index 440e23e04c..891a0d7c15 100644
--- a/hermes/src/api.rs
+++ b/hermes/src/api.rs
@@ -27,6 +27,7 @@ use {
     utoipa_swagger_ui::SwaggerUi,
 };
 
+mod doc_examples;
 mod metrics_middleware;
 mod rest;
 mod types;
diff --git a/hermes/src/doc_examples.rs b/hermes/src/api/doc_examples.rs
similarity index 100%
rename from hermes/src/doc_examples.rs
rename to hermes/src/api/doc_examples.rs
diff --git a/hermes/src/api/rest/get_price_feed.rs b/hermes/src/api/rest/get_price_feed.rs
index 0fbfa608b0..1151f4a600 100644
--- a/hermes/src/api/rest/get_price_feed.rs
+++ b/hermes/src/api/rest/get_price_feed.rs
@@ -6,13 +6,13 @@ use {
             UnixTimestamp,
         },
         api::{
+            doc_examples,
             rest::RestError,
             types::{
                 PriceIdInput,
                 RpcPriceFeed,
             },
         },
-        doc_examples,
     },
     anyhow::Result,
     axum::{
diff --git a/hermes/src/api/rest/get_vaa.rs b/hermes/src/api/rest/get_vaa.rs
index cae52125e0..3ebda11028 100644
--- a/hermes/src/api/rest/get_vaa.rs
+++ b/hermes/src/api/rest/get_vaa.rs
@@ -7,10 +7,10 @@ use {
             UnixTimestamp,
         },
         api::{
+            doc_examples,
             rest::RestError,
             types::PriceIdInput,
         },
-        doc_examples,
     },
     anyhow::Result,
     axum::{
diff --git a/hermes/src/api/rest/latest_vaas.rs b/hermes/src/api/rest/latest_vaas.rs
index 72dc296dca..da646b826b 100644
--- a/hermes/src/api/rest/latest_vaas.rs
+++ b/hermes/src/api/rest/latest_vaas.rs
@@ -3,10 +3,10 @@ use {
     crate::{
         aggregate::RequestTime,
         api::{
+            doc_examples,
             rest::RestError,
             types::PriceIdInput,
         },
-        doc_examples,
     },
     anyhow::Result,
     axum::{
diff --git a/hermes/src/api/types.rs b/hermes/src/api/types.rs
index 8555e97f4b..09676b2ce4 100644
--- a/hermes/src/api/types.rs
+++ b/hermes/src/api/types.rs
@@ -1,11 +1,9 @@
 use {
-    crate::{
-        aggregate::{
-            PriceFeedUpdate,
-            Slot,
-            UnixTimestamp,
-        },
-        doc_examples,
+    super::doc_examples,
+    crate::aggregate::{
+        PriceFeedUpdate,
+        Slot,
+        UnixTimestamp,
     },
     base64::{
         engine::general_purpose::STANDARD as base64_standard_engine,
diff --git a/hermes/src/main.rs b/hermes/src/main.rs
index 638b8f4865..c51bb4202c 100644
--- a/hermes/src/main.rs
+++ b/hermes/src/main.rs
@@ -19,7 +19,6 @@ use {
 mod aggregate;
 mod api;
 mod config;
-mod doc_examples;
 mod network;
 mod serde;
 mod state;
diff --git a/hermes/src/metrics_server.rs b/hermes/src/metrics_server.rs
new file mode 100644
index 0000000000..e69de29bb2