move from old migration module

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/CLAUDE.md

@@ -1,4 +1,4 @@
-# generate_video_v2
+# generate_video
 
 This module implements the v2 video generation pipeline. It replaces the v1 system
 (in `generate_video/`) with a two-phase approach that separates request planning from
@@ -63,7 +63,7 @@ Cost can be estimated at two stages:
 ## Module layout
 
 ```
-generate_video_v2/
+generate_video/
 ├── mod.rs
 ├── video_generation_draft.rs           ← VideoGenerationDraftRequest enum
 ├── video_generation_draft_context.rs   ← context for finalize()

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request_builder.rs

@@ -9,59 +9,59 @@ use crate::api::router_provider::RouterProvider;
 use crate::api::video_list_ref::VideoListRef;
 use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::build::build_artcraft_grok_imagine_video;
-use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::build::build_artcraft_grok_imagine_video_1p5;
-use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::build::build_artcraft_happy_horse_1p0;
-use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::build::build_artcraft_kling_1_6_pro;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::build::build_artcraft_kling_2_1_master;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::build::build_artcraft_kling_2_1_pro;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::build::build_artcraft_kling_2_5_turbo_pro;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::build::build_artcraft_kling_2_6_pro;
-use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::build::build_artcraft_kling_3p0_pro;
-use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::build::build_artcraft_kling_3p0_standard;
-use crate::generate::generate_video_v2::providers::artcraft::preview_model::build::build_artcraft_preview_model;
-use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::build::build_artcraft_preview_model_fast;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::build::build_artcraft_seedance_1p0_lite;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::build::build_artcraft_seedance_1p5_pro;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::build::build_artcraft_seedance_2p0;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::build::build_artcraft_seedance_2p0_fast;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::build::build_artcraft_seedance_2p0_u;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::build::build_artcraft_seedance_2p0_u_fast;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::build::build_artcraft_seedance_2p0_bp;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::build::build_artcraft_seedance_2p0_bp_fast;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::build::build_artcraft_seedance_2p0_bpu;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::build::build_artcraft_seedance_2p0_bpu_fast;
-use crate::generate::generate_video_v2::providers::artcraft::sora_2::build::build_artcraft_sora_2;
-use crate::generate::generate_video_v2::providers::artcraft::sora_2_pro::build::build_artcraft_sora_2_pro;
-use crate::generate::generate_video_v2::providers::artcraft::veo_2::build::build_artcraft_veo_2;
-use crate::generate::generate_video_v2::providers::artcraft::veo_3::build::build_artcraft_veo_3;
-use crate::generate::generate_video_v2::providers::artcraft::veo_3_fast::build::build_artcraft_veo_3_fast;
-use crate::generate::generate_video_v2::providers::artcraft::veo_3p1::build::build_artcraft_veo_3p1;
-use crate::generate::generate_video_v2::providers::artcraft::veo_3p1_fast::build::build_artcraft_veo_3p1_fast;
-use crate::generate::generate_video_v2::providers::kinovi::happy_horse_1p0::build::build_kinovi_happy_horse_1p0;
-use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0::build::build_kinovi_seedance_2p0;
-use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_u;
-use crate::generate::generate_video_v2::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_u_fast;
-use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video::build::build_grok_api_grok_imagine_video;
-use crate::generate::generate_video_v2::providers::grok_api::grok_imagine_video_1p5::build::build_grok_api_grok_imagine_video_1p5;
-use crate::generate::generate_video_v2::providers::fal::kling_1_6_pro::build::build_fal_kling_1_6_pro;
-use crate::generate::generate_video_v2::providers::fal::kling_2_1_master::build::build_fal_kling_2_1_master;
-use crate::generate::generate_video_v2::providers::fal::kling_2_1_pro::build::build_fal_kling_2_1_pro;
-use crate::generate::generate_video_v2::providers::fal::kling_2_5_turbo_pro::build::build_fal_kling_2_5_turbo_pro;
-use crate::generate::generate_video_v2::providers::fal::kling_2_6_pro::build::build_fal_kling_2_6_pro;
-use crate::generate::generate_video_v2::providers::fal::kling_3p0_pro::build::build_fal_kling_3p0_pro;
-use crate::generate::generate_video_v2::providers::fal::kling_3p0_standard::build::build_fal_kling_3p0_standard;
-use crate::generate::generate_video_v2::providers::fal::seedance_1p0_lite::build::build_fal_seedance_1p0_lite;
-use crate::generate::generate_video_v2::providers::fal::seedance_1p5_pro::build::build_fal_seedance_1p5_pro;
-use crate::generate::generate_video_v2::providers::fal::sora_2::build::build_fal_sora_2;
-use crate::generate::generate_video_v2::providers::fal::sora_2_pro::build::build_fal_sora_2_pro;
-use crate::generate::generate_video_v2::providers::fal::veo_2::build::build_fal_veo_2;
-use crate::generate::generate_video_v2::providers::fal::veo_3::build::build_fal_veo_3;
-use crate::generate::generate_video_v2::providers::fal::veo_3_fast::build::build_fal_veo_3_fast;
-use crate::generate::generate_video_v2::providers::fal::veo_3p1::build::build_fal_veo_3p1;
-use crate::generate::generate_video_v2::providers::fal::veo_3p1_fast::build::build_fal_veo_3p1_fast;
-use crate::generate::generate_video_v2::providers::kinovi::seedance_2p0_fast::build::build_kinovi_seedance_2p0_fast;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::providers::artcraft::grok_imagine_video::build::build_artcraft_grok_imagine_video;
+use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::build::build_artcraft_grok_imagine_video_1p5;
+use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::build::build_artcraft_happy_horse_1p0;
+use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::build::build_artcraft_kling_1_6_pro;
+use crate::generate::generate_video::providers::artcraft::kling_2_1_master::build::build_artcraft_kling_2_1_master;
+use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::build::build_artcraft_kling_2_1_pro;
+use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::build::build_artcraft_kling_2_5_turbo_pro;
+use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::build::build_artcraft_kling_2_6_pro;
+use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::build::build_artcraft_kling_3p0_pro;
+use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::build::build_artcraft_kling_3p0_standard;
+use crate::generate::generate_video::providers::artcraft::preview_model::build::build_artcraft_preview_model;
+use crate::generate::generate_video::providers::artcraft::preview_model_fast::build::build_artcraft_preview_model_fast;
+use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::build::build_artcraft_seedance_1p0_lite;
+use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::build::build_artcraft_seedance_1p5_pro;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0::build::build_artcraft_seedance_2p0;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::build::build_artcraft_seedance_2p0_fast;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::build::build_artcraft_seedance_2p0_u;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::build::build_artcraft_seedance_2p0_u_fast;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::build::build_artcraft_seedance_2p0_bp;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::build::build_artcraft_seedance_2p0_bp_fast;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::build::build_artcraft_seedance_2p0_bpu;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::build::build_artcraft_seedance_2p0_bpu_fast;
+use crate::generate::generate_video::providers::artcraft::sora_2::build::build_artcraft_sora_2;
+use crate::generate::generate_video::providers::artcraft::sora_2_pro::build::build_artcraft_sora_2_pro;
+use crate::generate::generate_video::providers::artcraft::veo_2::build::build_artcraft_veo_2;
+use crate::generate::generate_video::providers::artcraft::veo_3::build::build_artcraft_veo_3;
+use crate::generate::generate_video::providers::artcraft::veo_3_fast::build::build_artcraft_veo_3_fast;
+use crate::generate::generate_video::providers::artcraft::veo_3p1::build::build_artcraft_veo_3p1;
+use crate::generate::generate_video::providers::artcraft::veo_3p1_fast::build::build_artcraft_veo_3p1_fast;
+use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::build::build_kinovi_happy_horse_1p0;
+use crate::generate::generate_video::providers::kinovi::seedance_2p0::build::build_kinovi_seedance_2p0;
+use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_u;
+use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_u_fast;
+use crate::generate::generate_video::providers::grok_api::grok_imagine_video::build::build_grok_api_grok_imagine_video;
+use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::build::build_grok_api_grok_imagine_video_1p5;
+use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::build_fal_kling_1_6_pro;
+use crate::generate::generate_video::providers::fal::kling_2_1_master::build::build_fal_kling_2_1_master;
+use crate::generate::generate_video::providers::fal::kling_2_1_pro::build::build_fal_kling_2_1_pro;
+use crate::generate::generate_video::providers::fal::kling_2_5_turbo_pro::build::build_fal_kling_2_5_turbo_pro;
+use crate::generate::generate_video::providers::fal::kling_2_6_pro::build::build_fal_kling_2_6_pro;
+use crate::generate::generate_video::providers::fal::kling_3p0_pro::build::build_fal_kling_3p0_pro;
+use crate::generate::generate_video::providers::fal::kling_3p0_standard::build::build_fal_kling_3p0_standard;
+use crate::generate::generate_video::providers::fal::seedance_1p0_lite::build::build_fal_seedance_1p0_lite;
+use crate::generate::generate_video::providers::fal::seedance_1p5_pro::build::build_fal_seedance_1p5_pro;
+use crate::generate::generate_video::providers::fal::sora_2::build::build_fal_sora_2;
+use crate::generate::generate_video::providers::fal::sora_2_pro::build::build_fal_sora_2_pro;
+use crate::generate::generate_video::providers::fal::veo_2::build::build_fal_veo_2;
+use crate::generate::generate_video::providers::fal::veo_3::build::build_fal_veo_3;
+use crate::generate::generate_video::providers::fal::veo_3_fast::build::build_fal_veo_3_fast;
+use crate::generate::generate_video::providers::fal::veo_3p1::build::build_fal_veo_3p1;
+use crate::generate::generate_video::providers::fal::veo_3p1_fast::build::build_fal_veo_3p1_fast;
+use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::build::build_kinovi_seedance_2p0_fast;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
 
 /// RouterProvider-agnostic video generation request. Distilled by `build2()` into a
 /// `VideoGenerationDraftOrRequest` for the selected (provider, model) pair.

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/mod.rs

@@ -1,3 +1,8 @@
 pub mod generate_video_request_builder;
 pub mod generate_video_response;
+pub mod providers;
 pub mod video_generation_cost_estimate;
+pub mod video_generation_draft;
+pub mod video_generation_draft_context;
+pub mod video_generation_draft_or_request;
+pub mod video_generation_request;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/build_common.rs

@@ -9,7 +9,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::resolve::{
+use crate::generate::generate_video::providers::artcraft::resolve::{
   resolve_audio_list_ref, resolve_character_list_ref, resolve_image_list_ref,
   resolve_image_ref, resolve_video_list_ref,
 };

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 /// Build an ArtCraft-routed Grok Imagine Video request.
 ///
@@ -43,8 +43,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState;
+use crate::generate::generate_video::providers::artcraft::grok_imagine_video::request::ArtcraftGrokImagineVideoRequestState;
 
 // -- Pricing constants --
 //

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftGrokImagineVideoRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/build.rs

@@ -3,12 +3,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 /// Build an ArtCraft-routed Grok Imagine Video 1.5 preview request.
 ///
@@ -58,8 +58,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/cost.rs

@@ -11,7 +11,7 @@ use grok_api_client::api::types::video_types::video_resolution::VideoResolution
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState;
+use crate::generate::generate_video::providers::artcraft::grok_imagine_video_1p5::request::ArtcraftGrokImagineVideo1p5RequestState;
 
 // ── Markup ──
 //
@@ -477,8 +477,8 @@ mod tests {
     };
     let result = builder.build2().expect("build2 should succeed");
     match result {
-      crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest::Request(
-        crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest::ArtcraftGrokImagineVideo1p5(s)
+      crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest::Request(
+        crate::generate::generate_video::video_generation_request::VideoGenerationRequest::ArtcraftGrokImagineVideo1p5(s)
       ) => s,
       _ => panic!("expected ArtcraftGrokImagineVideo1p5 request"),
     }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/request.rs

@@ -4,7 +4,7 @@ use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftGrokImagineVideo1p5RequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_happy_horse_1p0(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -33,8 +33,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState;
+use crate::generate::generate_video::providers::artcraft::happy_horse_1p0::request::ArtcraftHappyHorse1p0RequestState;
 
 // ── Pricing ──
 //

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/happy_horse_1p0/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftHappyHorse1p0RequestState {
@@ -29,7 +29,7 @@ mod tests {
   use crate::client::router_client::RouterClient;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
   use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
   use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
   use artcraft_client::utils::api_host::ApiHost;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_kling_1_6_pro(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState;
+use crate::generate::generate_video::providers::artcraft::kling_1_6_pro::request::ArtcraftKling16ProRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling16ProCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling16ProRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_kling_2_1_master(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState;
+use crate::generate::generate_video::providers::artcraft::kling_2_1_master::request::ArtcraftKling21MasterRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling21MasterCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling21MasterRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_kling_2_1_pro(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState;
+use crate::generate::generate_video::providers::artcraft::kling_2_1_pro::request::ArtcraftKling21ProRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling21ProCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling21ProRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_kling_2_5_turbo_pro(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState;
+use crate::generate::generate_video::providers::artcraft::kling_2_5_turbo_pro::request::ArtcraftKling2p5TurboProRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling2p5TurboProCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling2p5TurboProRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_kling_2_6_pro(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Kling 2.6 Pro supports `generate_audio` — preserve it so cost can read it back.

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState;
+use crate::generate::generate_video::providers::artcraft::kling_2_6_pro::request::ArtcraftKling2p6ProRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling2p6ProCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling2p6ProRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/build.rs

@@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_kling_3p0_pro(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Kling 3.0 Pro supports `generate_audio` — preserve it (build_artcraft_omni_request

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState;
+use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling3p0ProCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling3p0ProRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/build.rs

@@ -2,13 +2,13 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_pro::build::plan_kling_3p0_duration;
-use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::build::plan_kling_3p0_duration;
+use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_kling_3p0_standard(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Kling 3.0 Standard: same duration range as 3.0 Pro (3-15s); see kling_3p0_pro::build.

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState;
+use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling3p0StandardCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling3p0StandardRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_preview_model(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -33,8 +33,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState;
+use crate::generate::generate_video::providers::artcraft::preview_model::request::ArtcraftPreviewModelRequestState;
 
 // ── Pricing constants ──
 //

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftPreviewModelRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_preview_model_fast(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -35,8 +35,8 @@ mod tests {
   use crate::api::router_provider::RouterProvider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState;
+use crate::generate::generate_video::providers::artcraft::preview_model_fast::request::ArtcraftPreviewModelFastRequestState;
 
 // ── Pricing constants ──
 //

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftPreviewModelFastRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/build.rs

@@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_1p0_lite(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Seedance 1.0 Lite accepts only {5, 10} seconds; pre-plan so cost parity holds.

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/cost.rs

@@ -5,7 +5,7 @@ use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_t
 };
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::request::ArtcraftSeedance10LiteRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance10LiteCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p0_lite/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance10LiteRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/build.rs

@@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_1p5_pro(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Seedance 1.5 Pro supports 4-12 seconds; omni-gen helper accepts up to 15,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/cost.rs

@@ -6,7 +6,7 @@ use fal_client::requests::webhook::video::text::enqueue_seedance_1p5_pro_text_to
 };
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance1p5ProCostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance1p5ProRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -33,8 +33,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0::request::ArtcraftSeedance2p0RequestState;
 
 // ── Pricing constants ──
 //

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0RequestState {
@@ -31,7 +31,7 @@ mod tests {
   use crate::client::router_client::RouterClient;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
   use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
   use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
   use artcraft_client::utils::api_host::ApiHost;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0_bp(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -33,8 +33,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState;
 
 /// USD cents per second by resolution:
 ///   480p:  $0.10/s = 10.0 ¢/s

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0BytePlusRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0_bp_fast(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -35,8 +35,8 @@ mod tests {
   use crate::api::router_provider::RouterProvider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::request::ArtcraftSeedance2p0BytePlusFastRequestState;
 
 /// USD cents per second by resolution:
 ///   480p:  $0.09/s = 9.0 ¢/s

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0BytePlusFastRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0_bpu(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -33,8 +33,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState;
 
 /// USD cents per second by resolution:
 ///   480p:  $0.10/s = 10.0 ¢/s

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0BytePlusUltraRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0_bpu_fast(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -35,8 +35,8 @@ mod tests {
   use crate::api::router_provider::RouterProvider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast::request::ArtcraftSeedance2p0BytePlusUltraFastRequestState;
 
 /// USD cents per second by resolution:
 ///   480p:  $0.09/s = 9.0 ¢/s

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0BytePlusUltraFastRequestState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0_fast(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -38,8 +38,8 @@ mod tests {
   use crate::api::video_list_ref::VideoListRef;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::request::ArtcraftSeedance2p0FastRequestState;
 
 // -- Pricing constants --
 //

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0FastRequestState {
@@ -32,7 +32,7 @@ mod tests {
   use crate::client::router_client::RouterClient;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
   use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
   use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
   use artcraft_client::utils::api_host::ApiHost;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0_u(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -33,8 +33,8 @@ mod tests {
   use crate::api::image_ref::ImageRef;
   use crate::api::router_provider::RouterProvider;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
 
 // ── Pricing constants ──
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0UltraRequestState {
@@ -31,7 +31,7 @@ mod tests {
   use crate::client::router_client::RouterClient;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
   use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
   use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
   use artcraft_client::utils::api_host::ApiHost;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/build.rs

@@ -2,12 +2,12 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_seedance_2p0_u_fast(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   let request = build_artcraft_omni_video_request(
@@ -38,8 +38,8 @@ mod tests {
   use crate::api::video_list_ref::VideoListRef;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
   use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/cost.rs

@@ -1,7 +1,7 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
 
 // ── Pricing constants ──
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance2p0UltraFastRequestState {
@@ -32,7 +32,7 @@ mod tests {
   use crate::client::router_client::RouterClient;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
   use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
   use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
   use artcraft_client::utils::api_host::ApiHost;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/build.rs

@@ -4,12 +4,12 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video_v2::providers::artcraft::build_common::{
+use crate::generate::generate_video::providers::artcraft::build_common::{
   build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
-use crate::generate::generate_video_v2::providers::artcraft::sora_2::request::ArtcraftSora2RequestState;
-use crate::generate::generate_video_v2::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video_v2::video_generation_request::VideoGenerationRequest;
+use crate::generate::generate_video::providers::artcraft::sora_2::request::ArtcraftSora2RequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
 pub fn build_artcraft_sora_2(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Sora 2 accepts only {4,8,12} seconds; pre-plan so cost parity holds for

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/cost.rs

@@ -1,5 +1,5 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video_v2::providers::artcraft::sora_2::request::ArtcraftSora2RequestState;
+use crate::generate::generate_video::providers::artcraft::sora_2::request::ArtcraftSora2RequestState;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSora2CostState {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/request.rs

@@ -3,7 +3,7 @@ use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video_v2::providers::artcraft::request_common::send_artcraft_omni_video_request;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftSora2RequestState {