diff --git a/.idea/misc.xml b/.idea/misc.xml
index baddb10..122ba17 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" project-jdk-name="23" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="23" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/Mohammed_Implementations/IMPL_M_1.java b/app/src/main/java/de/uni_marburg/powersort/msort/IMPL_M_1.java
similarity index 97%
rename from app/src/main/java/Mohammed_Implementations/IMPL_M_1.java
rename to app/src/main/java/de/uni_marburg/powersort/msort/IMPL_M_1.java
index 03c69d6..0d0f25d 100644
--- a/app/src/main/java/Mohammed_Implementations/IMPL_M_1.java
+++ b/app/src/main/java/de/uni_marburg/powersort/msort/IMPL_M_1.java
@@ -1,14 +1,10 @@
-package Mohammed_Implementations;
+package de.uni_marburg.powersort.msort;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.IntStream;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.IntStream;
 public class IMPL_M_1 {
 
 
@@ -31,7 +27,7 @@ public class IMPL_M_1 {
          * @param workLen  usable size of work array
          * @since 1.8
          */
-        private static int MERGE_COST = 0;
+        protected static int MERGE_COST = 0;
 
         // Example usage
 //        int[] runs = new int[] {5, 3, 3, 14, 1, 2}; // example from slides
diff --git a/app/src/test/java/de/uni_marburg/powersort/PowerSortTest.java b/app/src/test/java/de/uni_marburg/powersort/msort/PowerSortTest.java
similarity index 74%
rename from app/src/test/java/de/uni_marburg/powersort/PowerSortTest.java
rename to app/src/test/java/de/uni_marburg/powersort/msort/PowerSortTest.java
index 7c466ef..dc2bfa5 100644
--- a/app/src/test/java/de/uni_marburg/powersort/PowerSortTest.java
+++ b/app/src/test/java/de/uni_marburg/powersort/msort/PowerSortTest.java
@@ -1,4 +1,4 @@
-package de.uni_marburg.powersort;
+package de.uni_marburg.powersort.msort;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,10 +8,10 @@ import java.util.stream.IntStream;
 
 import org.junit.jupiter.api.Test;
 
-import static Mohammed_Implementations.PowerSort.MERGE_COST;
-import static Mohammed_Implementations.PowerSort.extendRun;
-import static Mohammed_Implementations.PowerSort.fillWithAscRunsHighToLow;
-import static Mohammed_Implementations.PowerSort.powerSort;
+import static de.uni_marburg.powersort.msort.IMPL_M_1.MERGE_COST;
+import static de.uni_marburg.powersort.msort.IMPL_M_1.extendRun;
+import static de.uni_marburg.powersort.msort.IMPL_M_1.fillWithAscRunsHighToLow;
+import static de.uni_marburg.powersort.msort.IMPL_M_1.powerSort;
 
 class PowerSortTest {
     @Test