diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/generate_sentinel_token_2.rs b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/generate_sentinel_token_2.rs
index c3006bb3a7..a676bdd567 100644
--- a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/generate_sentinel_token_2.rs
+++ b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/generate_sentinel_token_2.rs
@@ -6,7 +6,6 @@ use crate::error::sora_specific_api_error::SoraSpecificApiError;
 use crate::requests::auth_sentinel::request::GenerateSentinelRefreshRequest;
 use crate::requests::auth_sentinel_2::request::SentinelRequest;
 use crate::requests::auth_sentinel_2::response::SentinelResponse;
-use crate::requests::auth_sentinel_2::sentinel_token::SentinelResponsePieces;
 use crate::utils_internal::classify_general_http_error::classify_general_http_error;
 use errors::AnyhowResult;
 use idempotency::uuid::generate_random_uuid;
@@ -141,8 +140,8 @@ fn into_sora_sentinel_token(request: SentinelRequest, response: SentinelResponse
 
 #[cfg(test)]
 mod tests {
-  use std::fs::write;
   use super::*;
+  use std::fs::write;
 
   #[tokio::test]
   #[ignore] // Only manually trigger this
@@ -166,5 +165,4 @@ mod tests {
     assert_eq!(1, 2);
     Ok(())
   }
-
-}
\ No newline at end of file
+}
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/config.py b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/config.py
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/config.py
rename to crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/config.py
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/proof_of_work.py b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/proof_of_work.py
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/proof_of_work.py
rename to crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/proof_of_work.py
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/readme.MD b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/readme.MD
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/readme.MD
rename to crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/readme.MD
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/requirements.txt b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/requirements.txt
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/requirements.txt
rename to crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/requirements.txt
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/sentinel_token.py b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/sentinel_token.py
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/python_impl/sentinel_token.py
rename to crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/python_impl/sentinel_token.py
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/sentinel_2_curl_request.txt b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/sentinel_2_curl_request.txt
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/sentinel_2_curl_request.txt
rename to crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/sentinel_2_curl_request.txt
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/sentinel_2_response.json b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/sentinel_2_response.json
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/sentinel_2_response.json
rename to crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/metadata/sentinel_2_response.json
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/mod.rs b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/mod.rs
index 784a0c285f..79b8d561c5 100644
--- a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/mod.rs
+++ b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/mod.rs
@@ -1,4 +1,3 @@
 pub (super) mod request;
 pub (super) mod response;
-pub mod generate_sentinel_token_2;
-pub mod sentinel_token;
\ No newline at end of file
+pub mod generate_sentinel_token_2;
\ No newline at end of file
diff --git a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/sentinel_token.rs b/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/sentinel_token.rs
deleted file mode 100644
index 3c8a5e4476..0000000000
--- a/crates/api_clients/openai_sora_client/src/requests/auth_sentinel_2/sentinel_token.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use crate::error::sora_client_error::SoraClientError;
-use crate::requests::auth_sentinel_2::request::SentinelRequest;
-use serde_derive::{Deserialize, Serialize};
-
-// TODO: Refactor + support more
-const SENTINEL_FLOW: &str = "sora_init";
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct SentinelToken {
-  /// "Proof of Work" token (we generated this)
-  #[serde(rename = "p")]
-  pub p: String,
-
-  /// Random UUID (we generated this)
-  #[serde(rename = "id")]
-  pub id: String,
-
-  /// Frontend UI flow (this is the website flow used)
-  #[serde(rename = "flow")]
-  pub flow: String,
-
-  /// Turnstile dx from the response.
-  /// response["turnstile"]["dx"]
-  #[serde(rename = "t")]
-  pub t: String,
-
-  /// Token from the response.
-  /// response["token"]
-  #[serde(rename = "c")]
-  pub c: String,
-}
-
-/// The important parts of the sentinel endpoint response.
-pub (crate) struct SentinelResponsePieces {
-  pub token: String,
-  pub turnstile_dx: String,
-}
-
-impl SentinelToken {
-  pub fn from_server_request(request: &SentinelRequest, response: &SentinelResponsePieces) -> Self {
-    Self {
-      p: request.p.clone(),
-      id: request.id.clone(),
-      flow: request.flow.clone(),
-      t: response.turnstile_dx.clone(),
-      c: response.token.clone(),
-    }
-  }
-
-  pub fn to_json(&self) -> Result<String, SoraClientError> {
-    serde_json::to_string(self)
-        .map_err(|err| SoraClientError::CouldNotSerializeSentinelToken(err))
-  }
-}
diff --git a/crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/generate_sora2_video_curl.txt b/crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/metadata/generate_sora2_video_curl.txt
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/generate_sora2_video_curl.txt
rename to crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/metadata/generate_sora2_video_curl.txt
diff --git a/crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/generate_sora2_video_curl_2.txt b/crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/metadata/generate_sora2_video_curl_2.txt
similarity index 100%
rename from crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/generate_sora2_video_curl_2.txt
rename to crates/api_clients/openai_sora_client/src/requests/generate_sora2_video/metadata/generate_sora2_video_curl_2.txt