diff --git a/java-strings/src/main/java/com/baeldung/string/AddingNewLineToString.java b/java-strings/src/main/java/com/baeldung/string/newline/AddingNewLineToString.java
similarity index 98%
rename from java-strings/src/main/java/com/baeldung/string/AddingNewLineToString.java
rename to java-strings/src/main/java/com/baeldung/string/newline/AddingNewLineToString.java
index b522f7337b..48b71eed12 100644
--- a/java-strings/src/main/java/com/baeldung/string/AddingNewLineToString.java
+++ b/java-strings/src/main/java/com/baeldung/string/newline/AddingNewLineToString.java
@@ -1,4 +1,4 @@
-package com.baeldung.string;
+package com.baeldung.string.newline;
 
 public class AddingNewLineToString {
 	
diff --git a/spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java b/spring-core/src/test/java/com/baeldung/classpathfileaccess/SpringResourceIntegrationTest.java
similarity index 99%
rename from spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java
rename to spring-core/src/test/java/com/baeldung/classpathfileaccess/SpringResourceIntegrationTest.java
index c7a2984045..b57a64a8c6 100644
--- a/spring-core/src/test/java/com/baeldung/resource/SpringResourceIntegrationTest.java
+++ b/spring-core/src/test/java/com/baeldung/classpathfileaccess/SpringResourceIntegrationTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.resource;
+package com.baeldung.classpathfileaccess;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/exception/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java
similarity index 93%
rename from testing-modules/junit-5-basics/src/test/java/com/baeldung/exception/ExceptionAssertionUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java
index 002aae34a8..1b1c70d824 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/exception/ExceptionAssertionUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/ExceptionAssertionUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.exception;
+package com.baeldung.assertexception;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/ExceptionAssertionUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/migration/junit4/ExceptionAssertionUnitTest.java
similarity index 91%
rename from testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/ExceptionAssertionUnitTest.java
rename to testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/migration/junit4/ExceptionAssertionUnitTest.java
index afe4af8c4a..62736b0800 100644
--- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/migration/junit4/ExceptionAssertionUnitTest.java
+++ b/testing-modules/junit-5-basics/src/test/java/com/baeldung/assertexception/migration/junit4/ExceptionAssertionUnitTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.migration.junit4;
+package com.baeldung.assertexception.migration.junit4;
 
 import org.junit.Rule;
 import org.junit.Test;