diff --git a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/ErrorHandlingBootApplication.java b/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/ErrorHandlingBootApplication.java
deleted file mode 100644
index 0885ecbbf7..0000000000
--- a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/ErrorHandlingBootApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.baeldung.errorhandling.boot;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.PropertySource;
-
-@SpringBootApplication
-@PropertySource("errorhandling-application.properties")
-public class ErrorHandlingBootApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(ErrorHandlingBootApplication.class, args);
-    }
-
-}
diff --git a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/configurations/MyCustomErrorAttributes.java b/spring-boot-rest/src/main/java/com/baeldung/web/config/MyCustomErrorAttributes.java
similarity index 93%
rename from spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/configurations/MyCustomErrorAttributes.java
rename to spring-boot-rest/src/main/java/com/baeldung/web/config/MyCustomErrorAttributes.java
index e2c62cb907..1948d5552f 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/configurations/MyCustomErrorAttributes.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/web/config/MyCustomErrorAttributes.java
@@ -1,4 +1,4 @@
-package com.baeldung.errorhandling.boot.configurations;
+package com.baeldung.web.config;
 
 import java.util.Map;
 
diff --git a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/configurations/MyErrorController.java b/spring-boot-rest/src/main/java/com/baeldung/web/config/MyErrorController.java
similarity index 95%
rename from spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/configurations/MyErrorController.java
rename to spring-boot-rest/src/main/java/com/baeldung/web/config/MyErrorController.java
index 427a0b43d7..e3716ec113 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/configurations/MyErrorController.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/web/config/MyErrorController.java
@@ -1,4 +1,4 @@
-package com.baeldung.errorhandling.boot.configurations;
+package com.baeldung.web.config;
 
 import java.util.Map;
 
diff --git a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/web/FaultyRestController.java b/spring-boot-rest/src/main/java/com/baeldung/web/controller/FaultyRestController.java
similarity index 73%
rename from spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/web/FaultyRestController.java
rename to spring-boot-rest/src/main/java/com/baeldung/web/controller/FaultyRestController.java
index e56e395754..bf7b7a5f99 100644
--- a/spring-boot-rest/src/main/java/com/baeldung/errorhandling/boot/web/FaultyRestController.java
+++ b/spring-boot-rest/src/main/java/com/baeldung/web/controller/FaultyRestController.java
@@ -1,4 +1,4 @@
-package com.baeldung.errorhandling.boot.web;
+package com.baeldung.web.controller;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,7 +9,7 @@ public class FaultyRestController {
     
     @GetMapping("/exception")
     public ResponseEntity<Void> requestWithException() {
-        throw new NullPointerException("Error in the faulty controller!");
+        throw new RuntimeException("Error in the faulty controller!");
     }
 
 }
diff --git a/spring-boot-rest/src/main/resources/application.properties b/spring-boot-rest/src/main/resources/application.properties
index e69de29bb2..e65440e2b9 100644
--- a/spring-boot-rest/src/main/resources/application.properties
+++ b/spring-boot-rest/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+### Spring Boot default error handling configurations
+#server.error.whitelabel.enabled=false
+#server.error.include-stacktrace=always
\ No newline at end of file
diff --git a/spring-boot-rest/src/main/resources/errorhandling-application.properties b/spring-boot-rest/src/main/resources/errorhandling-application.properties
deleted file mode 100644
index 994c517163..0000000000
--- a/spring-boot-rest/src/main/resources/errorhandling-application.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#server.error.whitelabel.enabled=false
-#server.error.include-stacktrace=always
\ No newline at end of file
diff --git a/spring-boot-rest/src/test/java/com/baeldung/errorhandling/boot/ErrorHandlingLiveTest.java b/spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java
similarity index 98%
rename from spring-boot-rest/src/test/java/com/baeldung/errorhandling/boot/ErrorHandlingLiveTest.java
rename to spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java
index e587b67fcf..ea1b6ab227 100644
--- a/spring-boot-rest/src/test/java/com/baeldung/errorhandling/boot/ErrorHandlingLiveTest.java
+++ b/spring-boot-rest/src/test/java/com/baeldung/web/error/ErrorHandlingLiveTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.errorhandling.boot;
+package com.baeldung.web.error;
 
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;