diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java
similarity index 99%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java
index ec20b259af..e522ee1ca4 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializer.java
+++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap;
+package org.springframework.bootstrap.context.initializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
similarity index 98%
rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializer.java
rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
index 86576b9b37..eb4c6ca6a8 100644
--- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializer.java
+++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap;
+package org.springframework.bootstrap.context.initializer;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/spring-bootstrap/src/main/resources/META-INF/spring.factories b/spring-bootstrap/src/main/resources/META-INF/spring.factories
index cbadd2cc47..f724eb08f6 100644
--- a/spring-bootstrap/src/main/resources/META-INF/spring.factories
+++ b/spring-bootstrap/src/main/resources/META-INF/spring.factories
@@ -8,5 +8,5 @@ org.springframework.bootstrap.autoconfigure.web.EmbeddedJettyAutoConfiguration,\
 org.springframework.bootstrap.autoconfigure.web.EmbeddedTomcatAutoConfiguration,\
 org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration
 org.springframework.context.ApplicationContextInitializer=\
-org.springframework.bootstrap.ConfigFileApplicationContextInitializer,\
-org.springframework.bootstrap.EnvironmentDelegateApplicationContextInitializer
\ No newline at end of file
+org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer
\ No newline at end of file
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java
similarity index 96%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializerTests.java
rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java
index 6f149757bf..c80d70bec5 100644
--- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializerTests.java
+++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap;
+package org.springframework.bootstrap.context.initializer;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
+import org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.SimpleCommandLinePropertySource;
diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
similarity index 97%
rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializerTest.java
rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
index a627cbb5b0..47cbe3cd16 100644
--- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializerTest.java
+++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap;
+package org.springframework.bootstrap.context.initializer;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;