diff --git a/Cargo.lock b/Cargo.lock
index 830da423f2..cbfa66b3d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7988,7 +7988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
-name = "openai_client"
+name = "openai_sora_client"
 version = "0.0.1"
 dependencies = [
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 0d1603aea8..18c98eb9b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ members = [
   "crates/lib/api_clients/cloud_storage",
   "crates/lib/api_clients/google_drive_common",
   "crates/lib/api_clients/google_sign_in",
-  "crates/lib/api_clients/openai_client",
+  "crates/lib/api_clients/openai_sora_client",
   "crates/lib/api_clients/thumbnail_generator",
   "crates/lib/bootstrap",
   "crates/lib/bucket_paths",
diff --git a/crates/lib/api_clients/openai_client/src/lib.rs b/crates/lib/api_clients/openai_client/src/lib.rs
deleted file mode 100644
index 16d5b08d92..0000000000
--- a/crates/lib/api_clients/openai_client/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod sora_image_gen;
-pub mod sora_image_upload;
-mod credentials;
-mod sora_job_status;
\ No newline at end of file
diff --git a/crates/lib/api_clients/openai_client/Cargo.toml b/crates/lib/api_clients/openai_sora_client/Cargo.toml
similarity index 93%
rename from crates/lib/api_clients/openai_client/Cargo.toml
rename to crates/lib/api_clients/openai_sora_client/Cargo.toml
index e92ee4417f..96a2678c14 100644
--- a/crates/lib/api_clients/openai_client/Cargo.toml
+++ b/crates/lib/api_clients/openai_sora_client/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "openai_client"
+name = "openai_sora_client"
 edition = "2021"
 version = "0.0.1"
 publish = false
@@ -8,7 +8,7 @@ publish = false
 normal = ["my-workspace-hack"]
 
 [lib]
-name = "openai_client"
+name = "openai_sora_client"
 path = "src/lib.rs"
 
 [dependencies]
@@ -33,4 +33,3 @@ serde_json = { workspace = true }
 tokio = { version = "1.38.0", features = ["macros"] }
 testing = { path = "../../testing" }
 filesys = { path = "../../files/filesys" }
-
diff --git a/crates/lib/api_clients/openai_client/src/credentials.rs b/crates/lib/api_clients/openai_sora_client/src/credentials.rs
similarity index 100%
rename from crates/lib/api_clients/openai_client/src/credentials.rs
rename to crates/lib/api_clients/openai_sora_client/src/credentials.rs
diff --git a/crates/lib/api_clients/openai_client/src/sora_image_gen/common.rs b/crates/lib/api_clients/openai_sora_client/src/image_gen/common.rs
similarity index 100%
rename from crates/lib/api_clients/openai_client/src/sora_image_gen/common.rs
rename to crates/lib/api_clients/openai_sora_client/src/image_gen/common.rs
diff --git a/crates/lib/api_clients/openai_client/src/sora_image_gen/mod.rs b/crates/lib/api_clients/openai_sora_client/src/image_gen/mod.rs
similarity index 100%
rename from crates/lib/api_clients/openai_client/src/sora_image_gen/mod.rs
rename to crates/lib/api_clients/openai_sora_client/src/image_gen/mod.rs
diff --git a/crates/lib/api_clients/openai_client/src/sora_image_gen/raw_sora_image_gen.rs b/crates/lib/api_clients/openai_sora_client/src/image_gen/raw_sora_image_gen.rs
similarity index 100%
rename from crates/lib/api_clients/openai_client/src/sora_image_gen/raw_sora_image_gen.rs
rename to crates/lib/api_clients/openai_sora_client/src/image_gen/raw_sora_image_gen.rs
diff --git a/crates/lib/api_clients/openai_client/src/sora_image_gen/sora_image_gen_remix.rs b/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_remix.rs
similarity index 83%
rename from crates/lib/api_clients/openai_client/src/sora_image_gen/sora_image_gen_remix.rs
rename to crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_remix.rs
index b21680156f..22545727c4 100644
--- a/crates/lib/api_clients/openai_client/src/sora_image_gen/sora_image_gen_remix.rs
+++ b/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_remix.rs
@@ -1,7 +1,7 @@
 use errors::AnyhowResult;
 use crate::credentials::SoraCredentials;
-use crate::sora_image_gen::common::{ImageSize, NumImages, SoraImageGenResponse};
-use crate::sora_image_gen::raw_sora_image_gen::{call_sora_image_gen, InpaintItem, InpaintItemType, OperationType, RawSoraImageGenRequest, VideoGenType};
+use crate::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse};
+use crate::image_gen::raw_sora_image_gen::{call_sora_image_gen, InpaintItem, InpaintItemType, OperationType, RawSoraImageGenRequest, VideoGenType};
 
 pub struct SoraImageGenRemixRequest<'a> {
   pub prompt: String,
diff --git a/crates/lib/api_clients/openai_client/src/sora_image_gen/sora_image_gen_simple.rs b/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_simple.rs
similarity index 84%
rename from crates/lib/api_clients/openai_client/src/sora_image_gen/sora_image_gen_simple.rs
rename to crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_simple.rs
index 3707c7b525..67f601ad40 100644
--- a/crates/lib/api_clients/openai_client/src/sora_image_gen/sora_image_gen_simple.rs
+++ b/crates/lib/api_clients/openai_sora_client/src/image_gen/sora_image_gen_simple.rs
@@ -1,7 +1,7 @@
 use errors::AnyhowResult;
 use crate::credentials::SoraCredentials;
-use crate::sora_image_gen::common::{ImageSize, NumImages, SoraImageGenResponse};
-use crate::sora_image_gen::raw_sora_image_gen::{call_sora_image_gen, OperationType, RawSoraImageGenRequest, VideoGenType};
+use crate::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse};
+use crate::image_gen::raw_sora_image_gen::{call_sora_image_gen, OperationType, RawSoraImageGenRequest, VideoGenType};
 
 pub struct SoraImageGenSimpleRequest<'a> {
   pub prompt: String,
@@ -36,8 +36,8 @@ mod tests {
   use errors::AnyhowResult;
   use testing::test_file_path::test_file_path;
   use crate::credentials::SoraCredentials;
-  use crate::sora_image_gen::common::{ImageSize, NumImages};
-  use crate::sora_image_gen::sora_image_gen_simple::{sora_image_gen_simple, SoraImageGenSimpleRequest};
+  use crate::image_gen::common::{ImageSize, NumImages};
+  use crate::image_gen::sora_image_gen_simple::{sora_image_gen_simple, SoraImageGenSimpleRequest};
 
   #[ignore]
   #[tokio::test]
diff --git a/crates/lib/api_clients/openai_sora_client/src/job/mod.rs b/crates/lib/api_clients/openai_sora_client/src/job/mod.rs
new file mode 100644
index 0000000000..27072d4251
--- /dev/null
+++ b/crates/lib/api_clients/openai_sora_client/src/job/mod.rs
@@ -0,0 +1 @@
+pub mod sora_job_status;
\ No newline at end of file
diff --git a/crates/lib/api_clients/openai_client/src/sora_job_status.rs b/crates/lib/api_clients/openai_sora_client/src/job/sora_job_status.rs
similarity index 97%
rename from crates/lib/api_clients/openai_client/src/sora_job_status.rs
rename to crates/lib/api_clients/openai_sora_client/src/job/sora_job_status.rs
index 73d6cd1892..5ac6e460c9 100644
--- a/crates/lib/api_clients/openai_client/src/sora_job_status.rs
+++ b/crates/lib/api_clients/openai_sora_client/src/job/sora_job_status.rs
@@ -35,7 +35,7 @@ mod tests {
   use errors::AnyhowResult;
   use testing::test_file_path::test_file_path;
   use crate::credentials::SoraCredentials;
-  use crate::sora_job_status::sora_job_status;
+  use crate::job::sora_job_status::sora_job_status;
 
   #[ignore]
   #[tokio::test]
@@ -59,7 +59,6 @@ mod tests {
 
     let result = sora_job_status(task_id, &creds).await?;
 
-
     Ok(())
   }
 }
diff --git a/crates/lib/api_clients/openai_sora_client/src/lib.rs b/crates/lib/api_clients/openai_sora_client/src/lib.rs
new file mode 100644
index 0000000000..58936e5268
--- /dev/null
+++ b/crates/lib/api_clients/openai_sora_client/src/lib.rs
@@ -0,0 +1,4 @@
+mod credentials;
+pub mod image_gen;
+pub mod job;
+pub mod upload;
\ No newline at end of file
diff --git a/crates/lib/api_clients/openai_sora_client/src/upload/mod.rs b/crates/lib/api_clients/openai_sora_client/src/upload/mod.rs
new file mode 100644
index 0000000000..0eec5ad179
--- /dev/null
+++ b/crates/lib/api_clients/openai_sora_client/src/upload/mod.rs
@@ -0,0 +1 @@
+pub mod sora_image_upload;
\ No newline at end of file
diff --git a/crates/lib/api_clients/openai_client/src/sora_image_upload.rs b/crates/lib/api_clients/openai_sora_client/src/upload/sora_image_upload.rs
similarity index 100%
rename from crates/lib/api_clients/openai_client/src/sora_image_upload.rs
rename to crates/lib/api_clients/openai_sora_client/src/upload/sora_image_upload.rs