diff --git a/weave/trace/feedback.py b/weave/trace/feedback.py
index 5f911ed4e39..01103f82d02 100644
--- a/weave/trace/feedback.py
+++ b/weave/trace/feedback.py
@@ -5,11 +5,11 @@
 
 from rich.table import Table
 
-from weave import rich_pydantic_util
 from weave.client_context import weave_client as weave_client_context
-from weave.refs import Refs
-from weave.rich_container import AbstractRichContainer
+from weave.trace import rich_pydantic_util
 from weave.trace.refs import parse_uri
+from weave.trace.rich_container import AbstractRichContainer
+from weave.trace.rich_refs import Refs
 from weave.trace_server import trace_server_interface as tsi
 from weave.trace_server.interface.query import Query
 
diff --git a/weave/rich_container.py b/weave/trace/rich_container.py
similarity index 97%
rename from weave/rich_container.py
rename to weave/trace/rich_container.py
index 626e290a449..a8a9565faf1 100644
--- a/weave/rich_container.py
+++ b/weave/trace/rich_container.py
@@ -3,7 +3,7 @@
 
 from rich.table import Table
 
-from weave import rich_pydantic_util
+from weave.trace import rich_pydantic_util
 
 T = TypeVar("T")
 
diff --git a/weave/rich_pydantic_util.py b/weave/trace/rich_pydantic_util.py
similarity index 98%
rename from weave/rich_pydantic_util.py
rename to weave/trace/rich_pydantic_util.py
index 33114d9b92a..1c2c1474ef7 100644
--- a/weave/rich_pydantic_util.py
+++ b/weave/trace/rich_pydantic_util.py
@@ -6,7 +6,7 @@
 from rich.console import Console
 from rich.table import Table
 
-from . import util
+from .. import util
 
 
 def dict_to_table(d: dict[str, Any]) -> Table:
diff --git a/weave/refs.py b/weave/trace/rich_refs.py
similarity index 95%
rename from weave/refs.py
rename to weave/trace/rich_refs.py
index af6e858ffe2..c72e07f4227 100644
--- a/weave/refs.py
+++ b/weave/trace/rich_refs.py
@@ -5,8 +5,8 @@
 from rich.table import Table
 
 from weave.client_context import weave_client as weave_client_context
-from weave.rich_container import AbstractRichContainer
 from weave.trace.refs import AnyRef, CallRef, parse_uri
+from weave.trace.rich_container import AbstractRichContainer
 from weave.trace.vals import WeaveObject