diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolver.java
similarity index 96%
rename from spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolver.java
rename to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolver.java
index 4ed4a7ea41..b7945f5abf 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolver.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolver.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.context;
+package org.springframework.boot.web.servlet.context;
 
 import org.springframework.boot.io.ApplicationResourceLoader;
 import org.springframework.boot.io.ApplicationResourceLoader.FilePathResolver;
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
index 44b0c8c1bb..c1cf664815 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories
@@ -109,5 +109,5 @@ org.springframework.boot.io.Base64ProtocolResolver
 # Resource File Path Resolvers
 org.springframework.boot.io.ApplicationResourceLoader$FilePathResolver=\
 org.springframework.boot.io.ClassPathResourceFilePathResolver,\
-org.springframework.boot.web.context.ServletContextResourceFilePathResolver,\
-org.springframework.boot.web.reactive.context.FilteredReactiveWebContextResourceFilePathResolver
+org.springframework.boot.web.reactive.context.FilteredReactiveWebContextResourceFilePathResolver,\
+org.springframework.boot.web.servlet.context.ServletContextResourceFilePathResolver
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolverIntegrationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolverIntegrationTests.java
similarity index 97%
rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolverIntegrationTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolverIntegrationTests.java
index e4be832274..ab110a6068 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolverIntegrationTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolverIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.context;
+package org.springframework.boot.web.servlet.context;
 
 import java.io.File;