diff --git a/.gitignore b/.gitignore
index eab90c66485b..8b540d109686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ _deps
 __pycache__
 *.pyc
 *.so
+**/.pytest_cache
 
 # Pixi environment
 .pixi
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index 37df6cfd38b6..665144876cc5 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -88,11 +88,11 @@ Of course, this will only take us so far. In the future we plan on caching queri
 Here is an overview of the crates included in the project:
 
 <picture>
-  <img src="https://static.rerun.io/crates/f0024a424aa35efab710ae88ba6a1ed741e7c248/full.png" alt="">
-  <source media="(max-width: 480px)" srcset="https://static.rerun.io/crates/f0024a424aa35efab710ae88ba6a1ed741e7c248/480w.png">
-  <source media="(max-width: 768px)" srcset="https://static.rerun.io/crates/f0024a424aa35efab710ae88ba6a1ed741e7c248/768w.png">
-  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/crates/f0024a424aa35efab710ae88ba6a1ed741e7c248/1024w.png">
-  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/crates/f0024a424aa35efab710ae88ba6a1ed741e7c248/1200w.png">
+  <img src="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/full.png" alt="">
+  <source media="(max-width: 480px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/480w.png">
+  <source media="(max-width: 768px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/768w.png">
+  <source media="(max-width: 1024px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/1024w.png">
+  <source media="(max-width: 1200px)" srcset="https://static.rerun.io/crates/b431e1271e48eaba8db3a38fef18f27227db9b2d/1200w.png">
 </picture>
 
 <!-- !!! IMPORTANT!!!
@@ -128,6 +128,7 @@ Update instructions:
 |-----------------------------|----------------------------------------------------------------------------------------|
 | re_viewer                   | The Rerun Viewer                                                                       |
 | re_viewport                 | The central viewport panel of the Rerun viewer.                                        |
+| re_viewport_blueprint       | The data model description of the viewport panel.                                      |
 | re_time_panel               | The time panel of the Rerun Viewer, allowing to control the displayed timeline & time. |
 | re_data_ui                  | Provides ui elements for Rerun component data for the Rerun Viewer.                    |
 | re_viewer_context           | Rerun Viewer state that is shared with the viewer's code components.                   |
diff --git a/Cargo.lock b/Cargo.lock
index 62e7b04b302c..f20f9252e633 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4644,19 +4644,14 @@ name = "re_space_view"
 version = "0.17.0-alpha.2"
 dependencies = [
  "egui",
- "itertools 0.12.0",
- "nohash-hasher",
  "re_data_store",
  "re_entity_db",
- "re_log",
  "re_log_types",
- "re_query",
  "re_tracing",
- "re_types",
  "re_types_core",
+ "re_ui",
  "re_viewer_context",
- "slotmap",
- "smallvec",
+ "re_viewport_blueprint",
 ]
 
 [[package]]
@@ -4724,6 +4719,7 @@ dependencies = [
  "re_types",
  "re_ui",
  "re_viewer_context",
+ "re_viewport_blueprint",
  "serde",
  "smallvec",
  "web-time",
@@ -4777,7 +4773,6 @@ version = "0.17.0-alpha.2"
 dependencies = [
  "egui",
  "egui_extras",
- "itertools 0.12.0",
  "re_data_store",
  "re_data_ui",
  "re_entity_db",
@@ -4810,6 +4805,7 @@ dependencies = [
  "re_types",
  "re_ui",
  "re_viewer_context",
+ "re_viewport_blueprint",
 ]
 
 [[package]]
@@ -4840,6 +4836,7 @@ dependencies = [
  "re_ui",
  "re_viewer_context",
  "re_viewport",
+ "re_viewport_blueprint",
  "serde",
  "vec1",
 ]
@@ -4998,7 +4995,6 @@ dependencies = [
  "eframe",
  "egui",
  "egui-wgpu",
- "egui_extras",
  "egui_plot",
  "egui_tiles",
  "ehttp",
@@ -5041,6 +5037,7 @@ dependencies = [
  "re_ui",
  "re_viewer_context",
  "re_viewport",
+ "re_viewport_blueprint",
  "re_ws_comms",
  "rfd",
  "ron",
@@ -5110,7 +5107,6 @@ dependencies = [
  "nohash-hasher",
  "once_cell",
  "rayon",
- "re_data_store",
  "re_data_ui",
  "re_entity_db",
  "re_log",
@@ -5121,13 +5117,35 @@ dependencies = [
  "re_tracing",
  "re_types",
  "re_types_blueprint",
- "re_types_core",
  "re_ui",
  "re_viewer_context",
+ "re_viewport_blueprint",
  "smallvec",
  "static_assertions",
 ]
 
+[[package]]
+name = "re_viewport_blueprint"
+version = "0.17.0-alpha.2"
+dependencies = [
+ "ahash",
+ "egui",
+ "egui_tiles",
+ "itertools 0.12.0",
+ "nohash-hasher",
+ "re_data_store",
+ "re_entity_db",
+ "re_log",
+ "re_log_types",
+ "re_tracing",
+ "re_types",
+ "re_types_blueprint",
+ "re_types_core",
+ "re_viewer_context",
+ "slotmap",
+ "smallvec",
+]
+
 [[package]]
 name = "re_web_viewer_server"
 version = "0.17.0-alpha.2"
diff --git a/Cargo.toml b/Cargo.toml
index 323764632d52..e7eabe8ae98c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -71,6 +71,7 @@ re_ui = { path = "crates/re_ui", version = "=0.17.0-alpha.2", default-features =
 re_viewer = { path = "crates/re_viewer", version = "=0.17.0-alpha.2", default-features = false }
 re_viewer_context = { path = "crates/re_viewer_context", version = "=0.17.0-alpha.2", default-features = false }
 re_viewport = { path = "crates/re_viewport", version = "=0.17.0-alpha.2", default-features = false }
+re_viewport_blueprint = { path = "crates/re_viewport_blueprint", version = "=0.17.0-alpha.2", default-features = false }
 re_web_viewer_server = { path = "crates/re_web_viewer_server", version = "=0.17.0-alpha.2", default-features = false }
 re_ws_comms = { path = "crates/re_ws_comms", version = "=0.17.0-alpha.2", default-features = false }
 rerun = { path = "crates/rerun", version = "=0.17.0-alpha.2", default-features = false }
diff --git a/crates/re_space_view/Cargo.toml b/crates/re_space_view/Cargo.toml
index 36b53d591f51..a54759094ef5 100644
--- a/crates/re_space_view/Cargo.toml
+++ b/crates/re_space_view/Cargo.toml
@@ -22,18 +22,13 @@ all-features = true
 default = []
 
 [dependencies]
-re_log.workspace = true
 re_log_types.workspace = true
 re_data_store.workspace = true
 re_entity_db.workspace = true
-re_query.workspace = true
 re_tracing.workspace = true
 re_types_core.workspace = true
-re_types.workspace = true
+re_ui.workspace = true
 re_viewer_context.workspace = true
+re_viewport_blueprint.workspace = true
 
 egui.workspace = true
-itertools.workspace = true
-nohash-hasher.workspace = true
-slotmap.workspace = true
-smallvec = { workspace = true, features = ["serde"] }
diff --git a/crates/re_space_view/src/data_query.rs b/crates/re_space_view/src/data_query.rs
deleted file mode 100644
index 6dd4d9b930d5..000000000000
--- a/crates/re_space_view/src/data_query.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use re_entity_db::{
-    external::re_data_store::LatestAtQuery, EntityDb, EntityProperties, EntityPropertyMap,
-};
-use re_log_types::Timeline;
-use re_viewer_context::{
-    DataQueryResult, PerVisualizer, QueryRange, SpaceViewClassRegistry, StoreContext,
-    VisualizableEntities,
-};
-
-pub struct EntityOverrideContext<'a> {
-    pub legacy_space_view_properties: EntityProperties,
-
-    /// Provides auto properties for each entity.
-    pub legacy_auto_properties: &'a EntityPropertyMap,
-
-    /// Query range that data results should fall back to if they don't specify their own.
-    pub default_query_range: QueryRange,
-}
-
-/// Trait for resolving properties needed by most implementations of [`DataQuery`]
-///
-/// The `SpaceViewBlueprint` is the only thing that likely implements this today
-/// but we use a trait here so we don't have to pick up a full dependency on `re_viewport`.
-pub trait PropertyResolver {
-    fn update_overrides(
-        &self,
-        blueprint: &EntityDb,
-        blueprint_query: &LatestAtQuery,
-        active_timeline: &Timeline,
-        space_view_class_registry: &SpaceViewClassRegistry,
-        legacy_auto_properties: &EntityPropertyMap,
-        query_result: &mut DataQueryResult,
-    );
-}
-
-/// The common trait implemented for data queries
-///
-/// Both interfaces return [`re_viewer_context::DataResult`]s, which are self-contained description of the data
-/// to be added to a `SpaceView` including both the [`re_log_types::EntityPath`] and context for any overrides.
-pub trait DataQuery {
-    /// Execute a full query, returning a `DataResultTree` containing all results.
-    ///
-    /// This is used when building up the contents for a `SpaceView`.
-    fn execute_query(
-        &self,
-        ctx: &StoreContext<'_>,
-        visualizable_entities_for_visualizer_systems: &PerVisualizer<VisualizableEntities>,
-    ) -> DataQueryResult;
-}
diff --git a/crates/re_space_view/src/lib.rs b/crates/re_space_view/src/lib.rs
index a9132a0286e9..500f9e242c2b 100644
--- a/crates/re_space_view/src/lib.rs
+++ b/crates/re_space_view/src/lib.rs
@@ -3,23 +3,15 @@
 //! Types & utilities for defining Space View classes and communicating with the Viewport.
 
 pub mod controls;
-mod data_query;
+
 mod heuristics;
 mod screenshot;
-mod space_view;
-mod space_view_contents;
-mod view_properties; // TODO(andreas): better name before `sub_archetype` sticks around?
+mod view_property_ui;
 mod visualizable;
 
-pub use data_query::{DataQuery, EntityOverrideContext, PropertyResolver};
 pub use heuristics::suggest_space_view_for_each_entity;
 pub use screenshot::ScreenshotMode;
-pub use space_view::SpaceViewBlueprint;
-pub use space_view_contents::SpaceViewContents;
-pub use view_properties::{
-    edit_blueprint_component, entity_path_for_view_property, get_blueprint_component,
-    query_view_property, query_view_property_or_default, view_property, view_property_ui,
-};
+pub use view_property_ui::view_property_ui;
 pub use visualizable::determine_visualizable_entities;
 
 pub mod external {
diff --git a/crates/re_space_view/src/view_property_ui.rs b/crates/re_space_view/src/view_property_ui.rs
new file mode 100644
index 000000000000..b11e5fea970b
--- /dev/null
+++ b/crates/re_space_view/src/view_property_ui.rs
@@ -0,0 +1,65 @@
+use re_types_core::Archetype;
+use re_ui::list_item;
+use re_viewer_context::{SpaceViewId, ViewerContext};
+use re_viewport_blueprint::entity_path_for_view_property;
+
+/// Display the UI for editing all components of a blueprint archetype.
+///
+/// Note that this will show default values for components that are null.
+pub fn view_property_ui<A: Archetype>(
+    ctx: &ViewerContext<'_>,
+    space_view_id: SpaceViewId,
+    ui: &mut egui::Ui,
+) {
+    let blueprint_db = ctx.store_context.blueprint;
+    let blueprint_query = ctx.blueprint_query;
+    let blueprint_path = entity_path_for_view_property::<A>(space_view_id, blueprint_db.tree());
+
+    let component_names = A::all_components();
+    let component_results = blueprint_db.latest_at(
+        blueprint_query,
+        &blueprint_path,
+        component_names.iter().copied(),
+    );
+
+    let sub_prop_ui = |re_ui: &re_ui::ReUi, ui: &mut egui::Ui| {
+        for component_name in component_names.as_ref() {
+            if component_name.is_indicator_component() {
+                continue;
+            }
+
+            list_item::ListItem::new(re_ui)
+                .interactive(false)
+                .show_flat(
+                    ui,
+                    // TODO(andreas): Note that we loose the archetype's field name here, instead we label the item with the component name.
+                    list_item::PropertyContent::new(component_name.short_name()).value_fn(
+                        |_, ui, _| {
+                            ctx.component_ui_registry.edit_ui(
+                                ctx,
+                                ui,
+                                re_viewer_context::UiLayout::List,
+                                blueprint_query,
+                                blueprint_db,
+                                &blueprint_path,
+                                &blueprint_path,
+                                component_results.get_or_empty(*component_name),
+                                component_name,
+                                &0.into(),
+                            );
+                        },
+                    ),
+                );
+        }
+    };
+
+    list_item::ListItem::new(ctx.re_ui)
+        .interactive(false)
+        .show_hierarchical_with_children(
+            ui,
+            A::name().full_name(),
+            true,
+            list_item::LabelContent::new(A::name().short_name()),
+            sub_prop_ui,
+        );
+}
diff --git a/crates/re_space_view_spatial/Cargo.toml b/crates/re_space_view_spatial/Cargo.toml
index bc0c28779e2b..23fa04af6b6e 100644
--- a/crates/re_space_view_spatial/Cargo.toml
+++ b/crates/re_space_view_spatial/Cargo.toml
@@ -36,6 +36,7 @@ re_types = { workspace = true, features = ["ecolor", "glam", "image"] }
 re_tracing.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
+re_viewport_blueprint.workspace = true
 re_space_view.workspace = true
 
 ahash.workspace = true
diff --git a/crates/re_space_view_spatial/src/space_view_2d.rs b/crates/re_space_view_spatial/src/space_view_2d.rs
index d262e1b1e7f0..778f663dd2a5 100644
--- a/crates/re_space_view_spatial/src/space_view_2d.rs
+++ b/crates/re_space_view_spatial/src/space_view_2d.rs
@@ -284,7 +284,7 @@ impl SpaceViewClass for SpatialSpaceView2D {
 fn visual_bounds_ui(ctx: &ViewerContext<'_>, space_view_id: SpaceViewId, ui: &mut egui::Ui) {
     let tooltip = "The area guaranteed to be visible.\n\
                    Depending on the view's current aspect ratio the actually visible area might be larger either horizontally or vertically.";
-    re_space_view::edit_blueprint_component::<
+    re_viewport_blueprint::edit_blueprint_component::<
         VisualBounds2D,
         blueprint_components::VisualBounds2D,
         (),
diff --git a/crates/re_space_view_spatial/src/ui.rs b/crates/re_space_view_spatial/src/ui.rs
index b082161723f9..fb51cbeb89d4 100644
--- a/crates/re_space_view_spatial/src/ui.rs
+++ b/crates/re_space_view_spatial/src/ui.rs
@@ -782,7 +782,7 @@ pub fn background_ui(
     let blueprint_db = ctx.store_context.blueprint;
     let blueprint_query = ctx.blueprint_query;
     let (archetype, blueprint_path) =
-        re_space_view::query_view_property(space_view_id, blueprint_db, blueprint_query);
+        re_viewport_blueprint::query_view_property(space_view_id, blueprint_db, blueprint_query);
 
     let Background { color, mut kind } = archetype.ok().flatten().unwrap_or(default_background);
 
diff --git a/crates/re_space_view_spatial/src/ui_2d.rs b/crates/re_space_view_spatial/src/ui_2d.rs
index dcce82da23d9..e406167b3e1a 100644
--- a/crates/re_space_view_spatial/src/ui_2d.rs
+++ b/crates/re_space_view_spatial/src/ui_2d.rs
@@ -118,7 +118,7 @@ fn ui_from_scene(
         RectTransform::from_to(letterboxed_bounds, response.rect)
     }
 
-    re_space_view::edit_blueprint_component::<
+    re_viewport_blueprint::edit_blueprint_component::<
         VisualBounds2D,
         blueprint_components::VisualBounds2D,
         RectTransform,
@@ -285,7 +285,7 @@ pub fn view_2d(
         view_builder.queue_draw(draw_data);
     }
 
-    let background = re_space_view::view_property::<Background>(ctx, query.space_view_id)
+    let background = re_viewport_blueprint::view_property::<Background>(ctx, query.space_view_id)
         .unwrap_or(Background::DEFAULT_2D);
     let (background_drawable, clear_color) = crate::configure_background(
         ctx,
diff --git a/crates/re_space_view_spatial/src/ui_3d.rs b/crates/re_space_view_spatial/src/ui_3d.rs
index f90a8e25e4ff..80d8ec77cafc 100644
--- a/crates/re_space_view_spatial/src/ui_3d.rs
+++ b/crates/re_space_view_spatial/src/ui_3d.rs
@@ -665,7 +665,7 @@ pub fn view_3d(
     // Commit ui induced lines.
     view_builder.queue_draw(line_builder.into_draw_data()?);
 
-    let background = re_space_view::view_property::<Background>(ctx, query.space_view_id)
+    let background = re_viewport_blueprint::view_property::<Background>(ctx, query.space_view_id)
         .unwrap_or(Background::DEFAULT_3D);
     let (background_drawable, clear_color) = crate::configure_background(
         ctx,
diff --git a/crates/re_space_view_text_log/Cargo.toml b/crates/re_space_view_text_log/Cargo.toml
index 0d277c329970..6fe0b26476e8 100644
--- a/crates/re_space_view_text_log/Cargo.toml
+++ b/crates/re_space_view_text_log/Cargo.toml
@@ -33,4 +33,3 @@ re_viewer_context.workspace = true
 
 egui_extras.workspace = true
 egui.workspace = true
-itertools.workspace = true
diff --git a/crates/re_space_view_time_series/Cargo.toml b/crates/re_space_view_time_series/Cargo.toml
index bcbfc845c815..d679e5b54f1f 100644
--- a/crates/re_space_view_time_series/Cargo.toml
+++ b/crates/re_space_view_time_series/Cargo.toml
@@ -30,6 +30,7 @@ re_tracing.workspace = true
 re_types = { workspace = true, features = ["egui_plot"] }
 re_ui.workspace = true
 re_viewer_context.workspace = true
+re_viewport_blueprint.workspace = true
 
 egui.workspace = true
 egui_plot.workspace = true
diff --git a/crates/re_space_view_time_series/src/space_view_class.rs b/crates/re_space_view_time_series/src/space_view_class.rs
index 4f7b1ed47819..e7c0bba54e3a 100644
--- a/crates/re_space_view_time_series/src/space_view_class.rs
+++ b/crates/re_space_view_time_series/src/space_view_class.rs
@@ -5,7 +5,7 @@ use egui_plot::{Legend, Line, Plot, PlotPoint, Points};
 use re_data_store::TimeType;
 use re_format::next_grid_tick_magnitude_ns;
 use re_log_types::{EntityPath, TimeInt, TimeZone};
-use re_space_view::{controls, query_view_property_or_default, view_property_ui};
+use re_space_view::{controls, view_property_ui};
 use re_types::blueprint::archetypes::PlotLegend;
 use re_types::{components::Range1D, datatypes::TimeRange, SpaceViewClassIdentifier, View};
 use re_ui::list_item;
@@ -19,6 +19,7 @@ use re_viewer_context::{
     SpaceViewSystemExecutionError, SystemExecutionOutput, ViewQuery, ViewSystemIdentifier,
     ViewerContext, VisualizableEntities,
 };
+use re_viewport_blueprint::query_view_property_or_default;
 
 use crate::line_visualizer_system::SeriesLineSystem;
 use crate::point_visualizer_system::SeriesPointSystem;
diff --git a/crates/re_time_panel/Cargo.toml b/crates/re_time_panel/Cargo.toml
index 60f1d71c33af..46d810fb94bb 100644
--- a/crates/re_time_panel/Cargo.toml
+++ b/crates/re_time_panel/Cargo.toml
@@ -28,7 +28,8 @@ re_tracing.workspace = true
 re_types.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
-re_viewport.workspace = true       # TODO(#5421): remove this dependency in favor of re_viewport_blueprint when it exists
+re_viewport.workspace = true           # TODO(#6414): remove this dependency in favor of re_context_menu when it exists
+re_viewport_blueprint.workspace = true
 
 egui.workspace = true
 itertools.workspace = true
diff --git a/crates/re_time_panel/src/lib.rs b/crates/re_time_panel/src/lib.rs
index 9b8177aadc7d..00ed32636674 100644
--- a/crates/re_time_panel/src/lib.rs
+++ b/crates/re_time_panel/src/lib.rs
@@ -29,7 +29,8 @@ use re_viewer_context::{
     CollapseScope, HoverHighlight, Item, RecordingConfig, TimeControl, TimeView, UiLayout,
     ViewerContext,
 };
-use re_viewport::{context_menu_ui_for_item, SelectionUpdateBehavior, ViewportBlueprint};
+use re_viewport::{context_menu_ui_for_item, SelectionUpdateBehavior};
+use re_viewport_blueprint::ViewportBlueprint;
 
 use time_axis::TimelineAxis;
 use time_control_ui::TimeControlUi;
diff --git a/crates/re_viewer/Cargo.toml b/crates/re_viewer/Cargo.toml
index a039133d20c4..c122689faf70 100644
--- a/crates/re_viewer/Cargo.toml
+++ b/crates/re_viewer/Cargo.toml
@@ -74,6 +74,7 @@ re_types_core.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
 re_viewport.workspace = true
+re_viewport_blueprint.workspace = true
 re_ws_comms = { workspace = true, features = ["client"] }
 
 # Internal (optional):
@@ -91,7 +92,6 @@ eframe = { workspace = true, default-features = false, features = [
   "puffin",
   "wgpu",
 ] }
-egui_extras.workspace = true
 egui_plot.workspace = true
 egui-wgpu.workspace = true
 egui.workspace = true
diff --git a/crates/re_viewer/src/app_state.rs b/crates/re_viewer/src/app_state.rs
index 4546100cebdc..1599f726e9c6 100644
--- a/crates/re_viewer/src/app_state.rs
+++ b/crates/re_viewer/src/app_state.rs
@@ -4,14 +4,15 @@ use re_data_store::LatestAtQuery;
 use re_entity_db::EntityDb;
 use re_log_types::{LogMsg, ResolvedTimeRangeF, StoreId};
 use re_smart_channel::ReceiveSet;
-use re_space_view::{determine_visualizable_entities, DataQuery as _, PropertyResolver as _};
+use re_space_view::determine_visualizable_entities;
 use re_types::blueprint::components::PanelState;
 use re_viewer_context::{
     blueprint_timeline, AppOptions, ApplicationSelectionState, Caches, CommandSender,
     ComponentUiRegistry, PlayState, RecordingConfig, SpaceViewClassRegistry, StoreContext,
     StoreHub, SystemCommandSender as _, ViewerContext,
 };
-use re_viewport::{Viewport, ViewportBlueprint, ViewportState};
+use re_viewport::{Viewport, ViewportState};
+use re_viewport_blueprint::ViewportBlueprint;
 
 use crate::ui::recordings_panel_ui;
 use crate::{app_blueprint::AppBlueprint, ui::blueprint_panel_ui};
diff --git a/crates/re_viewer/src/ui/override_ui.rs b/crates/re_viewer/src/ui/override_ui.rs
index 0c5fe3bf74dd..ba9ddbcc436a 100644
--- a/crates/re_viewer/src/ui/override_ui.rs
+++ b/crates/re_viewer/src/ui/override_ui.rs
@@ -5,12 +5,13 @@ use itertools::Itertools;
 use re_data_store::LatestAtQuery;
 use re_entity_db::{EntityDb, InstancePath};
 use re_log_types::{DataRow, RowId, StoreKind};
-use re_space_view::{determine_visualizable_entities, SpaceViewBlueprint};
+use re_space_view::determine_visualizable_entities;
 use re_types_core::{components::VisualizerOverrides, ComponentName};
 use re_viewer_context::{
     DataResult, OverridePath, SystemCommand, SystemCommandSender as _, UiLayout,
     ViewSystemIdentifier, ViewerContext,
 };
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 pub fn override_ui(
     ctx: &ViewerContext<'_>,
diff --git a/crates/re_viewer/src/ui/query_range_ui.rs b/crates/re_viewer/src/ui/query_range_ui.rs
index bed720e40f94..d99d35f75a6d 100644
--- a/crates/re_viewer/src/ui/query_range_ui.rs
+++ b/crates/re_viewer/src/ui/query_range_ui.rs
@@ -5,7 +5,6 @@ use egui::{NumExt as _, Response, Ui};
 
 use re_entity_db::TimeHistogram;
 use re_log_types::{EntityPath, ResolvedTimeRange, TimeType, TimeZone, TimelineName};
-use re_space_view::{entity_path_for_view_property, SpaceViewBlueprint};
 use re_space_view_spatial::{SpatialSpaceView2D, SpatialSpaceView3D};
 use re_space_view_time_series::TimeSeriesSpaceView;
 use re_types::{
@@ -14,6 +13,7 @@ use re_types::{
 };
 use re_ui::{markdown_ui, ReUi};
 use re_viewer_context::{QueryRange, SpaceViewClass, ViewerContext};
+use re_viewport_blueprint::{entity_path_for_view_property, SpaceViewBlueprint};
 
 /// These space views support the Visible History feature.
 static VISIBLE_HISTORY_SUPPORTED_SPACE_VIEWS: once_cell::sync::Lazy<
diff --git a/crates/re_viewer/src/ui/selection_history_ui.rs b/crates/re_viewer/src/ui/selection_history_ui.rs
index 5d36df2303f3..f4264f3505d4 100644
--- a/crates/re_viewer/src/ui/selection_history_ui.rs
+++ b/crates/re_viewer/src/ui/selection_history_ui.rs
@@ -1,7 +1,7 @@
 use egui::RichText;
 use re_ui::UICommand;
 use re_viewer_context::{Item, ItemCollection, SelectionHistory};
-use re_viewport::ViewportBlueprint;
+use re_viewport_blueprint::ViewportBlueprint;
 
 // ---
 
diff --git a/crates/re_viewer/src/ui/selection_panel.rs b/crates/re_viewer/src/ui/selection_panel.rs
index 50af8049657c..78fc653a5efc 100644
--- a/crates/re_viewer/src/ui/selection_panel.rs
+++ b/crates/re_viewer/src/ui/selection_panel.rs
@@ -22,8 +22,9 @@ use re_viewer_context::{
 };
 use re_viewport::{
     contents_name_style, context_menu_ui_for_item, icon_for_container_kind,
-    SelectionUpdateBehavior, Viewport, ViewportBlueprint,
+    SelectionUpdateBehavior, Viewport,
 };
+use re_viewport_blueprint::ViewportBlueprint;
 
 use crate::ui::override_ui::override_visualizer_ui;
 use crate::{app_state::default_selection_panel_width, ui::override_ui::override_ui};
@@ -268,7 +269,7 @@ fn data_section_ui(item: &Item) -> Option<Box<dyn DataUi>> {
 fn space_view_button(
     ctx: &ViewerContext<'_>,
     ui: &mut egui::Ui,
-    space_view: &re_space_view::SpaceViewBlueprint,
+    space_view: &re_viewport_blueprint::SpaceViewBlueprint,
 ) -> egui::Response {
     let item = Item::SpaceView(space_view.id);
     let is_selected = ctx.selection().contains_item(&item);
diff --git a/crates/re_viewer/src/ui/space_view_space_origin_ui.rs b/crates/re_viewer/src/ui/space_view_space_origin_ui.rs
index d2a1239d1998..6830c3e83199 100644
--- a/crates/re_viewer/src/ui/space_view_space_origin_ui.rs
+++ b/crates/re_viewer/src/ui/space_view_space_origin_ui.rs
@@ -4,9 +4,9 @@ use eframe::emath::NumExt;
 use egui::{Key, Ui};
 
 use re_log_types::EntityPath;
-use re_space_view::SpaceViewBlueprint;
 use re_ui::{list_item, ReUi, SyntaxHighlighting};
 use re_viewer_context::ViewerContext;
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 /// State of the space origin widget.
 #[derive(Default, Clone)]
diff --git a/crates/re_viewport/Cargo.toml b/crates/re_viewport/Cargo.toml
index 87d211893b2e..bf9a68a0a36b 100644
--- a/crates/re_viewport/Cargo.toml
+++ b/crates/re_viewport/Cargo.toml
@@ -19,7 +19,6 @@ workspace = true
 all-features = true
 
 [dependencies]
-re_data_store.workspace = true
 re_data_ui.workspace = true
 re_entity_db = { workspace = true, features = ["serde"] }
 re_log_types.workspace = true
@@ -35,9 +34,9 @@ re_space_view.workspace = true
 re_tracing.workspace = true
 re_types.workspace = true
 re_types_blueprint.workspace = true
-re_types_core.workspace = true
 re_ui.workspace = true
 re_viewer_context.workspace = true
+re_viewport_blueprint.workspace = true
 
 ahash.workspace = true
 egui_tiles.workspace = true
diff --git a/crates/re_viewport/src/add_space_view_or_container_modal.rs b/crates/re_viewport/src/add_space_view_or_container_modal.rs
index 259733523d8f..68d30458d3f1 100644
--- a/crates/re_viewport/src/add_space_view_or_container_modal.rs
+++ b/crates/re_viewport/src/add_space_view_or_container_modal.rs
@@ -1,12 +1,12 @@
 //! Modal for adding a new space view of container to an existing target container.
 
-use re_space_view::SpaceViewBlueprint;
 use re_ui::ReUi;
 use re_viewer_context::{
     blueprint_id_to_tile_id, ContainerId, RecommendedSpaceView, ViewerContext,
 };
+use re_viewport_blueprint::{SpaceViewBlueprint, ViewportBlueprint};
 
-use crate::{icon_for_container_kind, ViewportBlueprint};
+use crate::icon_for_container_kind;
 
 #[derive(Default)]
 pub struct AddSpaceViewOrContainerModal {
diff --git a/crates/re_viewport/src/auto_layout.rs b/crates/re_viewport/src/auto_layout.rs
index 8252d57f1b1e..51006d866014 100644
--- a/crates/re_viewport/src/auto_layout.rs
+++ b/crates/re_viewport/src/auto_layout.rs
@@ -9,7 +9,7 @@ use itertools::Itertools as _;
 use re_types::SpaceViewClassIdentifier;
 use re_viewer_context::SpaceViewId;
 
-use re_space_view::SpaceViewBlueprint;
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 #[derive(Clone, Debug)]
 struct SpaceMakeInfo {
diff --git a/crates/re_viewport/src/context_menu/actions/add_entities_to_new_space_view.rs b/crates/re_viewport/src/context_menu/actions/add_entities_to_new_space_view.rs
index ba9e2569fd06..f2f052626b34 100644
--- a/crates/re_viewport/src/context_menu/actions/add_entities_to_new_space_view.rs
+++ b/crates/re_viewport/src/context_menu/actions/add_entities_to_new_space_view.rs
@@ -3,9 +3,10 @@ use itertools::Itertools;
 use nohash_hasher::IntSet;
 
 use re_log_types::{EntityPath, EntityPathFilter, EntityPathRule, RuleEffect};
-use re_space_view::{determine_visualizable_entities, SpaceViewBlueprint};
+use re_space_view::determine_visualizable_entities;
 use re_types::SpaceViewClassIdentifier;
 use re_viewer_context::{Item, RecommendedSpaceView};
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 use crate::context_menu::{ContextMenuAction, ContextMenuContext};
 
diff --git a/crates/re_viewport/src/context_menu/actions/add_space_view.rs b/crates/re_viewport/src/context_menu/actions/add_space_view.rs
index aaef44fe40ea..238a22004ab8 100644
--- a/crates/re_viewport/src/context_menu/actions/add_space_view.rs
+++ b/crates/re_viewport/src/context_menu/actions/add_space_view.rs
@@ -1,7 +1,7 @@
-use re_space_view::SpaceViewBlueprint;
 use re_types::SpaceViewClassIdentifier;
 use re_ui::Icon;
 use re_viewer_context::{ContainerId, Item, RecommendedSpaceView};
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 use crate::context_menu::{ContextMenuAction, ContextMenuContext};
 
diff --git a/crates/re_viewport/src/context_menu/mod.rs b/crates/re_viewport/src/context_menu/mod.rs
index 880d9e7c2ede..6ce6e26029c7 100644
--- a/crates/re_viewport/src/context_menu/mod.rs
+++ b/crates/re_viewport/src/context_menu/mod.rs
@@ -2,8 +2,7 @@ use once_cell::sync::OnceCell;
 
 use re_entity_db::InstancePath;
 use re_viewer_context::{ContainerId, Contents, Item, ItemCollection, SpaceViewId, ViewerContext};
-
-use crate::{ContainerBlueprint, ViewportBlueprint};
+use re_viewport_blueprint::{ContainerBlueprint, ViewportBlueprint};
 
 mod actions;
 mod sub_menu;
diff --git a/crates/re_viewport/src/lib.rs b/crates/re_viewport/src/lib.rs
index 23174859ba26..b75d7fff09a7 100644
--- a/crates/re_viewport/src/lib.rs
+++ b/crates/re_viewport/src/lib.rs
@@ -5,11 +5,8 @@
 // TODO(#3408): remove unwrap()
 #![allow(clippy::unwrap_used)]
 
-pub const VIEWPORT_PATH: &str = "viewport";
-
 mod add_space_view_or_container_modal;
 mod auto_layout;
-mod container;
 mod context_menu;
 mod screenshot;
 mod space_view_entity_picker;
@@ -17,13 +14,10 @@ pub mod space_view_heuristics;
 mod space_view_highlights;
 mod system_execution;
 mod viewport;
-mod viewport_blueprint;
 mod viewport_blueprint_ui;
 
-pub use self::container::ContainerBlueprint;
 pub use self::context_menu::{context_menu_ui_for_item, SelectionUpdateBehavior};
 pub use self::viewport::{Viewport, ViewportState};
-pub use self::viewport_blueprint::ViewportBlueprint;
 pub use self::viewport_blueprint_ui::contents_name_style;
 
 pub mod external {
@@ -43,37 +37,3 @@ pub fn icon_for_container_kind(kind: &egui_tiles::ContainerKind) -> &'static re_
         egui_tiles::ContainerKind::Grid => &re_ui::icons::CONTAINER_GRID,
     }
 }
-
-/// Converts a [`re_types_blueprint::blueprint::components::ContainerKind`] into a [`egui_tiles::ContainerKind`].
-///
-/// Does not implement the `From`/`To` traits because we don't want `re_types_blueprint` to depend
-/// on `egui`, and we cannot do it from here because of orphan rules.
-#[inline]
-pub fn container_kind_to_egui(
-    kind: re_types_blueprint::blueprint::components::ContainerKind,
-) -> egui_tiles::ContainerKind {
-    use re_types_blueprint::blueprint::components::ContainerKind;
-    match kind {
-        ContainerKind::Tabs => egui_tiles::ContainerKind::Tabs,
-        ContainerKind::Horizontal => egui_tiles::ContainerKind::Horizontal,
-        ContainerKind::Vertical => egui_tiles::ContainerKind::Vertical,
-        ContainerKind::Grid => egui_tiles::ContainerKind::Grid,
-    }
-}
-
-/// Converts a [`egui_tiles::ContainerKind`] into a [`re_types_blueprint::blueprint::components::ContainerKind`].
-///
-/// Does not implement the `From`/`To` traits because we don't want `re_types_blueprint` to depend
-/// on `egui`, and we cannot do it from here because of orphan rules.
-#[inline]
-pub fn container_kind_from_egui(
-    kind: egui_tiles::ContainerKind,
-) -> re_types_blueprint::blueprint::components::ContainerKind {
-    use re_types_blueprint::blueprint::components::ContainerKind;
-    match kind {
-        egui_tiles::ContainerKind::Tabs => ContainerKind::Tabs,
-        egui_tiles::ContainerKind::Horizontal => ContainerKind::Horizontal,
-        egui_tiles::ContainerKind::Vertical => ContainerKind::Vertical,
-        egui_tiles::ContainerKind::Grid => ContainerKind::Grid,
-    }
-}
diff --git a/crates/re_viewport/src/screenshot.rs b/crates/re_viewport/src/screenshot.rs
index dec438f1fd45..83f650da4452 100644
--- a/crates/re_viewport/src/screenshot.rs
+++ b/crates/re_viewport/src/screenshot.rs
@@ -1,4 +1,5 @@
-use re_space_view::{ScreenshotMode, SpaceViewBlueprint};
+use re_space_view::ScreenshotMode;
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 pub fn handle_pending_space_view_screenshots(
     space_view: &SpaceViewBlueprint,
diff --git a/crates/re_viewport/src/space_view_entity_picker.rs b/crates/re_viewport/src/space_view_entity_picker.rs
index fe9b9069c969..db313ea386db 100644
--- a/crates/re_viewport/src/space_view_entity_picker.rs
+++ b/crates/re_viewport/src/space_view_entity_picker.rs
@@ -4,10 +4,9 @@ use nohash_hasher::IntMap;
 use re_data_ui::item_ui;
 use re_entity_db::{EntityPath, EntityTree, InstancePath};
 use re_log_types::{EntityPathFilter, EntityPathRule};
-use re_space_view::{determine_visualizable_entities, SpaceViewBlueprint};
+use re_space_view::determine_visualizable_entities;
 use re_viewer_context::{DataQueryResult, SpaceViewId, ViewerContext};
-
-use crate::ViewportBlueprint;
+use re_viewport_blueprint::{SpaceViewBlueprint, ViewportBlueprint};
 
 /// Window for adding/removing entities from a space view.
 ///
diff --git a/crates/re_viewport/src/space_view_heuristics.rs b/crates/re_viewport/src/space_view_heuristics.rs
index 15c79faf7c6d..5185143e0ce9 100644
--- a/crates/re_viewport/src/space_view_heuristics.rs
+++ b/crates/re_viewport/src/space_view_heuristics.rs
@@ -1,6 +1,6 @@
 use re_viewer_context::ViewerContext;
 
-use re_space_view::SpaceViewBlueprint;
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 /// List out all space views we generate by default for the available data.
 ///
diff --git a/crates/re_viewport/src/system_execution.rs b/crates/re_viewport/src/system_execution.rs
index 5fbaf9b3ff9f..89d35a1878ed 100644
--- a/crates/re_viewport/src/system_execution.rs
+++ b/crates/re_viewport/src/system_execution.rs
@@ -11,7 +11,7 @@ use re_viewer_context::{
 };
 
 use crate::space_view_highlights::highlights_for_space_view;
-use re_space_view::SpaceViewBlueprint;
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 pub fn create_and_run_space_view_systems(
     ctx: &ViewerContext<'_>,
diff --git a/crates/re_viewport/src/viewport.rs b/crates/re_viewport/src/viewport.rs
index f10496927945..91085db253b7 100644
--- a/crates/re_viewport/src/viewport.rs
+++ b/crates/re_viewport/src/viewport.rs
@@ -14,13 +14,13 @@ use re_viewer_context::{
     blueprint_id_to_tile_id, ContainerId, Contents, Item, SpaceViewClassRegistry, SpaceViewId,
     SpaceViewState, SystemExecutionOutput, ViewQuery, ViewerContext,
 };
+use re_viewport_blueprint::{TreeAction, ViewportBlueprint};
 
 use crate::screenshot::handle_pending_space_view_screenshots;
 use crate::{
     add_space_view_or_container_modal::AddSpaceViewOrContainerModal, context_menu_ui_for_item,
     icon_for_container_kind, space_view_entity_picker::SpaceViewEntityPicker,
     system_execution::execute_systems_for_all_space_views, SelectionUpdateBehavior,
-    ViewportBlueprint,
 };
 
 // State for each `SpaceView` including both the auto properties and
@@ -90,53 +90,6 @@ impl ViewportState {
     }
 }
 
-/// Mutation actions to perform on the tree at the end of the frame. These messages are sent by the mutation APIs from
-/// [`crate::ViewportBlueprint`].
-#[derive(Clone, Debug)]
-pub enum TreeAction {
-    /// Add a new space view to the provided container (or the root if `None`).
-    AddSpaceView(SpaceViewId, Option<ContainerId>, Option<usize>),
-
-    /// Add a new container of the provided kind to the provided container (or the root if `None`).
-    AddContainer(egui_tiles::ContainerKind, Option<ContainerId>),
-
-    /// Change the kind of a container.
-    SetContainerKind(ContainerId, egui_tiles::ContainerKind),
-
-    /// Ensure the tab for the provided space view is focused (see [`egui_tiles::Tree::make_active`]).
-    FocusTab(SpaceViewId),
-
-    /// Remove a container (recursively) or a space view
-    RemoveContents(Contents),
-
-    /// Simplify the container with the provided options
-    SimplifyContainer(ContainerId, egui_tiles::SimplificationOptions),
-
-    /// Make all column and row shares the same for this container
-    MakeAllChildrenSameSize(ContainerId),
-
-    /// Move some contents to a different container
-    MoveContents {
-        contents_to_move: Contents,
-        target_container: ContainerId,
-        target_position_in_container: usize,
-    },
-
-    /// Move one or more [`Contents`] to a newly created container
-    MoveContentsToNewContainer {
-        contents_to_move: Vec<Contents>,
-        new_container_kind: egui_tiles::ContainerKind,
-        target_container: ContainerId,
-        target_position_in_container: usize,
-    },
-
-    /// Set the container that is currently identified as the drop target of an ongoing drag.
-    ///
-    /// This is used for highlighting the drop target in the UI. Note that the drop target container is reset at every
-    /// frame, so this command must be re-sent every frame as long as a drop target is identified.
-    SetDropTarget(ContainerId),
-}
-
 fn tree_simplification_options() -> egui_tiles::SimplificationOptions {
     egui_tiles::SimplificationOptions {
         prune_empty_tabs: false,
diff --git a/crates/re_viewport/src/viewport_blueprint_ui.rs b/crates/re_viewport/src/viewport_blueprint_ui.rs
index e2a62321049a..6310bc5ccd80 100644
--- a/crates/re_viewport/src/viewport_blueprint_ui.rs
+++ b/crates/re_viewport/src/viewport_blueprint_ui.rs
@@ -5,13 +5,13 @@ use smallvec::SmallVec;
 
 use re_entity_db::InstancePath;
 use re_log_types::EntityPath;
-use re_space_view::SpaceViewBlueprint;
 use re_types::blueprint::components::Visible;
 use re_ui::{drag_and_drop::DropTarget, list_item, ReUi};
 use re_viewer_context::{CollapseScope, Contents, ContentsName, DataResultTree};
 use re_viewer_context::{
     ContainerId, DataQueryResult, DataResultNode, HoverHighlight, Item, SpaceViewId, ViewerContext,
 };
+use re_viewport_blueprint::SpaceViewBlueprint;
 
 use crate::context_menu::context_menu_ui_for_item;
 use crate::{SelectionUpdateBehavior, Viewport};
diff --git a/crates/re_viewport_blueprint/Cargo.toml b/crates/re_viewport_blueprint/Cargo.toml
new file mode 100644
index 000000000000..597eb8eb9ffb
--- /dev/null
+++ b/crates/re_viewport_blueprint/Cargo.toml
@@ -0,0 +1,38 @@
+[package]
+authors.workspace = true
+description = "The central viewport panel of the Rerun viewer."
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+name = "re_viewport_blueprint"
+publish = true
+readme = "README.md"
+repository.workspace = true
+rust-version.workspace = true
+version.workspace = true
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+all-features = true
+
+[dependencies]
+re_data_store.workspace = true
+re_entity_db = { workspace = true, features = ["serde"] }
+re_log_types.workspace = true
+re_log.workspace = true
+re_tracing.workspace = true
+re_types.workspace = true
+re_types_blueprint.workspace = true
+re_types_core.workspace = true
+re_viewer_context.workspace = true
+
+ahash.workspace = true
+egui_tiles.workspace = true
+egui.workspace = true
+itertools.workspace = true
+nohash-hasher.workspace = true
+slotmap.workspace = true
+smallvec.workspace = true
diff --git a/crates/re_viewport_blueprint/README.md b/crates/re_viewport_blueprint/README.md
new file mode 100644
index 000000000000..ee8c229a13c8
--- /dev/null
+++ b/crates/re_viewport_blueprint/README.md
@@ -0,0 +1,10 @@
+# re_viewport_blueprint
+
+Part of the [`rerun`](https://github.com/rerun-io/rerun) family of crates.
+
+[![Latest version](https://img.shields.io/crates/v/re_viewport_blueprint.svg)](https://crates.io/crates/re_viewport_blueprint?speculative-link)
+[![Documentation](https://docs.rs/re_viewport_blueprint/badge.svg)](https://docs.rs/re_viewport_blueprint?speculative-link)
+![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
+![Apache](https://img.shields.io/badge/license-Apache-blue.svg)
+
+The data model describing the layout of the viewport.
diff --git a/crates/re_viewport/src/container.rs b/crates/re_viewport_blueprint/src/container.rs
similarity index 100%
rename from crates/re_viewport/src/container.rs
rename to crates/re_viewport_blueprint/src/container.rs
diff --git a/crates/re_viewport_blueprint/src/lib.rs b/crates/re_viewport_blueprint/src/lib.rs
new file mode 100644
index 000000000000..22b8ae18cfab
--- /dev/null
+++ b/crates/re_viewport_blueprint/src/lib.rs
@@ -0,0 +1,56 @@
+//! Rerun Viewport Blueprint
+//!
+//! This crate provides blueprint (i.e. description) for how to render the viewport.
+
+mod container;
+mod space_view;
+mod space_view_contents;
+mod tree_actions;
+mod view_properties; // TODO(andreas): better name before `sub_archetype` sticks around?
+mod viewport_blueprint;
+
+pub use container::ContainerBlueprint;
+pub use space_view::SpaceViewBlueprint;
+pub use space_view_contents::SpaceViewContents;
+pub use tree_actions::TreeAction;
+pub use view_properties::{
+    edit_blueprint_component, entity_path_for_view_property, get_blueprint_component,
+    query_view_property, query_view_property_or_default, view_property,
+};
+pub use viewport_blueprint::ViewportBlueprint;
+
+pub const VIEWPORT_PATH: &str = "viewport";
+
+/// Converts a [`re_types_blueprint::blueprint::components::ContainerKind`] into a [`egui_tiles::ContainerKind`].
+///
+/// Does not implement the `From`/`To` traits because we don't want `re_types_blueprint` to depend
+/// on `egui`, and we cannot do it from here because of orphan rules.
+#[inline]
+pub fn container_kind_to_egui(
+    kind: re_types_blueprint::blueprint::components::ContainerKind,
+) -> egui_tiles::ContainerKind {
+    use re_types_blueprint::blueprint::components::ContainerKind;
+    match kind {
+        ContainerKind::Tabs => egui_tiles::ContainerKind::Tabs,
+        ContainerKind::Horizontal => egui_tiles::ContainerKind::Horizontal,
+        ContainerKind::Vertical => egui_tiles::ContainerKind::Vertical,
+        ContainerKind::Grid => egui_tiles::ContainerKind::Grid,
+    }
+}
+
+/// Converts a [`egui_tiles::ContainerKind`] into a [`re_types_blueprint::blueprint::components::ContainerKind`].
+///
+/// Does not implement the `From`/`To` traits because we don't want `re_types_blueprint` to depend
+/// on `egui`, and we cannot do it from here because of orphan rules.
+#[inline]
+pub fn container_kind_from_egui(
+    kind: egui_tiles::ContainerKind,
+) -> re_types_blueprint::blueprint::components::ContainerKind {
+    use re_types_blueprint::blueprint::components::ContainerKind;
+    match kind {
+        egui_tiles::ContainerKind::Tabs => ContainerKind::Tabs,
+        egui_tiles::ContainerKind::Horizontal => ContainerKind::Horizontal,
+        egui_tiles::ContainerKind::Vertical => ContainerKind::Vertical,
+        egui_tiles::ContainerKind::Grid => ContainerKind::Grid,
+    }
+}
diff --git a/crates/re_space_view/src/space_view.rs b/crates/re_viewport_blueprint/src/space_view.rs
similarity index 99%
rename from crates/re_space_view/src/space_view.rs
rename to crates/re_viewport_blueprint/src/space_view.rs
index 98f90ac87d58..342771678323 100644
--- a/crates/re_space_view/src/space_view.rs
+++ b/crates/re_viewport_blueprint/src/space_view.rs
@@ -450,7 +450,6 @@ impl SpaceViewBlueprint {
 
 #[cfg(test)]
 mod tests {
-    use crate::data_query::{DataQuery, PropertyResolver};
     use re_entity_db::{EntityDb, EntityProperties, EntityPropertiesComponent};
     use re_log_types::{
         example_components::{MyColor, MyLabel, MyPoint},
diff --git a/crates/re_space_view/src/space_view_contents.rs b/crates/re_viewport_blueprint/src/space_view_contents.rs
similarity index 97%
rename from crates/re_space_view/src/space_view_contents.rs
rename to crates/re_viewport_blueprint/src/space_view_contents.rs
index efdd6c756b4c..1d2816df9e09 100644
--- a/crates/re_space_view/src/space_view_contents.rs
+++ b/crates/re_viewport_blueprint/src/space_view_contents.rs
@@ -20,13 +20,21 @@ use re_viewer_context::{
     SpaceViewClassRegistry, SpaceViewId, ViewerContext, VisualizableEntities,
 };
 
-use crate::{
-    query_view_property, DataQuery, EntityOverrideContext, PropertyResolver, SpaceViewBlueprint,
-};
+use crate::{query_view_property, SpaceViewBlueprint};
+
+pub struct EntityOverrideContext<'a> {
+    pub legacy_space_view_properties: EntityProperties,
 
-/// An implementation of [`DataQuery`] that is built from a [`blueprint_archetypes::SpaceViewContents`].
+    /// Provides auto properties for each entity.
+    pub legacy_auto_properties: &'a EntityPropertyMap,
+
+    /// Query range that data results should fall back to if they don't specify their own.
+    pub default_query_range: QueryRange,
+}
+
+/// Data to be added to a space view, built from a [`blueprint_archetypes::SpaceViewContents`].
 ///
-/// During execution it will walk an [`EntityTree`] and return a [`DataResultTree`]
+/// During execution, it will walk an [`EntityTree`] and return a [`DataResultTree`]
 /// containing any entities that match a [`EntityPathFilter`].
 ///
 /// Note: [`SpaceViewContents`] doesn't implement Clone because it depends on its parent's [`SpaceViewId`]
@@ -233,15 +241,13 @@ impl SpaceViewContents {
         new_entity_path_filter.remove_rule_for(ent_path);
         self.set_entity_path_filter(ctx, &new_entity_path_filter);
     }
-}
 
-impl DataQuery for SpaceViewContents {
     /// Build up the initial [`DataQueryResult`] for this [`SpaceViewContents`]
     ///
     /// Note that this result will not have any resolved [`PropertyOverrides`]. Those can
-    /// be added by separately calling [`PropertyResolver::update_overrides`] on
+    /// be added by separately calling `DataQueryPropertyResolver::update_overrides` on
     /// the result.
-    fn execute_query(
+    pub fn execute_query(
         &self,
         ctx: &re_viewer_context::StoreContext<'_>,
         visualizable_entities_for_visualizer_systems: &PerVisualizer<VisualizableEntities>,
@@ -376,7 +382,7 @@ pub struct DataQueryPropertyResolver<'a> {
 }
 
 impl DataQueryPropertyResolver<'_> {
-    /// Helper function to build the [`EntityOverrideContext`] for this [`DataQuery`]
+    /// Helper function to build the [`EntityOverrideContext`].
     ///
     /// The context is made up of 3 parts:
     ///  - The root properties are build by merging a stack of paths from the Blueprint Tree. This
@@ -601,11 +607,9 @@ impl DataQueryPropertyResolver<'_> {
             }
         }
     }
-}
 
-impl<'a> PropertyResolver for DataQueryPropertyResolver<'a> {
     /// Recursively walk the [`DataResultTree`] and update the [`PropertyOverrides`] for each node.
-    fn update_overrides(
+    pub fn update_overrides(
         &self,
         blueprint: &EntityDb,
         blueprint_query: &LatestAtQuery,
diff --git a/crates/re_viewport_blueprint/src/tree_actions.rs b/crates/re_viewport_blueprint/src/tree_actions.rs
new file mode 100644
index 000000000000..db71f6bec05a
--- /dev/null
+++ b/crates/re_viewport_blueprint/src/tree_actions.rs
@@ -0,0 +1,48 @@
+use re_viewer_context::{ContainerId, Contents, SpaceViewId};
+
+/// Mutation actions to perform on the tree at the end of the frame. These messages are sent by the mutation APIs from
+/// [`crate::ViewportBlueprint`].
+#[derive(Clone, Debug)]
+pub enum TreeAction {
+    /// Add a new space view to the provided container (or the root if `None`).
+    AddSpaceView(SpaceViewId, Option<ContainerId>, Option<usize>),
+
+    /// Add a new container of the provided kind to the provided container (or the root if `None`).
+    AddContainer(egui_tiles::ContainerKind, Option<ContainerId>),
+
+    /// Change the kind of a container.
+    SetContainerKind(ContainerId, egui_tiles::ContainerKind),
+
+    /// Ensure the tab for the provided space view is focused (see [`egui_tiles::Tree::make_active`]).
+    FocusTab(SpaceViewId),
+
+    /// Remove a container (recursively) or a space view
+    RemoveContents(Contents),
+
+    /// Simplify the container with the provided options
+    SimplifyContainer(ContainerId, egui_tiles::SimplificationOptions),
+
+    /// Make all column and row shares the same for this container
+    MakeAllChildrenSameSize(ContainerId),
+
+    /// Move some contents to a different container
+    MoveContents {
+        contents_to_move: Contents,
+        target_container: ContainerId,
+        target_position_in_container: usize,
+    },
+
+    /// Move one or more [`Contents`] to a newly created container
+    MoveContentsToNewContainer {
+        contents_to_move: Vec<Contents>,
+        new_container_kind: egui_tiles::ContainerKind,
+        target_container: ContainerId,
+        target_position_in_container: usize,
+    },
+
+    /// Set the container that is currently identified as the drop target of an ongoing drag.
+    ///
+    /// This is used for highlighting the drop target in the UI. Note that the drop target container is reset at every
+    /// frame, so this command must be re-sent every frame as long as a drop target is identified.
+    SetDropTarget(ContainerId),
+}
diff --git a/crates/re_space_view/src/view_properties.rs b/crates/re_viewport_blueprint/src/view_properties.rs
similarity index 65%
rename from crates/re_space_view/src/view_properties.rs
rename to crates/re_viewport_blueprint/src/view_properties.rs
index 836dd8fcfa6b..6ed3e6fdae17 100644
--- a/crates/re_space_view/src/view_properties.rs
+++ b/crates/re_viewport_blueprint/src/view_properties.rs
@@ -1,17 +1,11 @@
 use re_data_store::LatestAtQuery;
 use re_entity_db::{
     external::re_query::{LatestAtResults, PromiseResult, ToArchetype},
-    EntityDb,
+    EntityDb, EntityTree,
 };
 use re_log_types::EntityPath;
 use re_types::Archetype;
-use re_viewer_context::{
-    external::{
-        re_entity_db::EntityTree,
-        re_ui::{self, list_item},
-    },
-    SpaceViewId, ViewerContext,
-};
+use re_viewer_context::{SpaceViewId, ViewerContext};
 
 pub fn entity_path_for_view_property<T: Archetype>(
     space_view_id: SpaceViewId,
@@ -128,64 +122,3 @@ pub fn edit_blueprint_component<A: re_types::Archetype, C: re_types::Component +
 
     ret
 }
-
-/// Display the UI for editing all components of a blueprint archetype.
-///
-/// Note that this will show default values for components that are null.
-pub fn view_property_ui<A: Archetype>(
-    ctx: &ViewerContext<'_>,
-    space_view_id: SpaceViewId,
-    ui: &mut egui::Ui,
-) {
-    let blueprint_db = ctx.store_context.blueprint;
-    let blueprint_query = ctx.blueprint_query;
-    let blueprint_path = entity_path_for_view_property::<A>(space_view_id, blueprint_db.tree());
-
-    let component_names = A::all_components();
-    let component_results = blueprint_db.latest_at(
-        blueprint_query,
-        &blueprint_path,
-        component_names.iter().copied(),
-    );
-
-    let sub_prop_ui = |re_ui: &re_ui::ReUi, ui: &mut egui::Ui| {
-        for component_name in component_names.as_ref() {
-            if component_name.is_indicator_component() {
-                continue;
-            }
-
-            list_item::ListItem::new(re_ui)
-                .interactive(false)
-                .show_flat(
-                    ui,
-                    // TODO(andreas): Note that we loose the archetype's field name here, instead we label the item with the component name.
-                    list_item::PropertyContent::new(component_name.short_name()).value_fn(
-                        |_, ui, _| {
-                            ctx.component_ui_registry.edit_ui(
-                                ctx,
-                                ui,
-                                re_viewer_context::UiLayout::List,
-                                blueprint_query,
-                                blueprint_db,
-                                &blueprint_path,
-                                &blueprint_path,
-                                component_results.get_or_empty(*component_name),
-                                component_name,
-                                &0.into(),
-                            );
-                        },
-                    ),
-                );
-        }
-    };
-
-    list_item::ListItem::new(ctx.re_ui)
-        .interactive(false)
-        .show_hierarchical_with_children(
-            ui,
-            A::name().full_name(),
-            true,
-            list_item::LabelContent::new(A::name().short_name()),
-            sub_prop_ui,
-        );
-}
diff --git a/crates/re_viewport/src/viewport_blueprint.rs b/crates/re_viewport_blueprint/src/viewport_blueprint.rs
similarity index 99%
rename from crates/re_viewport/src/viewport_blueprint.rs
rename to crates/re_viewport_blueprint/src/viewport_blueprint.rs
index cca809bd8997..f24361de8767 100644
--- a/crates/re_viewport/src/viewport_blueprint.rs
+++ b/crates/re_viewport_blueprint/src/viewport_blueprint.rs
@@ -7,10 +7,10 @@ use nohash_hasher::IntSet;
 use re_types::SpaceViewClassIdentifier;
 use smallvec::SmallVec;
 
+use crate::SpaceViewBlueprint;
 use re_data_store::LatestAtQuery;
 use re_entity_db::external::re_query::PromiseResult;
 use re_entity_db::EntityPath;
-use re_space_view::SpaceViewBlueprint;
 use re_types::blueprint::components::ViewerRecommendationHash;
 use re_types_blueprint::blueprint::components::{
     AutoLayout, AutoSpaceViews, IncludedSpaceView, RootContainer, SpaceViewMaximized,
@@ -19,7 +19,7 @@ use re_viewer_context::{
     blueprint_id_to_tile_id, ContainerId, Contents, Item, SpaceViewId, ViewerContext,
 };
 
-use crate::{container::ContainerBlueprint, viewport::TreeAction, VIEWPORT_PATH};
+use crate::{container::ContainerBlueprint, TreeAction, VIEWPORT_PATH};
 
 // ----------------------------------------------------------------------------
 
@@ -56,7 +56,7 @@ pub struct ViewportBlueprint {
     /// Hashes of all recommended space views the viewer has already added and that should not be added again.
     past_viewer_recommendations: IntSet<ViewerRecommendationHash>,
 
-    /// Channel to pass Blueprint mutation messages back to the [`crate::Viewport`]
+    /// Channel to pass Blueprint mutation messages back to the Viewport.
     tree_action_sender: std::sync::mpsc::Sender<TreeAction>,
 }
 
@@ -201,7 +201,7 @@ impl ViewportBlueprint {
         self.space_views.get_mut(space_view_id)
     }
 
-    pub(crate) fn remove_space_view(&self, space_view_id: &SpaceViewId, ctx: &ViewerContext<'_>) {
+    pub fn remove_space_view(&self, space_view_id: &SpaceViewId, ctx: &ViewerContext<'_>) {
         self.mark_user_interaction(ctx);
 
         // Remove the space view from the store