diff --git a/core-java-modules/core-java-8/pom.xml b/core-java-modules/core-java-8/pom.xml
index c2c84a5407..889c30b76e 100644
--- a/core-java-modules/core-java-8/pom.xml
+++ b/core-java-modules/core-java-8/pom.xml
@@ -61,7 +61,7 @@
spring-boot
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
diff --git a/core-java-modules/core-java-arrays/pom.xml b/core-java-modules/core-java-arrays/pom.xml
index 02d82e4af6..a70ab2d791 100644
--- a/core-java-modules/core-java-arrays/pom.xml
+++ b/core-java-modules/core-java-arrays/pom.xml
@@ -75,7 +75,7 @@
true
libs/
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -94,7 +94,7 @@
${project.basedir}
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -118,7 +118,7 @@
true
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -133,7 +133,7 @@
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
true
${project.build.finalName}-onejar.${project.packaging}
@@ -155,7 +155,7 @@
spring-boot
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
diff --git a/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/collections/ArrayListUnitTest.java
similarity index 99%
rename from core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java
rename to core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/collections/ArrayListUnitTest.java
index 5d07628a96..9d14a63295 100644
--- a/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/ArrayListUnitTest.java
+++ b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/collections/ArrayListUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.collections;
+package com.baeldung.collections;
import com.google.common.collect.Sets;
import org.junit.Before;
diff --git a/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/collections/CoreJavaCollectionsUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
rename to core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/collections/CoreJavaCollectionsUnitTest.java
index 5f7fe356c5..019a569a65 100644
--- a/core-java-modules/core-java-collections-array-list/src/test/java/org/baeldung/java/collections/CoreJavaCollectionsUnitTest.java
+++ b/core-java-modules/core-java-collections-array-list/src/test/java/com/baeldung/collections/CoreJavaCollectionsUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.collections;
+package com.baeldung.collections;
import com.google.common.collect.ImmutableList;
import org.apache.commons.collections4.ListUtils;
diff --git a/core-java-modules/core-java-collections-list-2/README.md b/core-java-modules/core-java-collections-list-2/README.md
index 0d2da41b41..2e43f610a9 100644
--- a/core-java-modules/core-java-collections-list-2/README.md
+++ b/core-java-modules/core-java-collections-list-2/README.md
@@ -3,13 +3,13 @@
This module contains articles about the Java List collection
### Relevant Articles:
-- [Check If Two Lists are Equal in Java](http://www.baeldung.com/java-test-a-list-for-ordinality-and-equality)
+- [Check If Two Lists are Equal in Java](https://www.baeldung.com/java-test-a-list-for-ordinality-and-equality)
- [Java 8 Streams: Find Items From One List Based On Values From Another List](https://www.baeldung.com/java-streams-find-list-items)
-- [A Guide to the Java LinkedList](http://www.baeldung.com/java-linkedlist)
-- [Java List UnsupportedOperationException](http://www.baeldung.com/java-list-unsupported-operation-exception)
+- [A Guide to the Java LinkedList](https://www.baeldung.com/java-linkedlist)
+- [Java List UnsupportedOperationException](https://www.baeldung.com/java-list-unsupported-operation-exception)
- [Java List Initialization in One Line](https://www.baeldung.com/java-init-list-one-line)
- [Ways to Iterate Over a List in Java](https://www.baeldung.com/java-iterate-list)
-- [Flattening Nested Collections in Java](http://www.baeldung.com/java-flatten-nested-collections)
+- [Flattening Nested Collections in Java](https://www.baeldung.com/java-flatten-nested-collections)
- [Intersection of Two Lists in Java](https://www.baeldung.com/java-lists-intersection)
- [Searching for a String in an ArrayList](https://www.baeldung.com/java-search-string-arraylist)
- [[<-- Prev]](/core-java-modules/core-java-collections-list)[[Next -->]](/core-java-modules/core-java-collections-list-3)
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListAssertJUnitTest.java
similarity index 95%
rename from core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java
rename to core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListAssertJUnitTest.java
index c609f5badb..fd15d92dac 100644
--- a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListAssertJUnitTest.java
+++ b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListAssertJUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.lists;
+package com.baeldung.java.list;
import org.junit.Test;
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListJUnitTest.java b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListJUnitTest.java
similarity index 97%
rename from core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
rename to core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListJUnitTest.java
index f9c9d3fda8..6537e2d153 100644
--- a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListJUnitTest.java
+++ b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListJUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.lists;
+package com.baeldung.java.list;
import org.junit.Assert;
import org.junit.Test;
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListTestNgUnitTest.java
similarity index 94%
rename from core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java
rename to core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListTestNgUnitTest.java
index 86493f6e5d..07002b5613 100644
--- a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/ListTestNgUnitTest.java
+++ b/core-java-modules/core-java-collections-list-2/src/test/java/com/baeldung/java/list/ListTestNgUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.lists;
+package com.baeldung.java.list;
import org.junit.Test;
diff --git a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/README.md b/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/README.md
deleted file mode 100644
index 2a1e8aeeaa..0000000000
--- a/core-java-modules/core-java-collections-list-2/src/test/java/org/baeldung/java/lists/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-### Relevant Articles:
-- [Check If Two Lists are Equal in Java](http://www.baeldung.com/java-test-a-list-for-ordinality-and-equality)
diff --git a/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collections/JavaCollectionCleanupUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collections/JavaCollectionCleanupUnitTest.java
index 537262607a..96813df862 100644
--- a/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/java/collections/JavaCollectionCleanupUnitTest.java
+++ b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/collections/JavaCollectionCleanupUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.collections;
+package com.baeldung.collections;
import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertThat;
diff --git a/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/RandomListElementUnitTest.java b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/random/RandomListElementUnitTest.java
similarity index 98%
rename from core-java-modules/core-java-collections-list/src/test/java/org/baeldung/RandomListElementUnitTest.java
rename to core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/random/RandomListElementUnitTest.java
index 4f5ba0f82f..95e013b481 100644
--- a/core-java-modules/core-java-collections-list/src/test/java/org/baeldung/RandomListElementUnitTest.java
+++ b/core-java-modules/core-java-collections-list/src/test/java/com/baeldung/list/random/RandomListElementUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung;
+package com.baeldung.list.random;
import com.google.common.collect.Lists;
import org.junit.Test;
diff --git a/core-java-modules/core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/stream/ThreadPoolInParallelStreamIntegrationTest.java
similarity index 97%
rename from core-java-modules/core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
rename to core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/stream/ThreadPoolInParallelStreamIntegrationTest.java
index 502672dea1..7ee849b0a2 100644
--- a/core-java-modules/core-java-concurrency-collections/src/test/java/org/baeldung/java/streams/ThreadPoolInParallelStreamIntegrationTest.java
+++ b/core-java-modules/core-java-concurrency-collections/src/test/java/com/baeldung/java/stream/ThreadPoolInParallelStreamIntegrationTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.streams;
+package com.baeldung.java.stream;
import org.junit.Test;
diff --git a/core-java-modules/core-java-jar/pom.xml b/core-java-modules/core-java-jar/pom.xml
index fe94a6d8a8..d035ee33e2 100644
--- a/core-java-modules/core-java-jar/pom.xml
+++ b/core-java-modules/core-java-jar/pom.xml
@@ -99,7 +99,7 @@
true
libs/
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -118,7 +118,7 @@
${project.basedir}
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -142,7 +142,7 @@
true
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -157,7 +157,7 @@
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
true
${project.build.finalName}-onejar.${project.packaging}
@@ -179,7 +179,7 @@
spring-boot
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
diff --git a/core-java-modules/core-java-sun/pom.xml b/core-java-modules/core-java-sun/pom.xml
index 03b6646fec..c17bb6b8fc 100644
--- a/core-java-modules/core-java-sun/pom.xml
+++ b/core-java-modules/core-java-sun/pom.xml
@@ -49,7 +49,7 @@
true
libs/
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
index 2442d81559..5f60b43f79 100644
--- a/core-java-modules/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -99,7 +99,7 @@
true
libs/
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -118,7 +118,7 @@
${project.basedir}
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -142,7 +142,7 @@
true
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
@@ -157,7 +157,7 @@
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
true
${project.build.finalName}-onejar.${project.packaging}
@@ -179,7 +179,7 @@
spring-boot
- org.baeldung.executable.ExecutableMavenJar
+ com.baeldung.executable.ExecutableMavenJar
diff --git a/core-java-modules/core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java b/core-java-modules/core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java
deleted file mode 100644
index d291ac0d3b..0000000000
--- a/core-java-modules/core-java/src/main/java/org/baeldung/executable/ExecutableMavenJar.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.baeldung.executable;
-
-import javax.swing.*;
-
-public class ExecutableMavenJar {
-
- public static void main(String[] args) {
- JOptionPane.showMessageDialog(null, "It worked!", "Executable Jar with Maven", 1);
- }
-}
diff --git a/core-java-modules/core-java/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/JavaTimerLongRunningUnitTest.java
similarity index 99%
rename from core-java-modules/core-java/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/JavaTimerLongRunningUnitTest.java
index 826106a09e..7063bafb1d 100644
--- a/core-java-modules/core-java/src/test/java/org/baeldung/java/JavaTimerLongRunningUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/JavaTimerLongRunningUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java;
+package com.baeldung;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/core-java-modules/core-java/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/arrays/ArraysJoinAndSplitJUnitTest.java
similarity index 97%
rename from core-java-modules/core-java/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/arrays/ArraysJoinAndSplitJUnitTest.java
index 885c3bcd6c..b31a829f34 100644
--- a/core-java-modules/core-java/src/test/java/org/baeldung/java/arrays/ArraysJoinAndSplitJUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/arrays/ArraysJoinAndSplitJUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.arrays;
+package com.baeldung.arrays;
import java.util.Arrays;
diff --git a/core-java-modules/core-java/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/rawtypes/RawTypesUnitTest.java
similarity index 90%
rename from core-java-modules/core-java/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/rawtypes/RawTypesUnitTest.java
index 161c053cea..3871368c07 100644
--- a/core-java-modules/core-java/src/test/java/org/baeldung/java/rawtypes/RawTypesUnitTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/rawtypes/RawTypesUnitTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.rawtypes;
+package com.baeldung.rawtypes;
import java.util.ArrayList;
import java.util.List;
diff --git a/core-java-modules/core-java/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java b/core-java-modules/core-java/src/test/java/com/baeldung/sandbox/SandboxJavaManualTest.java
similarity index 98%
rename from core-java-modules/core-java/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java
rename to core-java-modules/core-java/src/test/java/com/baeldung/sandbox/SandboxJavaManualTest.java
index 877122ce40..a58c2d4e6c 100644
--- a/core-java-modules/core-java/src/test/java/org/baeldung/java/sandbox/SandboxJavaManualTest.java
+++ b/core-java-modules/core-java/src/test/java/com/baeldung/sandbox/SandboxJavaManualTest.java
@@ -1,4 +1,4 @@
-package org.baeldung.java.sandbox;
+package com.baeldung.sandbox;
import org.junit.Test;
import org.slf4j.Logger;