diff --git a/algorithms-sorting/.gitignore b/algorithms-module/algorithms-sorting/.gitignore
similarity index 100%
rename from algorithms-sorting/.gitignore
rename to algorithms-module/algorithms-sorting/.gitignore
diff --git a/algorithms-sorting/README.md b/algorithms-module/algorithms-sorting/README.md
similarity index 100%
rename from algorithms-sorting/README.md
rename to algorithms-module/algorithms-sorting/README.md
diff --git a/algorithms-sorting/pom.xml b/algorithms-module/algorithms-sorting/pom.xml
similarity index 95%
rename from algorithms-sorting/pom.xml
rename to algorithms-module/algorithms-sorting/pom.xml
index 383014d528..eeccbf814d 100644
--- a/algorithms-sorting/pom.xml
+++ b/algorithms-module/algorithms-sorting/pom.xml
@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>algorithms-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bubblesort/BubbleSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java
similarity index 97%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java
index 002d4997f4..cf86eda4a6 100644
--- a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java
+++ b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorter.java
@@ -1,4 +1,4 @@
-package com.baeldung.bucketsort;
+package com.baeldung.algorithms.bucketsort;
 
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java
similarity index 68%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java
index b86f60324f..c1207088da 100644
--- a/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java
+++ b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/bucketsort/Sorter.java
@@ -1,4 +1,4 @@
-package com.baeldung.bucketsort;
+package com.baeldung.algorithms.bucketsort;
 
 import java.util.List;
 
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/counting/CountingSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/heapsort/Heap.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/insertionsort/InsertionSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/mergesort/MergeSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/QuickSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/radixsort/RadixSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/selectionsort/SelectionSort.java
diff --git a/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java b/algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java
similarity index 100%
rename from algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java
rename to algorithms-module/algorithms-sorting/src/main/java/com/baeldung/algorithms/shellsort/ShellSort.java
diff --git a/algorithms-sorting/src/main/resources/logback.xml b/algorithms-module/algorithms-sorting/src/main/resources/logback.xml
similarity index 100%
rename from algorithms-sorting/src/main/resources/logback.xml
rename to algorithms-module/algorithms-sorting/src/main/resources/logback.xml
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bubblesort/BubbleSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
similarity index 89%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
index 2773d8a68f..4671819673 100644
--- a/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
+++ b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/bucketsort/IntegerBucketSorterUnitTest.java
@@ -1,13 +1,12 @@
-package com.baeldung.bucketsort;
+package com.baeldung.algorithms.bucketsort;
 
-import com.baeldung.bucketsort.IntegerBucketSorter;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
 
 public class IntegerBucketSorterUnitTest {
 
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/counting/CountingSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/heapsort/HeapUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/insertionsort/InsertionSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/mergesort/MergeSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/QuickSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/quicksort/ThreeWayQuickSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/radixsort/RadixSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/selectionsort/SelectionSortUnitTest.java
diff --git a/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java b/algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java
similarity index 100%
rename from algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java
rename to algorithms-module/algorithms-sorting/src/test/java/com/baeldung/algorithms/shellsort/ShellSortUnitTest.java