diff --git a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java
index 8300ca52..fe24b341 100644
--- a/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java
+++ b/graphql-spring-boot-starter/src/main/java/org/springframework/graphql/boot/GraphQLAutoConfiguration.java
@@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ResourceLoader;
-import org.springframework.graphql.DataFetcherExceptionResolver;
+import org.springframework.graphql.execution.DataFetcherExceptionResolver;
 import org.springframework.graphql.execution.GraphQLSource;
 
 @Configuration
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/DataFetcherExceptionResolver.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/DataFetcherExceptionResolver.java
similarity index 97%
rename from spring-graphql/src/main/java/org/springframework/graphql/DataFetcherExceptionResolver.java
rename to spring-graphql/src/main/java/org/springframework/graphql/execution/DataFetcherExceptionResolver.java
index 3aa41f1d..c053032c 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/DataFetcherExceptionResolver.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/DataFetcherExceptionResolver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql;
+package org.springframework.graphql.execution;
 
 import java.util.List;
 
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQLSourceBuilder.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQLSourceBuilder.java
index 1cebe9e8..4e079b40 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQLSourceBuilder.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultGraphQLSourceBuilder.java
@@ -33,7 +33,6 @@ import graphql.schema.idl.SchemaParser;
 import graphql.schema.idl.TypeDefinitionRegistry;
 
 import org.springframework.core.io.Resource;
-import org.springframework.graphql.DataFetcherExceptionResolver;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/ErrorType.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/ErrorType.java
similarity index 97%
rename from spring-graphql/src/main/java/org/springframework/graphql/ErrorType.java
rename to spring-graphql/src/main/java/org/springframework/graphql/execution/ErrorType.java
index ea59b638..3887b0bf 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/ErrorType.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/ErrorType.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.graphql;
+package org.springframework.graphql.execution;
 
 import graphql.ErrorClassification;
 
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandler.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandler.java
index 6a12744f..4cf3f4b8 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandler.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandler.java
@@ -25,8 +25,6 @@ import graphql.execution.DataFetcherExceptionHandlerParameters;
 import graphql.execution.DataFetcherExceptionHandlerResult;
 import graphql.schema.DataFetchingEnvironment;
 
-import org.springframework.graphql.DataFetcherExceptionResolver;
-import org.springframework.graphql.ErrorType;
 import org.springframework.util.Assert;
 
 /**
diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQLSource.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQLSource.java
index 764e4e17..bad271d5 100644
--- a/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQLSource.java
+++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/GraphQLSource.java
@@ -27,7 +27,6 @@ import graphql.schema.idl.RuntimeWiring;
 import graphql.schema.idl.TypeDefinitionRegistry;
 
 import org.springframework.core.io.Resource;
-import org.springframework.graphql.DataFetcherExceptionResolver;
 
 /**
  * Strategy to resolve the {@link GraphQL} instance to use.
diff --git a/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java b/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java
index d83733f1..b139744c 100644
--- a/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java
+++ b/spring-graphql/src/test/java/org/springframework/graphql/execution/ExceptionResolversExceptionHandlerTests.java
@@ -31,8 +31,6 @@ import graphql.schema.idl.RuntimeWiring;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.core.io.ByteArrayResource;
-import org.springframework.graphql.DataFetcherExceptionResolver;
-import org.springframework.graphql.ErrorType;
 import org.springframework.lang.Nullable;
 
 import static org.assertj.core.api.Assertions.assertThat;