refactor(scene): group modules into role-based subfolders

Move the 30 flat modules under src/scene/ into six folders by role:
convert (entity→geometry), text (fonts/shaping), model (render models),
pick (hit-test/selection/grips/xclip), view (camera/transform/render),
cache (block + property caches). pipeline/ is unchanged.

Full path migration — all `scene::X` references become
`scene::<group>::X`, no compatibility re-exports. render.rs items that
were `pub(super)` (parent was scene) become `pub(in crate::scene)` to
keep their original scene-wide visibility.

No behavior change; build and tests are green.

Co-Authored-By: Claude Opus 4.8 <[email protected]>

src/modules/annotate/aligned_dim.rs

@@ -7,7 +7,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_aligned.svg"));
 

src/modules/annotate/angular_dim.rs

@@ -4,7 +4,7 @@ use acadrust::EntityType;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_angular.svg"));

src/modules/annotate/diameter_dim.rs

@@ -7,7 +7,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_diameter.svg"));
 

src/modules/annotate/dim_baseline.rs

@@ -13,7 +13,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_baseline.svg"));
 

src/modules/annotate/dim_continue.rs

@@ -13,7 +13,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_continue.svg"));
 

src/modules/annotate/dimjogline.rs

@@ -9,7 +9,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_jog.svg"));
 

src/modules/annotate/dimtedit.rs

@@ -9,7 +9,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_tedit.svg"));
 

src/modules/annotate/leader_cmd.rs

@@ -17,7 +17,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/leader.svg"));
 

src/modules/annotate/linear_dim.rs

@@ -4,7 +4,7 @@ use acadrust::EntityType;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_linear.svg"));

src/modules/annotate/mleader_cmd.rs

@@ -12,7 +12,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/mleader.svg"));
 

src/modules/annotate/mleader_edit.rs

@@ -12,7 +12,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── MLEADERADD ────────────────────────────────────────────────────────────────
 

src/modules/annotate/mtext.rs

@@ -1,6 +1,6 @@
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/mtext.svg"));

src/modules/annotate/ordinate_dim.rs

@@ -15,7 +15,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub fn tool() -> ToolDef {
     ToolDef {

src/modules/annotate/qdim.rs

@@ -13,7 +13,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/qdim.svg"));
 

src/modules/annotate/radius_dim.rs

@@ -4,7 +4,7 @@ use acadrust::EntityType;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/dim_radius.svg"));

src/modules/annotate/table_cmd.rs

@@ -14,7 +14,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/table.svg"));
 

src/modules/annotate/text.rs

@@ -1,6 +1,6 @@
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/text.svg"));

src/modules/annotate/tolerance_cmd.rs

@@ -11,7 +11,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../assets/icons/tolerance.svg"));
 

src/modules/home/clipboard/paste.rs

@@ -17,7 +17,7 @@ use acadrust::Handle;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct PasteCommand {
     /// Wire models of the clipboard entities (used for preview).

src/modules/home/draw/arc.rs

@@ -17,7 +17,7 @@ use acadrust::{Arc as CadArc, EntityType};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::IconKind;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 const TAU: f32 = std::f32::consts::TAU;

src/modules/home/draw/attdef.rs

@@ -12,7 +12,7 @@ use acadrust::EntityType;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 enum Step {
     Tag,

src/modules/home/draw/circle.rs

@@ -14,7 +14,7 @@ use acadrust::{Circle, EntityType};
 use crate::command::{CadCommand, CmdResult, DynField, TangentObject};
 use crate::modules::home::defaults;
 use crate::modules::IconKind;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 const TAU: f32 = std::f32::consts::TAU;

src/modules/home/draw/ellipse.rs

@@ -10,7 +10,7 @@ use acadrust::{Ellipse, EntityType};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::IconKind;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 fn parse_f32(text: &str) -> Option<f32> {

src/modules/home/draw/hatch.rs

@@ -11,8 +11,8 @@
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::IconKind;
-use crate::scene::hatch_model::{HatchModel, HatchPattern, PatFamily};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::hatch_model::{HatchModel, HatchPattern, PatFamily};
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 // ── Icons ──────────────────────────────────────────────────────────────────
@@ -92,7 +92,7 @@ impl HatchCommand {
     fn make_hatch(&self, boundary: Vec<[f32; 2]>) -> HatchModel {
         // Default: ANSI31 from catalog; fallback to a single 45° family.
         let pat_name = "ANSI31";
-        let families = crate::scene::hatch_patterns::find(pat_name)
+        let families = crate::scene::model::hatch_patterns::find(pat_name)
             .and_then(|e| {
                 if let HatchPattern::Pattern(f) = &e.gpu {
                     Some(f.clone())

src/modules/home/draw/line.rs

@@ -11,7 +11,7 @@ use acadrust::{EntityType, Line};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 // ── Ribbon definition ─────────────────────────────────────────────────────

src/modules/home/draw/mline.rs

@@ -11,7 +11,7 @@ use acadrust::EntityType;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct MlineCommand {
     points: Vec<Vec3>,

src/modules/home/draw/point.rs

@@ -8,7 +8,7 @@ use acadrust::{EntityType, Point as CadPoint};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 #[allow(dead_code)]

src/modules/home/draw/polyline.rs

@@ -16,7 +16,7 @@ use glam::{Vec2, Vec3};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Ribbon definition ──────────────────────────────────────────────────────
 

src/modules/home/draw/raster_image.rs

@@ -12,7 +12,7 @@ use acadrust::EntityType;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct ImageCommand {
     file_path: String,

src/modules/home/draw/ray.rs

@@ -9,7 +9,7 @@ use acadrust::types::Vector3;
 use acadrust::EntityType;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 const DISPLAY_EXTENT: f32 = 1_000_000.0;

src/modules/home/draw/revcloud.rs

@@ -11,7 +11,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../../assets/icons/revcloud.svg"));
 

src/modules/home/draw/shapes.rs

@@ -16,7 +16,7 @@ use acadrust::{EntityType, LwPolyline};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::IconKind;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 const TAU: f32 = std::f32::consts::TAU;

src/modules/home/draw/spline.rs

@@ -8,7 +8,7 @@ use acadrust::{EntityType, Spline};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 #[allow(dead_code)]

src/modules/home/draw/wipeout.rs

@@ -11,7 +11,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub const ICON: IconKind = IconKind::Svg(include_bytes!("../../../../assets/icons/wipeout.svg"));
 

src/modules/home/groups/group.rs

@@ -17,7 +17,7 @@ use acadrust::Handle;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct GroupCommand {
     handles: Vec<Handle>,

src/modules/home/groups/ungroup.rs

@@ -17,7 +17,7 @@ use acadrust::Handle;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct UngroupCommand;
 

src/modules/home/inquiry/area.rs

@@ -4,7 +4,7 @@
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct AreaCommand {
     points: Vec<Vec3>,

src/modules/home/inquiry/dist.rs

@@ -3,7 +3,7 @@
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct DistCommand {
     first: Option<Vec3>,

src/modules/home/layers/match_layer.rs

@@ -19,7 +19,7 @@ use acadrust::Handle;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct LayMatchCommand {
     dest_handles: Vec<Handle>,

src/modules/home/modify/array.rs

@@ -19,7 +19,7 @@ use glam::Vec3;
 use crate::command::{CadCommand, CmdResult, EntityTransform};
 use crate::modules::home::defaults;
 use crate::modules::IconKind;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Dropdown constants ─────────────────────────────────────────────────────
 
@@ -395,7 +395,7 @@ use std::f32::consts::TAU as FTAU;
 /// chord and ignored the extrusion, so arc-segment paths came out mirrored.
 fn lw_dense_pts(p: &acadrust::entities::LwPolyline) -> Vec<Vec3> {
     use crate::entities::common::BulgeArc;
-    use crate::scene::transform::ocs_point_to_wcs;
+    use crate::scene::view::transform::ocs_point_to_wcs;
 
     let verts = &p.vertices;
     if verts.is_empty() {
@@ -547,7 +547,7 @@ impl ArrayPathCommand {
                 // (normal = -Z) are traced on the same side the renderer draws,
                 // matching `entities::arc::to_truck`. Sampling the raw centre +
                 // angle ignores the extrusion and lands on the mirrored arc.
-                use crate::scene::transform::{ocs_axes, ocs_point_to_wcs};
+                use crate::scene::view::transform::{ocs_axes, ocs_point_to_wcs};
                 let normal = (a.normal.x, a.normal.y, a.normal.z);
                 let (ax, ay) = ocs_axes(normal);
                 let (cx, cy, cz) =
@@ -570,7 +570,7 @@ impl ArrayPathCommand {
                     .collect()
             }
             EntityType::Circle(c) => {
-                use crate::scene::transform::{ocs_axes, ocs_point_to_wcs};
+                use crate::scene::view::transform::{ocs_axes, ocs_point_to_wcs};
                 let normal = (c.normal.x, c.normal.y, c.normal.z);
                 let (ax, ay) = ocs_axes(normal);
                 let (cx, cy, cz) =

src/modules/home/modify/attedit.rs

@@ -10,7 +10,7 @@ use acadrust::EntityType;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct AtteditCommand {
     step: Step,

src/modules/home/modify/break_cmd.rs

@@ -20,7 +20,7 @@ use truck_modeling::base::{BoundedCurve, Cut};
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Ribbon definition ──────────────────────────────────────────────────────
 

src/modules/home/modify/copy.rs

@@ -10,7 +10,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult, EntityTransform};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Ribbon definition ──────────────────────────────────────────────────────
 

src/modules/home/modify/fillet.rs

@@ -19,7 +19,7 @@ const TAU: f64 = std::f64::consts::TAU;
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::home::defaults;
 use crate::modules::IconKind;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Dropdown constants ─────────────────────────────────────────────────────
 

src/modules/home/modify/mirror.rs

@@ -13,7 +13,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult, EntityTransform};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub fn tool() -> ToolDef {
     ToolDef {

src/modules/home/modify/offset.rs

@@ -23,7 +23,7 @@ use glam::Vec3;
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::home::defaults;
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Ribbon definition ──────────────────────────────────────────────────────
 

src/modules/home/modify/refedit.rs

@@ -128,7 +128,7 @@ impl CadCommand for RefCloseCommand {
 /// Order: scale → rotate (around origin) → translate.
 pub fn apply_insert_transform(entity: &mut EntityType, session: &RefEditSession) {
     use crate::command::EntityTransform;
-    use crate::scene::dispatch;
+    use crate::scene::view::dispatch;
 
     let origin = Vec3::ZERO;
 
@@ -170,7 +170,7 @@ pub fn apply_insert_transform(entity: &mut EntityType, session: &RefEditSession)
 /// Order: un-translate → un-rotate → un-scale.
 pub fn apply_insert_inverse_transform(entity: &mut EntityType, session: &RefEditSession) {
     use crate::command::EntityTransform;
-    use crate::scene::dispatch;
+    use crate::scene::view::dispatch;
 
     let origin = Vec3::ZERO;
 

src/modules/home/modify/rotate.rs

@@ -12,7 +12,7 @@ use glam::Vec3;
 use crate::command::{CadCommand, CmdResult, DynField, EntityTransform};
 use crate::modules::home::defaults;
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Ribbon definition ──────────────────────────────────────────────────────
 

src/modules/home/modify/scale.rs

@@ -18,7 +18,7 @@ use glam::Vec3;
 use crate::command::{CadCommand, CmdResult, EntityTransform};
 use crate::modules::home::defaults;
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 #[allow(dead_code)]
 pub fn tool() -> ToolDef {

src/modules/home/modify/splinedit.rs

@@ -14,7 +14,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 #[allow(dead_code)]
 pub fn tool() -> ToolDef {

src/modules/home/modify/stretch.rs

@@ -20,7 +20,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Ribbon definition ──────────────────────────────────────────────────────
 

src/modules/home/modify/translate.rs

@@ -10,7 +10,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult, EntityTransform};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Ribbon definition ──────────────────────────────────────────────────────
 

src/modules/home/modify/trim.rs

@@ -25,7 +25,7 @@ use crate::modules::home::modify::spline_ops::{
     t_to_rel,
 };
 use crate::modules::IconKind;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 // ── Dropdown constants ─────────────────────────────────────────────────────
 

src/modules/home/properties/match_prop.rs

@@ -17,7 +17,7 @@ use acadrust::Handle;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct MatchPropCommand {
     /// Source handle; NULL until phase 1 is complete.

src/modules/home/select.rs

@@ -9,7 +9,7 @@ use acadrust::Handle;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct SelectObjectsCommand {
     pending_cmd: String,

src/modules/insert/create_block.rs

@@ -3,7 +3,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub fn tool() -> ToolDef {
     ToolDef {

src/modules/insert/insert_block.rs

@@ -5,7 +5,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub fn tool() -> ToolDef {
     ToolDef {

src/modules/insert/xattach.rs

@@ -16,7 +16,7 @@ use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use crate::scene::Scene;
 
 pub fn tool() -> ToolDef {

src/modules/layout/mview.rs

@@ -10,7 +10,7 @@ use acadrust::EntityType;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 // ── Ribbon definition ─────────────────────────────────────────────────────

src/modules/layout/vplayer.rs

@@ -14,7 +14,7 @@ use acadrust::Handle;
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct VplayerCommand {
     vp_handle: Handle,

src/modules/manage/mview.rs

@@ -10,7 +10,7 @@ use acadrust::EntityType;
 
 use crate::command::{CadCommand, CmdResult};
 use crate::modules::{IconKind, ModuleEvent, ToolDef};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 // ── Ribbon definition ─────────────────────────────────────────────────────

src/modules/model/primitive_cmd.rs

@@ -13,8 +13,8 @@ use glam::Vec3;
 use truck_modeling::Solid;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::model_solid;
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::model_solid;
+use crate::scene::model::wire_model::WireModel;
 
 /// Which primitive a `PrimitiveCommand` builds.
 #[derive(Clone, Copy, PartialEq, Eq)]

src/modules/view/plot_window.rs

@@ -4,7 +4,7 @@
 // window to the layout's PlotSettings (PlotType::Window).
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 use glam::Vec3;
 
 pub struct PlotWindowCommand {

src/modules/view/zoom_window.rs

@@ -3,7 +3,7 @@
 use glam::Vec3;
 
 use crate::command::{CadCommand, CmdResult};
-use crate::scene::wire_model::WireModel;
+use crate::scene::model::wire_model::WireModel;
 
 pub struct ZoomWindowCommand {
     first: Option<Vec3>,