diff --git a/metricflow/dataflow/builder/node_data_set.py b/metricflow/dataflow/builder/node_data_set.py
index 2f1b5b5b5c..45719082c6 100644
--- a/metricflow/dataflow/builder/node_data_set.py
+++ b/metricflow/dataflow/builder/node_data_set.py
@@ -5,9 +5,9 @@
 from metricflow.dataflow.dataflow_plan import (
     DataflowPlanNode,
 )
+from metricflow.dataset.sql_dataset import SqlDataSet
 from metricflow.model.semantic_manifest_lookup import SemanticManifestLookup
 from metricflow.plan_conversion.dataflow_to_sql import DataflowToSqlQueryPlanConverter
-from metricflow.plan_conversion.sql_dataset import SqlDataSet
 from metricflow.specs.column_assoc import ColumnAssociationResolver
 
 
diff --git a/metricflow/dataflow/builder/node_evaluator.py b/metricflow/dataflow/builder/node_evaluator.py
index 8e09e30c95..5ab12bed9f 100644
--- a/metricflow/dataflow/builder/node_evaluator.py
+++ b/metricflow/dataflow/builder/node_evaluator.py
@@ -32,10 +32,10 @@
     PartitionTimeDimensionJoinDescription,
     ValidityWindowJoinDescription,
 )
+from metricflow.dataset.sql_dataset import SqlDataSet
 from metricflow.instances import InstanceSet
 from metricflow.model.semantics.semantic_model_join_evaluator import SemanticModelJoinEvaluator
 from metricflow.plan_conversion.instance_converters import CreateValidityWindowJoinDescription
-from metricflow.plan_conversion.sql_dataset import SqlDataSet
 from metricflow.protocols.semantics import SemanticModelAccessor
 from metricflow.specs.specs import (
     LinkableInstanceSpec,
diff --git a/metricflow/dataflow/dataflow_plan.py b/metricflow/dataflow/dataflow_plan.py
index a7dde8ac62..89aef6c18c 100644
--- a/metricflow/dataflow/dataflow_plan.py
+++ b/metricflow/dataflow/dataflow_plan.py
@@ -38,8 +38,8 @@
     PartitionTimeDimensionJoinDescription,
 )
 from metricflow.dataflow.sql_table import SqlTable
+from metricflow.dataset.sql_dataset import SqlDataSet
 from metricflow.filters.time_constraint import TimeRangeConstraint
-from metricflow.plan_conversion.sql_dataset import SqlDataSet
 from metricflow.specs.specs import (
     InstanceSpecSet,
     LinklessEntitySpec,
diff --git a/metricflow/dataset/semantic_model_adapter.py b/metricflow/dataset/semantic_model_adapter.py
index 20d54db2cf..0d857c44c5 100644
--- a/metricflow/dataset/semantic_model_adapter.py
+++ b/metricflow/dataset/semantic_model_adapter.py
@@ -2,8 +2,8 @@
 
 from dbt_semantic_interfaces.references import SemanticModelReference
 
+from metricflow.dataset.sql_dataset import SqlDataSet
 from metricflow.instances import InstanceSet
-from metricflow.plan_conversion.sql_dataset import SqlDataSet
 from metricflow.sql.sql_plan import SqlSelectStatementNode
 
 
diff --git a/metricflow/plan_conversion/sql_dataset.py b/metricflow/dataset/sql_dataset.py
similarity index 100%
rename from metricflow/plan_conversion/sql_dataset.py
rename to metricflow/dataset/sql_dataset.py
diff --git a/metricflow/plan_conversion/dataflow_to_sql.py b/metricflow/plan_conversion/dataflow_to_sql.py
index 74d0249f18..27b6efe4e1 100644
--- a/metricflow/plan_conversion/dataflow_to_sql.py
+++ b/metricflow/plan_conversion/dataflow_to_sql.py
@@ -33,6 +33,7 @@
     WriteToResultTableNode,
 )
 from metricflow.dataset.dataset import DataSet
+from metricflow.dataset.sql_dataset import SqlDataSet
 from metricflow.filters.time_constraint import TimeRangeConstraint
 from metricflow.instances import (
     InstanceSet,
@@ -62,7 +63,6 @@
     CreateSelectCoalescedColumnsForLinkableSpecs,
     SelectOnlyLinkableSpecs,
 )
-from metricflow.plan_conversion.sql_dataset import SqlDataSet
 from metricflow.plan_conversion.sql_join_builder import (
     AnnotatedSqlDataSet,
     ColumnEqualityDescription,
diff --git a/metricflow/plan_conversion/sql_join_builder.py b/metricflow/plan_conversion/sql_join_builder.py
index 39d06142b5..92ca575721 100644
--- a/metricflow/plan_conversion/sql_join_builder.py
+++ b/metricflow/plan_conversion/sql_join_builder.py
@@ -4,7 +4,7 @@
 from typing import List, Optional, Sequence, Tuple
 
 from metricflow.dataflow.dataflow_plan import JoinDescription, JoinOverTimeRangeNode, JoinToTimeSpineNode
-from metricflow.plan_conversion.sql_dataset import SqlDataSet
+from metricflow.dataset.sql_dataset import SqlDataSet
 from metricflow.plan_conversion.sql_expression_builders import make_coalesced_expr
 from metricflow.sql.sql_exprs import (
     SqlColumnReference,
diff --git a/metricflow/test/dataflow/builder/test_node_data_set.py b/metricflow/test/dataflow/builder/test_node_data_set.py
index 11bf8de279..f9f696211a 100644
--- a/metricflow/test/dataflow/builder/test_node_data_set.py
+++ b/metricflow/test/dataflow/builder/test_node_data_set.py
@@ -9,13 +9,13 @@
 from metricflow.dataflow.builder.node_data_set import DataflowPlanNodeOutputDataSetResolver
 from metricflow.dataflow.dataflow_plan import JoinDescription, JoinToBaseOutputNode, ReadSqlSourceNode
 from metricflow.dataflow.sql_table import SqlTable
+from metricflow.dataset.sql_dataset import SqlDataSet
 from metricflow.instances import (
     InstanceSet,
     MeasureInstance,
 )
 from metricflow.model.semantic_manifest_lookup import SemanticManifestLookup
 from metricflow.plan_conversion.column_resolver import DunderColumnAssociationResolver
-from metricflow.plan_conversion.sql_dataset import SqlDataSet
 from metricflow.plan_conversion.time_spine import TimeSpineSource
 from metricflow.specs.column_assoc import ColumnAssociation, SingleColumnCorrelationKey
 from metricflow.specs.specs import (