diff --git a/crates/api_clients/grok_client/src/credentials/grok_client_secrets.rs b/crates/api_clients/grok_client/src/credentials/grok_client_secrets.rs
index 7e4f541f8a..704d8125fd 100644
--- a/crates/api_clients/grok_client/src/credentials/grok_client_secrets.rs
+++ b/crates/api_clients/grok_client/src/credentials/grok_client_secrets.rs
@@ -1,10 +1,10 @@
-use crate::datatypes::user_email::UserEmail;
-use crate::datatypes::user_id::UserId;
-use crate::requests::index_page::pieces::baggage::Baggage;
-use crate::requests::index_page::pieces::sentry_trace::SentryTrace;
-use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
-use crate::requests::index_page::pieces::verification_token::VerificationToken;
-use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
+use crate::datatypes::api::baggage::Baggage;
+use crate::datatypes::api::sentry_trace::SentryTrace;
+use crate::datatypes::api::svg_path_data::SvgPathData;
+use crate::datatypes::api::user_email::UserEmail;
+use crate::datatypes::api::user_id::UserId;
+use crate::datatypes::api::verification_token::VerificationToken;
+use crate::datatypes::api::xsid_numbers::XsidNumbers;
 
 #[derive(Clone)]
 pub struct GrokClientSecrets {
@@ -29,7 +29,7 @@ pub struct GrokClientSecrets {
   /// From index.html
   /// Not strictly needed to sign requests, but typically needed to generate URLs.
   pub user_id: UserId,
-  
+
   /// From index.html
   /// Not needed, but returned alongside other details.
   pub user_email: Option<UserEmail>,
diff --git a/crates/api_clients/grok_client/src/credentials/grok_full_credentials.rs b/crates/api_clients/grok_client/src/credentials/grok_full_credentials.rs
index f4b7581a11..6afdfa676e 100644
--- a/crates/api_clients/grok_client/src/credentials/grok_full_credentials.rs
+++ b/crates/api_clients/grok_client/src/credentials/grok_full_credentials.rs
@@ -1,7 +1,5 @@
 use crate::credentials::grok_client_secrets::GrokClientSecrets;
 use crate::credentials::grok_cookies::GrokCookies;
-use crate::datatypes::user_email::UserEmail;
-use crate::datatypes::user_id::UserId;
 
 /// Includes the cookies and all the magic other bits needed to call the API.
 #[derive(Clone)]
diff --git a/crates/api_clients/grok_client/src/requests/index_page/pieces/baggage.rs b/crates/api_clients/grok_client/src/datatypes/api/baggage.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/index_page/pieces/baggage.rs
rename to crates/api_clients/grok_client/src/datatypes/api/baggage.rs
diff --git a/crates/api_clients/grok_client/src/datatypes/file_id.rs b/crates/api_clients/grok_client/src/datatypes/api/file_id.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/datatypes/file_id.rs
rename to crates/api_clients/grok_client/src/datatypes/api/file_id.rs
diff --git a/crates/api_clients/grok_client/src/requests/index_page/pieces/mod.rs b/crates/api_clients/grok_client/src/datatypes/api/mod.rs
similarity index 54%
rename from crates/api_clients/grok_client/src/requests/index_page/pieces/mod.rs
rename to crates/api_clients/grok_client/src/datatypes/api/mod.rs
index a1c2fcd83f..91ddd80118 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/pieces/mod.rs
+++ b/crates/api_clients/grok_client/src/datatypes/api/mod.rs
@@ -1,5 +1,8 @@
 pub mod baggage;
+pub mod file_id;
 pub mod sentry_trace;
 pub mod svg_path_data;
+pub mod user_email;
+pub mod user_id;
 pub mod verification_token;
-pub mod xsid_numbers;
\ No newline at end of file
+pub mod xsid_numbers;
diff --git a/crates/api_clients/grok_client/src/requests/index_page/pieces/sentry_trace.rs b/crates/api_clients/grok_client/src/datatypes/api/sentry_trace.rs
similarity index 94%
rename from crates/api_clients/grok_client/src/requests/index_page/pieces/sentry_trace.rs
rename to crates/api_clients/grok_client/src/datatypes/api/sentry_trace.rs
index a4f3a27bf6..8d81c7c89d 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/pieces/sentry_trace.rs
+++ b/crates/api_clients/grok_client/src/datatypes/api/sentry_trace.rs
@@ -22,7 +22,7 @@ impl SentryTrace {
 
 #[cfg(test)]
 mod tests {
-  use crate::requests::index_page::pieces::sentry_trace::SentryTrace;
+  use crate::datatypes::api::sentry_trace::SentryTrace;
 
   #[test]
   fn test_real_trace() {
diff --git a/crates/api_clients/grok_client/src/requests/index_page/pieces/svg_path_data.rs b/crates/api_clients/grok_client/src/datatypes/api/svg_path_data.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/index_page/pieces/svg_path_data.rs
rename to crates/api_clients/grok_client/src/datatypes/api/svg_path_data.rs
diff --git a/crates/api_clients/grok_client/src/datatypes/user_email.rs b/crates/api_clients/grok_client/src/datatypes/api/user_email.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/datatypes/user_email.rs
rename to crates/api_clients/grok_client/src/datatypes/api/user_email.rs
diff --git a/crates/api_clients/grok_client/src/datatypes/user_id.rs b/crates/api_clients/grok_client/src/datatypes/api/user_id.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/datatypes/user_id.rs
rename to crates/api_clients/grok_client/src/datatypes/api/user_id.rs
diff --git a/crates/api_clients/grok_client/src/requests/index_page/pieces/verification_token.rs b/crates/api_clients/grok_client/src/datatypes/api/verification_token.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/index_page/pieces/verification_token.rs
rename to crates/api_clients/grok_client/src/datatypes/api/verification_token.rs
diff --git a/crates/api_clients/grok_client/src/requests/index_page/pieces/xsid_numbers.rs b/crates/api_clients/grok_client/src/datatypes/api/xsid_numbers.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/index_page/pieces/xsid_numbers.rs
rename to crates/api_clients/grok_client/src/datatypes/api/xsid_numbers.rs
diff --git a/crates/api_clients/grok_client/src/datatypes/mod.rs b/crates/api_clients/grok_client/src/datatypes/mod.rs
index 74b7f3526d..fa09308d96 100644
--- a/crates/api_clients/grok_client/src/datatypes/mod.rs
+++ b/crates/api_clients/grok_client/src/datatypes/mod.rs
@@ -1,4 +1,2 @@
-pub mod file_id;
+pub mod api;
 pub mod file_upload_spec;
-pub mod user_email;
-pub mod user_id;
diff --git a/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs b/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs
index 13c8274ba2..b039d55d13 100644
--- a/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs
+++ b/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs
@@ -1,15 +1,8 @@
 use crate::credentials::grok_full_credentials::GrokFullCredentials;
-use crate::datatypes::file_id::FileId;
 use crate::datatypes::file_upload_spec::FileUploadSpec;
-use crate::datatypes::user_id::UserId;
 use crate::error::grok_error::GrokError;
 use crate::error::grok_generic_api_error::GrokGenericApiError;
 use crate::requests::create_media_post::grok_create_media_post::{GrokCreateMediaPost, MediaPostType};
-use crate::requests::index_page::pieces::baggage::Baggage;
-use crate::requests::index_page::pieces::sentry_trace::SentryTrace;
-use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
-use crate::requests::index_page::pieces::verification_token::VerificationToken;
-use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
 use crate::requests::like_media::grok_like_media::GrokLikeMediaPost;
 use crate::requests::upload_file::grok_upload_file::GrokUploadFile;
 use crate::requests::video_chat::grok_video_gen_chat_conversation::{GrokVideoGenChatConversationBuilder, VideoMediaPostType};
diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_curl_request.txt b/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_curl_request.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_curl_request.txt
rename to crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_curl_request.txt
diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_notes.txt b/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_notes.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_notes.txt
rename to crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_notes.txt
diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_post_response.json b/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_response.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_post_response.json
rename to crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_response.json
diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt b/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt
rename to crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt
diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_post_to_generate_video_from_generated_image_response.json b/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_response.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/create_media_post/metadata/create_media_post_to_generate_video_from_generated_image_response.json
rename to crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_response.json
diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/grok_create_media_post.rs b/crates/api_clients/grok_client/src/requests/create_media_post/grok_create_media_post.rs
index 6379611e23..eb37bbf7f3 100644
--- a/crates/api_clients/grok_client/src/requests/create_media_post/grok_create_media_post.rs
+++ b/crates/api_clients/grok_client/src/requests/create_media_post/grok_create_media_post.rs
@@ -1,6 +1,6 @@
 use crate::client::browser_user_agents::FIREFOX_143_MAC_USER_AGENT;
-use crate::datatypes::file_id::FileId;
-use crate::datatypes::user_id::UserId;
+use crate::datatypes::api::file_id::FileId;
+use crate::datatypes::api::user_id::UserId;
 use crate::error::grok_client_error::GrokClientError;
 use crate::error::grok_error::GrokError;
 use crate::error::grok_generic_api_error::GrokGenericApiError;
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/chrome_curl.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/chrome_curl.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/chrome_curl.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/chrome_curl.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/cloudflare_waf_rules.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/cloudflare_waf_rules.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/cloudflare_waf_rules.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/cloudflare_waf_rules.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/header_comparison.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/header_comparison.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/header_comparison.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/header_comparison.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/chrome_listen_detail.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/chrome_listen_detail.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/chrome_listen_detail.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/chrome_listen_detail.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/chrome_listen_request.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/chrome_listen_request.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/chrome_listen_request.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/chrome_listen_request.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/chrome_listen_response.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/chrome_listen_response.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/chrome_listen_response.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/chrome_listen_response.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/firefox_listen_detail.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/firefox_listen_detail.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/firefox_listen_detail.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/firefox_listen_detail.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/firefox_listen_request.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/firefox_listen_request.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/firefox_listen_request.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/firefox_listen_request.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/firefox_listen_response.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/firefox_listen_response.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/firefox_listen_response.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/firefox_listen_response.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/notes.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/notes.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/notes.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/notes.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_detail.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_detail.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_detail.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_detail.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request_2.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request_2.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request_2.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request_2.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request_3.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request_3.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request_3.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request_3.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request_raw_1.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request_raw_1.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_request_raw_1.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_request_raw_1.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_response.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_response.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/mitm_proxy/wreq_listen_response.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/mitm_proxy/wreq_listen_response.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/request_websocket.sh b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/request_websocket.sh
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/request_websocket.sh
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/request_websocket.sh
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/rust_to_mitm_request.sh b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/rust_to_mitm_request.sh
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/rust_to_mitm_request.sh
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/rust_to_mitm_request.sh
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/safari_curl.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/safari_curl.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/safari_curl.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/safari_curl.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprint_checking.rs b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprint_checking.rs
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprint_checking.rs
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprint_checking.rs
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/about.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/about.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/about.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/about.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/chrome_mac.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/chrome_mac.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/chrome_mac.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/chrome_mac.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/curl.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/curl.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/curl.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/curl.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/curl_impersonate_chrome.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/curl_impersonate_chrome.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/curl_impersonate_chrome.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/curl_impersonate_chrome.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/curl_impersonate_firefox.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/curl_impersonate_firefox.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/curl_impersonate_firefox.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/curl_impersonate_firefox.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/firefox_mac.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/firefox_mac.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/firefox_mac.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/firefox_mac.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/firefox_private_mac.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/firefox_private_mac.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/firefox_private_mac.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/firefox_private_mac.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_chrome_140.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_chrome_140.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_chrome_140.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_chrome_140.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_firefox_139.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_firefox_139.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_firefox_139.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_firefox_139.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_firefox_143.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_firefox_143.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_firefox_143.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_firefox_143.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_firefox_raw.json b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_firefox_raw.json
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/tls_fingerprints/wreq_firefox_raw.json
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/tls_fingerprints/wreq_firefox_raw.json
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/metadata/websocket_create_curl.txt b/crates/api_clients/grok_client/src/requests/image_websocket/_metadata/websocket_create_curl.txt
similarity index 100%
rename from crates/api_clients/grok_client/src/requests/image_websocket/metadata/websocket_create_curl.txt
rename to crates/api_clients/grok_client/src/requests/image_websocket/_metadata/websocket_create_curl.txt
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/cookies.rs b/crates/api_clients/grok_client/src/requests/image_websocket/cookies.rs
deleted file mode 100644
index dc1468f6f5..0000000000
--- a/crates/api_clients/grok_client/src/requests/image_websocket/cookies.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Logged-in session with cf_clearance cookie:
-pub const SESSION_COOKIES_WITH_CF_CLEARANCE : &str = "_ga=GA1.1.1232202746.1760710013; i18nextLng=en; sso=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzZXNzaW9uX2lkIjoiOGU3MDFiNzctOTdkNC00ZjM0LWExOTctOWFmMDU1MzY3NDAwIn0.-a6x0InxbGzfTVfUlrdzxskxCnvMDI8lC90z4wHeGIk; sso-rw=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzZXNzaW9uX2lkIjoiOGU3MDFiNzctOTdkNC00ZjM0LWExOTctOWFmMDU1MzY3NDAwIn0.-a6x0InxbGzfTVfUlrdzxskxCnvMDI8lC90z4wHeGIk; stblid=b3331fc1-45d7-466b-83df-67427c0b2367; mp_ea93da913ddb66b6372b89d97b1029ac_mixpanel=%7B%22distinct_id%22%3A%2285980643-ffab-4984-a3de-59a608c47d7f%22%2C%22%24device_id%22%3A%2279ce237a-a0f3-4913-bf4b-519ac8a98263%22%2C%22%24initial_referrer%22%3A%22%24direct%22%2C%22%24initial_referring_domain%22%3A%22%24direct%22%2C%22__mps%22%3A%7B%7D%2C%22__mpso%22%3A%7B%7D%2C%22__mpus%22%3A%7B%7D%2C%22__mpa%22%3A%7B%7D%2C%22__mpu%22%3A%7B%7D%2C%22__mpr%22%3A%5B%5D%2C%22__mpap%22%3A%5B%5D%2C%22%24user_id%22%3A%2285980643-ffab-4984-a3de-59a608c47d7f%22%7D; cf_clearance=e7.LXFbmc.U81rZIqxuBfBe88yuBZMXEP.zwxNkbOxw-1760724394-1.2.1.1-JMHrapBGxcZriUw852.NCqwFRpZJFvoYxq.mV0jDpKCkiHBZwpdv09XJi6eFLJUYJJ6UDZ3c1eAsucVYLdWN.SvA9M6qzujj8nY4ym03PxQlMEd2OmXJogtDDJbPhA5AZEGxA39_6QQlvaBIUBnYPALYrTl9XJN_V4q3n4BXtpoBzrIJURMIn0mW3esUCGv0NukuVQrkrNtMgqT5SUmTGi0idaBYoR_2_wv4P09lsug; _ga_8FEWB057YH=GS2.1.s1760724394$o3$g1$t1760724401$j53$l0$h0";
-
-// Logged-in session without cf_clearance cookie:
-pub const SESSION_COOKIES_WITHOUT_CF_CLEARANCE : &str = "_ga=GA1.1.1232202746.1760710013; i18nextLng=en; sso=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzZXNzaW9uX2lkIjoiOGU3MDFiNzctOTdkNC00ZjM0LWExOTctOWFmMDU1MzY3NDAwIn0.-a6x0InxbGzfTVfUlrdzxskxCnvMDI8lC90z4wHeGIk; sso-rw=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzZXNzaW9uX2lkIjoiOGU3MDFiNzctOTdkNC00ZjM0LWExOTctOWFmMDU1MzY3NDAwIn0.-a6x0InxbGzfTVfUlrdzxskxCnvMDI8lC90z4wHeGIk; stblid=b3331fc1-45d7-466b-83df-67427c0b2367; mp_ea93da913ddb66b6372b89d97b1029ac_mixpanel=%7B%22distinct_id%22%3A%2285980643-ffab-4984-a3de-59a608c47d7f%22%2C%22%24device_id%22%3A%2279ce237a-a0f3-4913-bf4b-519ac8a98263%22%2C%22%24initial_referrer%22%3A%22%24direct%22%2C%22%24initial_referring_domain%22%3A%22%24direct%22%2C%22__mps%22%3A%7B%7D%2C%22__mpso%22%3A%7B%7D%2C%22__mpus%22%3A%7B%7D%2C%22__mpa%22%3A%7B%7D%2C%22__mpu%22%3A%7B%7D%2C%22__mpr%22%3A%5B%5D%2C%22__mpap%22%3A%5B%5D%2C%22%24user_id%22%3A%2285980643-ffab-4984-a3de-59a608c47d7f%22%7D; _ga_8FEWB057YH=GS2.1.s1760724394$o3$g1$t1760724401$j53$l0$h0";
-
-pub const FIREFOX_IMPERSONATE_COOKIE_WITH_CF_CLEARANCE : &str = "stblid=4c0f7d0f-9768-49cf-94f7-1f59f1adf1f5; x-anon-token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyX2lkIjoiNmFhNTFmZmYtMmFlNC00NjU3LTk0ZDItNDFjMWQyMjNlZTUyIiwidGVhbV9pZCI6bnVsbCwiZXhwIjoxNzYwMDQyNDA0LCJpc19hbm9uX3VzZXIiOnRydWV9.ySBr18x0Tht-a3RE-cdtQDbWoyJ1SbB_JrHAnNSFzOM; cf_clearance=qYvZ0CfScz.kWrsB14nlWVFylzzOQA0LTnnMZhlCk8M-1760763505-1.2.1.1-RyM97EWXnZ7vo8iyqmM4pyrVP1OFSPC88v61zhD_hAkFtS37A96cvUNXlvaCiGVk5wjTtSkpXcf9wq8wF7vLahSYBoHZXfCxfgeo8rN9BNDwaMXy1Czvj6rNu.OomL9gqoIUCTB7rixqDvJ0Bf9D5cGY5SQth8bLf0jP3rFwmR5oFQMZEdxiOj3zPWxb49EzRnZp_XXCXpiMSeUCABKbZNHGFRlTGqgsf3L.VLb6fCs; i18nextLng=en; sso=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzZXNzaW9uX2lkIjoiM2Y3NDgzMTYtOTkyMC00ZTkzLTk1NzQtOTA3ZGNkYzU4M2M5In0.9ne0Ab4cJiNMmntjQwxIfCrVcY6qmuSYMiNRSph1Y60; sso-rw=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzZXNzaW9uX2lkIjoiM2Y3NDgzMTYtOTkyMC00ZTkzLTk1NzQtOTA3ZGNkYzU4M2M5In0.9ne0Ab4cJiNMmntjQwxIfCrVcY6qmuSYMiNRSph1Y60; mp_ea93da913ddb66b6372b89d97b1029ac_mixpanel=%7B%22distinct_id%22%3A%222613c794-fce7-4ade-9b22-6118f977ede8%22%2C%22%24device_id%22%3A%22c3c89bdd-b1ba-4939-9ab4-b03b4dfd1e60%22%2C%22%24initial_referrer%22%3A%22%24direct%22%2C%22%24initial_referring_domain%22%3A%22%24direct%22%2C%22__mps%22%3A%7B%7D%2C%22__mpso%22%3A%7B%7D%2C%22__mpus%22%3A%7B%7D%2C%22__mpa%22%3A%7B%7D%2C%22__mpu%22%3A%7B%7D%2C%22__mpr%22%3A%5B%5D%2C%22__mpap%22%3A%5B%5D%2C%22%24user_id%22%3A%222613c794-fce7-4ade-9b22-6118f977ede8%22%2C%22%24search_engine%22%3A%22google%22%2C%22utm_source%22%3A%22x%22%2C%22utm_campaign%22%3A%22grok_imagine_post%22%7D";
diff --git a/crates/api_clients/grok_client/src/requests/image_websocket/mod.rs b/crates/api_clients/grok_client/src/requests/image_websocket/mod.rs
index b9d8942f4c..c171c7eb4a 100644
--- a/crates/api_clients/grok_client/src/requests/image_websocket/mod.rs
+++ b/crates/api_clients/grok_client/src/requests/image_websocket/mod.rs
@@ -1,6 +1,4 @@
-pub (crate) mod cookies;
-
-pub mod prompt_websocket_image;
 pub mod clonable_websocket;
 pub mod create_listen_websocket;
-pub mod messages;
\ No newline at end of file
+pub mod messages;
+pub mod prompt_websocket_image;
\ No newline at end of file
diff --git a/crates/api_clients/grok_client/src/requests/index_page/get_numbers.rs b/crates/api_clients/grok_client/src/requests/index_page/get_numbers.rs
index 0b89f12089..df2553a302 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/get_numbers.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/get_numbers.rs
@@ -1,11 +1,10 @@
+use crate::datatypes::api::xsid_numbers::XsidNumbers;
 use crate::error::grok_error::GrokError;
 use crate::requests::index_page::parsers::index::parse_index_on_demand_script::parse_index_on_demand_script;
 use crate::requests::index_page::parsers::script::parse_xsid_script_numbers::parse_xsid_script_numbers;
-use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
 use crate::requests::index_page::requests::get_index_page_script_with_client::{get_index_page_script_with_client, GetIndexPageScriptArgs};
 use crate::requests::index_page::utils::convert_verification_token_to_loading_anim::LoadingAnim;
 use wreq::Client;
-
 // self.svg_data, self.numbers = Parser.parse_values(c_request.text, self.anim, self.xsid_script)
 
 pub struct GetNumbersArgs<'a> {
diff --git a/crates/api_clients/grok_client/src/requests/index_page/mod.rs b/crates/api_clients/grok_client/src/requests/index_page/mod.rs
index 1ce8da2608..db4bbb425b 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/mod.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/mod.rs
@@ -4,6 +4,5 @@ pub mod get_index_page_and_scripts;
 pub mod get_numbers;
 pub mod get_xsid_script;
 pub mod parsers;
-pub mod pieces;
 pub mod signature;
 pub mod utils;
diff --git a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_baggage.rs b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_baggage.rs
index 1abbcc67c2..dbbcf08fc7 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_baggage.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_baggage.rs
@@ -1,7 +1,6 @@
-use crate::requests::index_page::pieces::baggage::Baggage;
 use once_cell::sync::Lazy;
 use scraper::{Html, Selector};
-
+use crate::datatypes::api::baggage::Baggage;
 // <meta name="baggage" content="sentry-environment=production,sentry-public_key=b311e0f2690c81f25e2c4cf6d4f7ce1c,sentry-trace_id=fb5c42c8cff6fd39161dd245154ca599,sentry-org_id=4508179396558848,sentry-sampled=false,sentry-sample_rand=0.7208394686924251,sentry-sample_rate=0"/>
 
 static BAGGAGE_SELECTOR : Lazy<Selector> = Lazy::new(|| {
diff --git a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_sentry_trace.rs b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_sentry_trace.rs
index 09b5a1de99..a4867ce56d 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_sentry_trace.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_sentry_trace.rs
@@ -1,8 +1,8 @@
-use crate::requests::index_page::pieces::sentry_trace::SentryTrace;
+use crate::datatypes::api::sentry_trace::SentryTrace;
 use once_cell::sync::Lazy;
 use scraper::{Html, Selector};
-// <meta name="baggage" content="sentry-environment=production,sentry-public_key=b311e0f2690c81f25e2c4cf6d4f7ce1c,sentry-trace_id=fb5c42c8cff6fd39161dd245154ca599,sentry-org_id=4508179396558848,sentry-sampled=false,sentry-sample_rand=0.7208394686924251,sentry-sample_rate=0"/>
 
+/// eg. <meta name="baggage" content="sentry-environment=production,sentry-public_key=b311e0f2690c81f25e2c4cf6d4f7ce1c,sentry-trace_id=fb5c42c8cff6fd39161dd245154ca599,sentry-org_id=4508179396558848,sentry-sampled=false,sentry-sample_rand=0.7208394686924251,sentry-sample_rate=0"/>
 static SENTRY_TRACE_SELECTOR : Lazy<Selector> = Lazy::new(|| {
   Selector::parse("meta[name=sentry-trace]")
       .expect("HTML selector should parse")
diff --git a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_svg_paths.rs b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_svg_paths.rs
index da295c074c..374ff9491c 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_svg_paths.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_svg_paths.rs
@@ -1,4 +1,4 @@
-use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
+use crate::datatypes::api::svg_path_data::SvgPathData;
 use once_cell::sync::Lazy;
 use scraper::{Html, Selector};
 
diff --git a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_email.rs b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_email.rs
index 22695ffe63..fdba99ec0c 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_email.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_email.rs
@@ -1,4 +1,4 @@
-use crate::datatypes::user_email::UserEmail;
+use crate::datatypes::api::user_email::UserEmail;
 use once_cell::sync::Lazy;
 use regex::Regex;
 
diff --git a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_id.rs b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_id.rs
index e5835e70c3..551cda1728 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_id.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_user_id.rs
@@ -1,4 +1,4 @@
-use crate::datatypes::user_id::UserId;
+use crate::datatypes::api::user_id::UserId;
 use once_cell::sync::Lazy;
 use regex::Regex;
 
diff --git a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_verification_token.rs b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_verification_token.rs
index a0bef76823..7db1188f49 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_verification_token.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/parsers/index/parse_index_verification_token.rs
@@ -1,4 +1,4 @@
-use crate::requests::index_page::pieces::verification_token::VerificationToken;
+use crate::datatypes::api::verification_token::VerificationToken;
 use once_cell::sync::Lazy;
 use regex::Regex;
 use scraper::{Html, Selector};
diff --git a/crates/api_clients/grok_client/src/requests/index_page/parsers/script/parse_xsid_script_numbers.rs b/crates/api_clients/grok_client/src/requests/index_page/parsers/script/parse_xsid_script_numbers.rs
index acb40b2a87..91fe36020c 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/parsers/script/parse_xsid_script_numbers.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/parsers/script/parse_xsid_script_numbers.rs
@@ -1,4 +1,4 @@
-use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
+use crate::datatypes::api::xsid_numbers::XsidNumbers;
 use log::error;
 use once_cell::sync::Lazy;
 use regex::Regex;
diff --git a/crates/api_clients/grok_client/src/requests/index_page/signature/generate_xsid.rs b/crates/api_clients/grok_client/src/requests/index_page/signature/generate_xsid.rs
index f980871105..658dfa5e09 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/signature/generate_xsid.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/signature/generate_xsid.rs
@@ -1,7 +1,7 @@
+use crate::datatypes::api::svg_path_data::SvgPathData;
+use crate::datatypes::api::verification_token::VerificationToken;
+use crate::datatypes::api::xsid_numbers::XsidNumbers;
 use crate::error::grok_client_error::GrokClientError;
-use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
-use crate::requests::index_page::pieces::verification_token::VerificationToken;
-use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
 use crate::requests::index_page::signature::signature_xs::signature_xs;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
@@ -160,9 +160,9 @@ pub fn generate_xsid_with_timestamp(timestamp: u32, args: GenerateXsidArgs<'_>)
 
 #[cfg(test)]
 mod tests {
-  use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
-  use crate::requests::index_page::pieces::verification_token::VerificationToken;
-  use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
+  use crate::datatypes::api::svg_path_data::SvgPathData;
+  use crate::datatypes::api::verification_token::VerificationToken;
+  use crate::datatypes::api::xsid_numbers::XsidNumbers;
   use crate::requests::index_page::signature::generate_xsid::{generate_xsid_with_timestamp, GenerateXsidArgs};
   use errors::AnyhowResult;
 
diff --git a/crates/api_clients/grok_client/src/requests/index_page/utils/convert_verification_token_to_loading_anim.rs b/crates/api_clients/grok_client/src/requests/index_page/utils/convert_verification_token_to_loading_anim.rs
index 653315793b..9c3e25a4f6 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/utils/convert_verification_token_to_loading_anim.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/utils/convert_verification_token_to_loading_anim.rs
@@ -1,5 +1,5 @@
+use crate::datatypes::api::verification_token::VerificationToken;
 use crate::error::grok_client_error::GrokClientError;
-use crate::requests::index_page::pieces::verification_token::VerificationToken;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use log::error;
@@ -37,8 +37,8 @@ pub fn convert_verification_token_to_loading_anim(verification_token: &Verificat
 
 #[cfg(test)]
 mod tests {
+  use crate::datatypes::api::verification_token::VerificationToken;
   use crate::error::grok_client_error::GrokClientError;
-  use crate::requests::index_page::pieces::verification_token::VerificationToken;
   use crate::requests::index_page::utils::convert_verification_token_to_loading_anim::convert_verification_token_to_loading_anim;
   use errors::AnyhowResult;
 
diff --git a/crates/api_clients/grok_client/src/requests/index_page/utils/select_svg_path_by_loading_anim.rs b/crates/api_clients/grok_client/src/requests/index_page/utils/select_svg_path_by_loading_anim.rs
index fd137ebab7..3603f82d26 100644
--- a/crates/api_clients/grok_client/src/requests/index_page/utils/select_svg_path_by_loading_anim.rs
+++ b/crates/api_clients/grok_client/src/requests/index_page/utils/select_svg_path_by_loading_anim.rs
@@ -1,5 +1,5 @@
+use crate::datatypes::api::svg_path_data::SvgPathData;
 use crate::error::grok_client_error::GrokClientError;
-use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
 use crate::requests::index_page::utils::convert_verification_token_to_loading_anim::LoadingAnim;
 use log::error;
 
diff --git a/crates/api_clients/grok_client/src/requests/like_media/grok_like_media.rs b/crates/api_clients/grok_client/src/requests/like_media/grok_like_media.rs
index 59df52df11..86cb725123 100644
--- a/crates/api_clients/grok_client/src/requests/like_media/grok_like_media.rs
+++ b/crates/api_clients/grok_client/src/requests/like_media/grok_like_media.rs
@@ -1,14 +1,7 @@
 use crate::client::browser_user_agents::FIREFOX_143_MAC_USER_AGENT;
-use crate::datatypes::file_id::FileId;
-use crate::datatypes::user_id::UserId;
 use crate::error::grok_client_error::GrokClientError;
 use crate::error::grok_error::GrokError;
 use crate::error::grok_generic_api_error::GrokGenericApiError;
-use crate::requests::index_page::pieces::baggage::Baggage;
-use crate::requests::index_page::pieces::sentry_trace::SentryTrace;
-use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
-use crate::requests::index_page::pieces::verification_token::VerificationToken;
-use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
 use crate::requests::index_page::signature::generate_xsid::{generate_xsid, GenerateXsidArgs};
 use crate::requests::like_media::request::LikeMediaWireRequest;
 use crate::requests::upload_file::grok_upload_file::{GrokUploadFile, GrokUploadFileResponse};
@@ -19,6 +12,12 @@ use uuid::Uuid;
 use wreq::header::{ACCEPT, ACCEPT_ENCODING, ACCEPT_LANGUAGE, CACHE_CONTROL, CONNECTION, CONTENT_TYPE, COOKIE, ORIGIN, PRAGMA, REFERER, TE, USER_AGENT};
 use wreq::Client;
 use wreq_util::Emulation;
+use crate::datatypes::api::baggage::Baggage;
+use crate::datatypes::api::file_id::FileId;
+use crate::datatypes::api::sentry_trace::SentryTrace;
+use crate::datatypes::api::svg_path_data::SvgPathData;
+use crate::datatypes::api::verification_token::VerificationToken;
+use crate::datatypes::api::xsid_numbers::XsidNumbers;
 
 const LIKE_MEDIA_POST_URL: &str = "https://grok.com/rest/media/post/like";
 
diff --git a/crates/api_clients/grok_client/src/requests/upload_file/grok_upload_file.rs b/crates/api_clients/grok_client/src/requests/upload_file/grok_upload_file.rs
index c0dd2a9432..e6e17d424c 100644
--- a/crates/api_clients/grok_client/src/requests/upload_file/grok_upload_file.rs
+++ b/crates/api_clients/grok_client/src/requests/upload_file/grok_upload_file.rs
@@ -1,5 +1,5 @@
 use crate::client::browser_user_agents::FIREFOX_143_MAC_USER_AGENT;
-use crate::datatypes::file_id::FileId;
+use crate::datatypes::api::file_id::FileId;
 use crate::datatypes::file_upload_spec::FileUploadSpec;
 use crate::error::grok_client_error::GrokClientError;
 use crate::error::grok_error::GrokError;
diff --git a/crates/api_clients/grok_client/src/requests/video_chat/grok_video_gen_chat_conversation.rs b/crates/api_clients/grok_client/src/requests/video_chat/grok_video_gen_chat_conversation.rs
index 2b183feff3..98eda87b24 100644
--- a/crates/api_clients/grok_client/src/requests/video_chat/grok_video_gen_chat_conversation.rs
+++ b/crates/api_clients/grok_client/src/requests/video_chat/grok_video_gen_chat_conversation.rs
@@ -1,14 +1,14 @@
 use crate::client::browser_user_agents::FIREFOX_143_MAC_USER_AGENT;
-use crate::datatypes::file_id::FileId;
-use crate::datatypes::user_id::UserId;
+use crate::datatypes::api::baggage::Baggage;
+use crate::datatypes::api::file_id::FileId;
+use crate::datatypes::api::sentry_trace::SentryTrace;
+use crate::datatypes::api::svg_path_data::SvgPathData;
+use crate::datatypes::api::user_id::UserId;
+use crate::datatypes::api::verification_token::VerificationToken;
+use crate::datatypes::api::xsid_numbers::XsidNumbers;
 use crate::error::grok_client_error::GrokClientError;
 use crate::error::grok_error::GrokError;
 use crate::error::grok_generic_api_error::GrokGenericApiError;
-use crate::requests::index_page::pieces::baggage::Baggage;
-use crate::requests::index_page::pieces::sentry_trace::SentryTrace;
-use crate::requests::index_page::pieces::svg_path_data::SvgPathData;
-use crate::requests::index_page::pieces::verification_token::VerificationToken;
-use crate::requests::index_page::pieces::xsid_numbers::XsidNumbers;
 use crate::requests::index_page::signature::generate_xsid::{generate_xsid, GenerateXsidArgs};
 use crate::requests::upload_file::grok_upload_file::{GrokUploadFile, GrokUploadFileResponse};
 use crate::requests::video_chat::request::{CreateChatConversationWireRequest, ModelConfigOverride, ModelMap, ResponseMetadata, ToolOverrides, VideoGenModelConfig};
diff --git a/crates/api_clients/grok_client/src/utils/user_and_file_id_to_image_url.rs b/crates/api_clients/grok_client/src/utils/user_and_file_id_to_image_url.rs
index 7e74f8f107..f2a594c24d 100644
--- a/crates/api_clients/grok_client/src/utils/user_and_file_id_to_image_url.rs
+++ b/crates/api_clients/grok_client/src/utils/user_and_file_id_to_image_url.rs
@@ -1,5 +1,5 @@
-use crate::datatypes::file_id::FileId;
-use crate::datatypes::user_id::UserId;
+use crate::datatypes::api::file_id::FileId;
+use crate::datatypes::api::user_id::UserId;
 
 /// Return media URLs to images given the user and file IDs.
 /// These are non-public and will return 403s unless you're logged in.
@@ -11,8 +11,8 @@ pub fn user_and_file_id_to_image_url(user: &UserId, file: &FileId) -> String {
 
 #[cfg(test)]
 mod tests {
-  use crate::datatypes::file_id::FileId;
-  use crate::datatypes::user_id::UserId;
+  use crate::datatypes::api::file_id::FileId;
+  use crate::datatypes::api::user_id::UserId;
   use crate::utils::user_and_file_id_to_image_url::user_and_file_id_to_image_url;
 
   #[test]
diff --git a/crates/api_clients/grok_client/src/utils/user_and_file_id_to_video_url.rs b/crates/api_clients/grok_client/src/utils/user_and_file_id_to_video_url.rs
index 0095ae776b..07fa438762 100644
--- a/crates/api_clients/grok_client/src/utils/user_and_file_id_to_video_url.rs
+++ b/crates/api_clients/grok_client/src/utils/user_and_file_id_to_video_url.rs
@@ -1,5 +1,5 @@
-use crate::datatypes::file_id::FileId;
-use crate::datatypes::user_id::UserId;
+use crate::datatypes::api::file_id::FileId;
+use crate::datatypes::api::user_id::UserId;
 
 /// Return media URLs to images given the user and file IDs.
 /// These are non-public and will return 403s unless you're logged in.
@@ -15,8 +15,8 @@ pub fn user_and_file_id_to_video_url(user: &UserId, file: &FileId, cache_bust: b
 
 #[cfg(test)]
 mod tests {
-  use crate::datatypes::file_id::FileId;
-  use crate::datatypes::user_id::UserId;
+  use crate::datatypes::api::file_id::FileId;
+  use crate::datatypes::api::user_id::UserId;
   use crate::utils::user_and_file_id_to_video_url::user_and_file_id_to_video_url;
 
   #[test]