diff --git a/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java b/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java
index 31c43a53530b8..a4c018af42343 100644
--- a/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java
+++ b/core/trino-main/src/main/java/io/trino/execution/SqlQueryExecution.java
@@ -24,10 +24,10 @@
 import io.trino.cost.StatsCalculator;
 import io.trino.execution.QueryPreparer.PreparedQuery;
 import io.trino.execution.StateMachine.StateChangeListener;
-import io.trino.execution.scheduler.ExecutionPolicy;
 import io.trino.execution.scheduler.NodeScheduler;
 import io.trino.execution.scheduler.SplitSchedulerStats;
 import io.trino.execution.scheduler.SqlQueryScheduler;
+import io.trino.execution.scheduler.policy.ExecutionPolicy;
 import io.trino.execution.warnings.WarningCollector;
 import io.trino.failuredetector.FailureDetector;
 import io.trino.memory.VersionedMemoryPoolId;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java
index 40e845586dc2c..a547232cf83ff 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/SqlQueryScheduler.java
@@ -46,6 +46,8 @@
 import io.trino.execution.TaskId;
 import io.trino.execution.TaskManager;
 import io.trino.execution.TaskStatus;
+import io.trino.execution.scheduler.policy.ExecutionPolicy;
+import io.trino.execution.scheduler.policy.ExecutionSchedule;
 import io.trino.failuredetector.FailureDetector;
 import io.trino.metadata.InternalNode;
 import io.trino.metadata.Metadata;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/AllAtOnceExecutionPolicy.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/AllAtOnceExecutionPolicy.java
similarity index 88%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/AllAtOnceExecutionPolicy.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/policy/AllAtOnceExecutionPolicy.java
index c12272190cfed..9687892424c58 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/AllAtOnceExecutionPolicy.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/AllAtOnceExecutionPolicy.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Collection;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/AllAtOnceExecutionSchedule.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/AllAtOnceExecutionSchedule.java
similarity index 98%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/AllAtOnceExecutionSchedule.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/policy/AllAtOnceExecutionSchedule.java
index ff67f1938c31f..a42cd198064b5 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/AllAtOnceExecutionSchedule.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/AllAtOnceExecutionSchedule.java
@@ -11,12 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
+import io.trino.execution.scheduler.PipelinedStageExecution;
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.planner.plan.IndexJoinNode;
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/ExecutionPolicy.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/ExecutionPolicy.java
similarity index 87%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/ExecutionPolicy.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/policy/ExecutionPolicy.java
index 6c7c2b7bbc4b2..2020e9d714372 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ExecutionPolicy.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/ExecutionPolicy.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Collection;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/ExecutionSchedule.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/ExecutionSchedule.java
similarity index 86%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/ExecutionSchedule.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/policy/ExecutionSchedule.java
index 221f975570a05..03bde1eedcdec 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/ExecutionSchedule.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/ExecutionSchedule.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Set;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/PhasedExecutionPolicy.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionPolicy.java
similarity index 88%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/PhasedExecutionPolicy.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionPolicy.java
index 626f7e34d4f2a..86f7f0b5c89dc 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PhasedExecutionPolicy.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionPolicy.java
@@ -11,7 +11,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
+
+import io.trino.execution.scheduler.PipelinedStageExecution;
 
 import java.util.Collection;
 
diff --git a/core/trino-main/src/main/java/io/trino/execution/scheduler/PhasedExecutionSchedule.java b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionSchedule.java
similarity index 99%
rename from core/trino-main/src/main/java/io/trino/execution/scheduler/PhasedExecutionSchedule.java
rename to core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionSchedule.java
index fa0025305241e..a42c1b597a226 100644
--- a/core/trino-main/src/main/java/io/trino/execution/scheduler/PhasedExecutionSchedule.java
+++ b/core/trino-main/src/main/java/io/trino/execution/scheduler/policy/PhasedExecutionSchedule.java
@@ -11,11 +11,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import io.trino.execution.scheduler.PipelinedStageExecution;
 import io.trino.sql.planner.PlanFragment;
 import io.trino.sql.planner.plan.ExchangeNode;
 import io.trino.sql.planner.plan.IndexJoinNode;
diff --git a/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java b/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
index d4a58e0d227aa..d91d2055c58e3 100644
--- a/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
+++ b/core/trino-main/src/main/java/io/trino/server/CoordinatorModule.java
@@ -60,10 +60,10 @@
 import io.trino.execution.resourcegroups.InternalResourceGroupManager;
 import io.trino.execution.resourcegroups.LegacyResourceGroupConfigurationManager;
 import io.trino.execution.resourcegroups.ResourceGroupManager;
-import io.trino.execution.scheduler.AllAtOnceExecutionPolicy;
-import io.trino.execution.scheduler.ExecutionPolicy;
-import io.trino.execution.scheduler.PhasedExecutionPolicy;
 import io.trino.execution.scheduler.SplitSchedulerStats;
+import io.trino.execution.scheduler.policy.AllAtOnceExecutionPolicy;
+import io.trino.execution.scheduler.policy.ExecutionPolicy;
+import io.trino.execution.scheduler.policy.PhasedExecutionPolicy;
 import io.trino.failuredetector.FailureDetectorModule;
 import io.trino.memory.ClusterMemoryManager;
 import io.trino.memory.ForMemoryManager;
diff --git a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestPhasedExecutionSchedule.java b/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/TestPhasedExecutionSchedule.java
similarity index 99%
rename from core/trino-main/src/test/java/io/trino/execution/scheduler/TestPhasedExecutionSchedule.java
rename to core/trino-main/src/test/java/io/trino/execution/scheduler/policy/TestPhasedExecutionSchedule.java
index efc82be346c07..02fdba7a73357 100644
--- a/core/trino-main/src/test/java/io/trino/execution/scheduler/TestPhasedExecutionSchedule.java
+++ b/core/trino-main/src/test/java/io/trino/execution/scheduler/policy/TestPhasedExecutionSchedule.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.execution.scheduler;
+package io.trino.execution.scheduler.policy;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;