diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Department.java
similarity index 90%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Department.java
index ee4dc82771..87bff514a0 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Department.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Department.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
import java.util.StringJoiner;
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Employee.java
similarity index 97%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Employee.java
index ef63642ca2..af44822215 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Employee.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Employee.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
import java.util.*;
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Grade.java
similarity index 90%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Grade.java
index cb979be3b8..1d18a3f183 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Grade.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Grade.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
import java.util.StringJoiner;
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Person.java
similarity index 93%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Person.java
index c941499993..3269af7b0f 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/Person.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/Person.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
import java.util.StringJoiner;
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/YearQuarter.java
similarity index 96%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/YearQuarter.java
index c2868f09b8..576fe67dd0 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/model/YearQuarter.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/model/YearQuarter.java
@@ -1,4 +1,4 @@
-package org.baeldung.easy.random.model;
+package com.baeldung.easy.random.model;
import java.time.LocalDate;
import java.util.Objects;
diff --git a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
similarity index 79%
rename from testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
rename to testing-modules/easy-random/src/main/java/com/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
index 05232ffcbc..28db724684 100644
--- a/testing-modules/easy-random/src/main/java/org/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
+++ b/testing-modules/easy-random/src/main/java/com/baeldung/easy/random/randomizer/YearQuarterRandomizer.java
@@ -1,6 +1,6 @@
-package org.baeldung.easy.random.randomizer;
+package com.baeldung.easy.random.randomizer;
-import org.baeldung.easy.random.model.YearQuarter;
+import com.baeldung.easy.random.model.YearQuarter;
import org.jeasy.random.api.Randomizer;
import java.time.LocalDate;
diff --git a/testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java b/testing-modules/easy-random/src/test/java/com/baeldung/easy/random/EasyRandomUnitTest.java
similarity index 89%
rename from testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java
rename to testing-modules/easy-random/src/test/java/com/baeldung/easy/random/EasyRandomUnitTest.java
index 9f7a23db66..4e0df74923 100644
--- a/testing-modules/easy-random/src/test/java/org/baeldung/easy/random/EasyRandomUnitTest.java
+++ b/testing-modules/easy-random/src/test/java/com/baeldung/easy/random/EasyRandomUnitTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.easy.random;
+package com.baeldung.easy.random;
-import org.baeldung.easy.random.model.Employee;
-import org.baeldung.easy.random.model.Person;
-import org.baeldung.easy.random.model.YearQuarter;
-import org.baeldung.easy.random.randomizer.YearQuarterRandomizer;
+import com.baeldung.easy.random.model.Employee;
+import com.baeldung.easy.random.model.Person;
+import com.baeldung.easy.random.model.YearQuarter;
+import com.baeldung.easy.random.randomizer.YearQuarterRandomizer;
import org.jeasy.random.EasyRandom;
import org.jeasy.random.EasyRandomParameters;
import org.jeasy.random.FieldPredicates;
diff --git a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java
index 8f2eb2b5c5..7378eafaa7 100644
--- a/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java
+++ b/testing-modules/junit5-migration/src/test/java/com/baeldung/junit5vstestng/SelectPackagesSuiteUnitTest.java
@@ -5,7 +5,7 @@ import org.junit.platform.suite.api.SelectPackages;
import org.junit.runner.RunWith;
@RunWith(JUnitPlatform.class)
-@SelectPackages({ "org.baeldung.java.suite.childpackage1", "org.baeldung.java.suite.childpackage2" })
+@SelectPackages({ "com.baeldung.java.suite.childpackage1", "com.baeldung.java.suite.childpackage2" })
public class SelectPackagesSuiteUnitTest {
}
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AdvancedCollaborator.java
similarity index 93%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/AdvancedCollaborator.java
index 4d25f466a6..ef7484cfdd 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/AdvancedCollaborator.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AdvancedCollaborator.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
public class AdvancedCollaborator {
int i;
diff --git a/testing-modules/mocks/src/main/java/com/baeldung/mocks/jmockit/AppManager.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AppManager.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/com/baeldung/mocks/jmockit/AppManager.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/AppManager.java
index 615650ea6d..6306a94d29 100644
--- a/testing-modules/mocks/src/main/java/com/baeldung/mocks/jmockit/AppManager.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/AppManager.java
@@ -1,4 +1,4 @@
-package com.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
import java.util.Random;
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Collaborator.java
similarity index 80%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/Collaborator.java
index 60da12fa7c..8c4f6b15b6 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Collaborator.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Collaborator.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
public class Collaborator {
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/ExpectationsCollaborator.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/ExpectationsCollaborator.java
index 8209464936..799e7721e0 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/ExpectationsCollaborator.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/ExpectationsCollaborator.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
import java.util.List;
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Model.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Model.java
similarity index 69%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Model.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/Model.java
index 79ae24c2f5..ac81e5059a 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Model.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Model.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
public class Model {
public String getInfo() {
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Performer.java b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Performer.java
similarity index 84%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Performer.java
rename to testing-modules/mocks/src/main/java/com/baeldung/jmockit/Performer.java
index 4f8e8adb24..82fd03fef1 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/jmockit/Performer.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/jmockit/Performer.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
public class Performer {
private Collaborator collaborator;
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginController.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginController.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginController.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginController.java
index 914b0034d2..e7e972a3ce 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginController.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginController.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
public class LoginController {
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginDao.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginDao.java
similarity index 79%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginDao.java
index 2cbff6c9d4..f2efe38019 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginDao.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginDao.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
public class LoginDao {
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginService.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginService.java
similarity index 94%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginService.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginService.java
index d6a31a8047..3e34024971 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/LoginService.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/LoginService.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
public class LoginService {
diff --git a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/UserForm.java b/testing-modules/mocks/src/main/java/com/baeldung/testCase/UserForm.java
similarity index 84%
rename from testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/UserForm.java
rename to testing-modules/mocks/src/main/java/com/baeldung/testCase/UserForm.java
index 14136d0f31..bfb1411ce5 100644
--- a/testing-modules/mocks/src/main/java/org/baeldung/mocks/testCase/UserForm.java
+++ b/testing-modules/mocks/src/main/java/com/baeldung/testCase/UserForm.java
@@ -1,4 +1,4 @@
-package org.baeldung.mocks.testCase;
+package com.baeldung.testCase;
public class UserForm {
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/easymock/LoginControllerIntegrationTest.java
similarity index 94%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/easymock/LoginControllerIntegrationTest.java
index 4cf2a23ee8..5636382efd 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/easymock/LoginControllerIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.mocks.easymock;
+package com.baeldung.easymock;
-import org.baeldung.mocks.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.LoginController;
+import com.baeldung.testCase.LoginDao;
+import com.baeldung.testCase.LoginService;
+import com.baeldung.testCase.UserForm;
import org.easymock.*;
import org.junit.Assert;
import org.junit.Test;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AdvancedCollaboratorIntegrationTest.java
similarity index 96%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/AdvancedCollaboratorIntegrationTest.java
index 3a30342eb9..e55a69895f 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AdvancedCollaboratorIntegrationTest.java
@@ -1,10 +1,11 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
+import com.baeldung.jmockit.AdvancedCollaborator;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/testing-modules/mocks/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AppManagerUnitTest.java
similarity index 91%
rename from testing-modules/mocks/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/AppManagerUnitTest.java
index ecdc6e441e..bc88f62024 100644
--- a/testing-modules/mocks/src/test/java/com/baeldung/mocks/jmockit/AppManagerUnitTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/AppManagerUnitTest.java
@@ -1,10 +1,9 @@
-package com.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import mockit.Deencapsulation;
import mockit.Mock;
import mockit.MockUp;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ExpectationsIntegrationTest.java
similarity index 97%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/ExpectationsIntegrationTest.java
index 8b85af6243..8b0c3ab4ec 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ExpectationsIntegrationTest.java
@@ -1,5 +1,7 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
+import com.baeldung.jmockit.ExpectationsCollaborator;
+import com.baeldung.jmockit.Model;
import mockit.Delegate;
import mockit.Expectations;
import mockit.Mocked;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/LoginControllerIntegrationTest.java
similarity index 95%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/LoginControllerIntegrationTest.java
index ecad7df5b5..4dbe94991f 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/LoginControllerIntegrationTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
import mockit.*;
import mockit.integration.junit4.JMockit;
-import org.baeldung.mocks.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.LoginController;
+import com.baeldung.testCase.LoginDao;
+import com.baeldung.testCase.LoginService;
+import com.baeldung.testCase.UserForm;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.junit.Assert;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/PerformerIntegrationTest.java
similarity index 80%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/PerformerIntegrationTest.java
index 7c79a5979e..fb94ae908b 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/PerformerIntegrationTest.java
@@ -1,5 +1,8 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
+import com.baeldung.jmockit.Collaborator;
+import com.baeldung.jmockit.Model;
+import com.baeldung.jmockit.Performer;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ReusingIntegrationTest.java
similarity index 89%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/jmockit/ReusingIntegrationTest.java
index 73bc712143..30b17ee2e4 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/jmockit/ReusingIntegrationTest.java
@@ -1,5 +1,8 @@
-package org.baeldung.mocks.jmockit;
+package com.baeldung.jmockit;
+import com.baeldung.jmockit.Collaborator;
+import com.baeldung.jmockit.Model;
+import com.baeldung.jmockit.Performer;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/testing-modules/mocks/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java b/testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java
similarity index 94%
rename from testing-modules/mocks/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
rename to testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java
index 9d47b2f5d4..98df2cf850 100644
--- a/testing-modules/mocks/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java
+++ b/testing-modules/mocks/src/test/java/com/baeldung/mockito/LoginControllerIntegrationTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.mocks.mockito;
+package com.baeldung.mockito;
-import org.baeldung.mocks.testCase.LoginController;
-import org.baeldung.mocks.testCase.LoginDao;
-import org.baeldung.mocks.testCase.LoginService;
-import org.baeldung.mocks.testCase.UserForm;
+import com.baeldung.testCase.LoginController;
+import com.baeldung.testCase.LoginDao;
+import com.baeldung.testCase.LoginService;
+import com.baeldung.testCase.UserForm;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GitHubUser.java
similarity index 88%
rename from testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GitHubUser.java
index 73c9677377..6992789f0e 100644
--- a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/GitHubUser.java
+++ b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GitHubUser.java
@@ -1,4 +1,4 @@
-package org.baeldung.rest;
+package com.baeldung.rest.jbehave;
public class GitHubUser {
diff --git a/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
index d9401a5d00..51beb609c2 100644
--- a/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
+++ b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/GithubUserResponsePayloadSteps.java
@@ -1,11 +1,6 @@
package com.baeldung.rest.jbehave;
import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.baeldung.rest.GitHubUser;
-import org.baeldung.rest.RetrieveUtil;
import org.hamcrest.Matchers;
import org.jbehave.core.annotations.Given;
import org.jbehave.core.annotations.Then;
diff --git a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/RetrieveUtil.java
similarity index 95%
rename from testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
rename to testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/RetrieveUtil.java
index 75ec3c842c..03f96bed73 100644
--- a/testing-modules/rest-testing/src/test/java/org/baeldung/rest/RetrieveUtil.java
+++ b/testing-modules/rest-testing/src/test/java/com/baeldung/rest/jbehave/RetrieveUtil.java
@@ -1,4 +1,4 @@
-package org.baeldung.rest;
+package com.baeldung.rest.jbehave;
import java.io.IOException;
diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml
index 22f5f68240..38e7a0dd46 100644
--- a/testing-modules/spring-testing/pom.xml
+++ b/testing-modules/spring-testing/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- org.baeldung
+ com.baeldung
spring-testing
0.1-SNAPSHOT
spring-testing
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/User.java
similarity index 95%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/User.java
index 28cd4f9fb0..1854a085ac 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/User.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/User.java
@@ -1,4 +1,4 @@
-package org.baeldung.mockito.repository;
+package com.baeldung.mockito.repository;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/UserRepository.java
similarity index 84%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/UserRepository.java
index 3f1952a5e7..fd5bd55c84 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/mockito/repository/UserRepository.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/mockito/repository/UserRepository.java
@@ -1,4 +1,4 @@
-package org.baeldung.mockito.repository;
+package com.baeldung.mockito.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/Employee.java b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/Employee.java
similarity index 87%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/Employee.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/Employee.java
index 8d4eeb57c4..d542f9c234 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/Employee.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/Employee.java
@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
public class Employee {
private Integer id;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/EmployeeService.java b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/EmployeeService.java
similarity index 87%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/EmployeeService.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/EmployeeService.java
index d28745e2ab..9feae7ae30 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/EmployeeService.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/EmployeeService.java
@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
diff --git a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/HRService.java b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/HRService.java
similarity index 77%
rename from testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/HRService.java
rename to testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/HRService.java
index 13a5973ee8..bb2c34d82f 100644
--- a/testing-modules/spring-testing/src/main/java/org/baeldung/reflectiontestutils/repository/HRService.java
+++ b/testing-modules/spring-testing/src/main/java/com/baeldung/reflectiontestutils/repository/HRService.java
@@ -1,4 +1,4 @@
-package org.baeldung.reflectiontestutils.repository;
+package com.baeldung.reflectiontestutils.repository;
import org.springframework.stereotype.Component;
diff --git a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockAnnotationUnitTest.java
similarity index 92%
rename from testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockAnnotationUnitTest.java
index 1fa7f241e7..424a622b65 100644
--- a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockAnnotationUnitTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockAnnotationUnitTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.mockito;
+package com.baeldung.mockito;
-import org.baeldung.mockito.repository.UserRepository;
+import com.baeldung.mockito.repository.UserRepository;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
similarity index 91%
rename from testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
index 3a7e58fb48..b7617ef652 100644
--- a/testing-modules/spring-testing/src/test/java/org/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/mockito/MockBeanAnnotationIntegrationTest.java
@@ -1,6 +1,6 @@
-package org.baeldung.mockito;
+package com.baeldung.mockito;
-import org.baeldung.mockito.repository.UserRepository;
+import com.baeldung.mockito.repository.UserRepository;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/testing-modules/spring-testing/src/test/java/org/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java b/testing-modules/spring-testing/src/test/java/com/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
similarity index 87%
rename from testing-modules/spring-testing/src/test/java/org/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
rename to testing-modules/spring-testing/src/test/java/com/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
index 36e5428b58..33d4db22f3 100644
--- a/testing-modules/spring-testing/src/test/java/org/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
+++ b/testing-modules/spring-testing/src/test/java/com/baeldung/reflectiontestutils/ReflectionTestUtilsUnitTest.java
@@ -1,11 +1,11 @@
-package org.baeldung.reflectiontestutils;
+package com.baeldung.reflectiontestutils;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
-import org.baeldung.reflectiontestutils.repository.Employee;
-import org.baeldung.reflectiontestutils.repository.EmployeeService;
-import org.baeldung.reflectiontestutils.repository.HRService;
+import com.baeldung.reflectiontestutils.repository.EmployeeService;
+import com.baeldung.reflectiontestutils.repository.HRService;
+import com.baeldung.reflectiontestutils.repository.Employee;
import org.junit.Test;
import org.springframework.test.util.ReflectionTestUtils;