diff --git a/spring-boot-artifacts/README.md b/spring-boot-artifacts/README.md
index 0a3f1b7e60..4025e43a65 100644
--- a/spring-boot-artifacts/README.md
+++ b/spring-boot-artifacts/README.md
@@ -1,7 +1,10 @@
+## Spring Boot Artifacts
+
+This module contains articles about configuring the Spring Boot build process.
+
 ### Relevant Articles:			
  - [Spring Boot Dependency Management with a Custom Parent](https://www.baeldung.com/spring-boot-dependency-management-custom-parent)
  - [Create a Fat Jar App with Spring Boot](https://www.baeldung.com/deployable-fat-jar-spring-boot)
  - [Intro to Spring Boot Starters](https://www.baeldung.com/spring-boot-starters)
- - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
  - [Introduction to WebJars](https://www.baeldung.com/maven-webjars)
  - [A Quick Guide to Maven Wrapper](https://www.baeldung.com/maven-wrapper) 
\ No newline at end of file
diff --git a/spring-boot-artifacts/pom.xml b/spring-boot-artifacts/pom.xml
index 756864895d..8301533606 100644
--- a/spring-boot-artifacts/pom.xml
+++ b/spring-boot-artifacts/pom.xml
@@ -101,15 +101,6 @@
 
     <build>
         <finalName>${project.artifactId}</finalName>
-        <resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<excludes>
-					<exclude>**/conf.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -126,28 +117,28 @@
                 </executions>
             </plugin>
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.18</version>
-				<executions>
-					<!-- Invokes both the integration-test and the verify goals of the Failsafe 
-						Maven plugin -->
-					<execution>
-						<id>integration-tests</id>
-						<goals>
-							<goal>integration-test</goal>
-							<goal>verify</goal>
-						</goals>
-						<configuration>
-							<!-- Skips integration tests if the value of skip.integration.tests 
-								property is true -->
-								<includes>
-										<include>**/ExternalPropertyFileLoaderIntegrationTest.java</include>
-									</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.18</version>
+                <executions>
+                    <!-- Invokes both the integration-test and the verify goals of the Failsafe 
+                        Maven plugin -->
+                    <execution>
+                        <id>integration-tests</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Skips integration tests if the value of skip.integration.tests 
+                                property is true -->
+                                <includes>
+                                        <include>**/ExternalPropertyFileLoaderIntegrationTest.java</include>
+                                    </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/spring-boot-deployment/README.md b/spring-boot-deployment/README.md
index 90c5d05e33..6171decf2d 100644
--- a/spring-boot-deployment/README.md
+++ b/spring-boot-deployment/README.md
@@ -1,5 +1,9 @@
+## Spring Boot Deployment
+
+This module contains articles about deployment of a Spring Boot Application
+
 ### Relevant Articles:			
  - [Deploy a Spring Boot WAR into a Tomcat Server](https://www.baeldung.com/spring-boot-war-tomcat-deploy)
  - [Spring Boot Console Application](https://www.baeldung.com/spring-boot-console-app)
  - [How to Configure Spring Boot Tomcat](https://www.baeldung.com/spring-boot-configure-tomcat)
- - [Spring Boot Embedded Tomcat Logs](https://www.baeldung.com/spring-boot-embedded-tomcat-logs)
+ - [Comparing Embedded Servlet Containers in Spring Boot](https://www.baeldung.com/spring-boot-servlet-containers)
\ No newline at end of file
diff --git a/spring-boot-deployment/pom.xml b/spring-boot-deployment/pom.xml
index 6802452ddf..69a54fd482 100644
--- a/spring-boot-deployment/pom.xml
+++ b/spring-boot-deployment/pom.xml
@@ -102,14 +102,14 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<excludes>
-					<exclude>**/conf.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/conf.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -126,28 +126,28 @@
                 </executions>
             </plugin>
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.18</version>
-				<executions>
-					<!-- Invokes both the integration-test and the verify goals of the Failsafe 
-						Maven plugin -->
-					<execution>
-						<id>integration-tests</id>
-						<goals>
-							<goal>integration-test</goal>
-							<goal>verify</goal>
-						</goals>
-						<configuration>
-							<!-- Skips integration tests if the value of skip.integration.tests 
-								property is true -->
-								<includes>
-										<include>**/ExternalPropertyFileLoaderIntegrationTest.java</include>
-									</includes>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.18</version>
+                <executions>
+                    <!-- Invokes both the integration-test and the verify goals of the Failsafe 
+                        Maven plugin -->
+                    <execution>
+                        <id>integration-tests</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <!-- Skips integration tests if the value of skip.integration.tests 
+                                property is true -->
+                                <includes>
+                                        <include>**/ExternalPropertyFileLoaderIntegrationTest.java</include>
+                                    </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/spring-boot-runtime/src/main/java/com/baeldung/compare/ComparisonApplication.java b/spring-boot-deployment/src/main/java/com/baeldung/compare/ComparisonApplication.java
similarity index 100%
rename from spring-boot-runtime/src/main/java/com/baeldung/compare/ComparisonApplication.java
rename to spring-boot-deployment/src/main/java/com/baeldung/compare/ComparisonApplication.java
diff --git a/spring-boot-runtime/src/main/java/com/baeldung/compare/StartupEventHandler.java b/spring-boot-deployment/src/main/java/com/baeldung/compare/StartupEventHandler.java
similarity index 100%
rename from spring-boot-runtime/src/main/java/com/baeldung/compare/StartupEventHandler.java
rename to spring-boot-deployment/src/main/java/com/baeldung/compare/StartupEventHandler.java
diff --git a/spring-boot-deployment/src/main/resources/application.properties b/spring-boot-deployment/src/main/resources/application.properties
index 709574239b..27b7915cff 100644
--- a/spring-boot-deployment/src/main/resources/application.properties
+++ b/spring-boot-deployment/src/main/resources/application.properties
@@ -1 +1,7 @@
-spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
+management.endpoints.web.exposure.include=*
+management.metrics.enable.root=true
+management.metrics.enable.jvm=true
+management.endpoint.restart.enabled=true
+spring.datasource.jmx-enabled=false
+spring.main.allow-bean-definition-overriding=true
+management.endpoint.shutdown.enabled=true
\ No newline at end of file
diff --git a/spring-boot-environment/README.md b/spring-boot-environment/README.md
index 57cf8b2461..e916c503bc 100644
--- a/spring-boot-environment/README.md
+++ b/spring-boot-environment/README.md
@@ -1,2 +1,7 @@
+## Spring Boot Environment
+
+This module contains articles about configuring the Spring Boot `Environment`
+
 ### Relevant Articles:			
  - [EnvironmentPostProcessor in Spring Boot](https://www.baeldung.com/spring-boot-environmentpostprocessor)
+ - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar)
\ No newline at end of file
diff --git a/spring-boot-environment/pom.xml b/spring-boot-environment/pom.xml
index a957dcde1b..4e4a363fee 100644
--- a/spring-boot-environment/pom.xml
+++ b/spring-boot-environment/pom.xml
@@ -90,14 +90,14 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<excludes>
-					<exclude>**/conf.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/conf.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
 
     <profiles>
diff --git a/spring-boot-artifacts/src/main/java/com/baeldung/properties/ConfProperties.java b/spring-boot-environment/src/main/java/com/baeldung/properties/ConfProperties.java
similarity index 100%
rename from spring-boot-artifacts/src/main/java/com/baeldung/properties/ConfProperties.java
rename to spring-boot-environment/src/main/java/com/baeldung/properties/ConfProperties.java
diff --git a/spring-boot-artifacts/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java b/spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
similarity index 100%
rename from spring-boot-artifacts/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
rename to spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
diff --git a/spring-boot-artifacts/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java b/spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java
similarity index 100%
rename from spring-boot-artifacts/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java
rename to spring-boot-environment/src/main/java/com/baeldung/properties/ExternalPropertyFileLoader.java
diff --git a/spring-boot-artifacts/src/main/resources/external/conf.properties b/spring-boot-environment/src/main/resources/external/conf.properties
similarity index 100%
rename from spring-boot-artifacts/src/main/resources/external/conf.properties
rename to spring-boot-environment/src/main/resources/external/conf.properties
diff --git a/spring-boot-artifacts/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java b/spring-boot-environment/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java
similarity index 100%
rename from spring-boot-artifacts/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java
rename to spring-boot-environment/src/test/java/com/baeldung/properties/ExternalPropertyFileLoaderIntegrationTest.java
diff --git a/spring-boot-runtime/README.md b/spring-boot-runtime/README.md
index f9ca12c605..d3dc19493d 100644
--- a/spring-boot-runtime/README.md
+++ b/spring-boot-runtime/README.md
@@ -1,6 +1,10 @@
+## Spring Boot Runtime
+
+This module contains articles about administering a Spring Boot runtime
+
 ### Relevant Articles:									
  - [Shutdown a Spring Boot Application](https://www.baeldung.com/spring-boot-shutdown)
- - [Comparing Embedded Servlet Containers in Spring Boot](https://www.baeldung.com/spring-boot-servlet-containers)
  - [Programmatically Restarting a Spring Boot Application](https://www.baeldung.com/java-restart-spring-boot-app)
  - [Logging HTTP Requests with Spring Boot Actuator HTTP Tracing](https://www.baeldung.com/spring-boot-actuator-http)
- - [How to Disable Console Logging in Spring Boot](https://www.baeldung.com/spring-boot-disable-console-logging)
\ No newline at end of file
+ - [How to Disable Console Logging in Spring Boot](https://www.baeldung.com/spring-boot-disable-console-logging)
+ - [Spring Boot Embedded Tomcat Logs](https://www.baeldung.com/spring-boot-embedded-tomcat-logs) 
\ No newline at end of file
diff --git a/spring-boot-runtime/pom.xml b/spring-boot-runtime/pom.xml
index eab8ca3cc2..dca9b47410 100644
--- a/spring-boot-runtime/pom.xml
+++ b/spring-boot-runtime/pom.xml
@@ -100,14 +100,14 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-				<excludes>
-					<exclude>**/conf.properties</exclude>
-				</excludes>
-			</resource>
-		</resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>**/conf.properties</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
 
     <profiles>
diff --git a/spring-boot-deployment/src/main/resources/application-tomcat.properties b/spring-boot-runtime/src/main/resources/application-tomcat.properties
similarity index 100%
rename from spring-boot-deployment/src/main/resources/application-tomcat.properties
rename to spring-boot-runtime/src/main/resources/application-tomcat.properties