diff --git a/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitSchedulerImpl.java b/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitSchedulerImpl.java
index fa4b4d0..baaf0e1 100644
--- a/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitSchedulerImpl.java
+++ b/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitSchedulerImpl.java
@@ -1,7 +1,7 @@
 package com.eternalcode.commons.bukkit.scheduler;
 
-import com.eternalcode.commons.shared.scheduler.Scheduler;
-import com.eternalcode.commons.shared.scheduler.Task;
+import com.eternalcode.commons.scheduler.Scheduler;
+import com.eternalcode.commons.scheduler.Task;
 import java.util.concurrent.CompletableFuture;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitScheduler;
diff --git a/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitTaskImpl.java b/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitTaskImpl.java
index fd72ffc..1bb1d6b 100644
--- a/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitTaskImpl.java
+++ b/eternalcode-commons-bukkit/src/main/java/com/eternalcode/commons/bukkit/scheduler/BukkitTaskImpl.java
@@ -1,6 +1,6 @@
 package com.eternalcode.commons.bukkit.scheduler;
 
-import com.eternalcode.commons.shared.scheduler.Task;
+import com.eternalcode.commons.scheduler.Task;
 import org.bukkit.scheduler.BukkitTask;
 
 class BukkitTaskImpl implements Task {
diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/RandomElementUtil.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/RandomElementUtil.java
similarity index 94%
rename from eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/RandomElementUtil.java
rename to eternalcode-commons-shared/src/main/java/com/eternalcode/commons/RandomElementUtil.java
index fad9784..d614d9e 100644
--- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/RandomElementUtil.java
+++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/RandomElementUtil.java
@@ -1,4 +1,4 @@
-package com.eternalcode.commons.shared;
+package com.eternalcode.commons;
 
 import java.util.Collection;
 import java.util.Optional;
diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/scheduler/Scheduler.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/scheduler/Scheduler.java
similarity index 92%
rename from eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/scheduler/Scheduler.java
rename to eternalcode-commons-shared/src/main/java/com/eternalcode/commons/scheduler/Scheduler.java
index 5356fe1..caa48dc 100644
--- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/scheduler/Scheduler.java
+++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/scheduler/Scheduler.java
@@ -1,4 +1,4 @@
-package com.eternalcode.commons.shared.scheduler;
+package com.eternalcode.commons.scheduler;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/scheduler/Task.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/scheduler/Task.java
similarity index 66%
rename from eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/scheduler/Task.java
rename to eternalcode-commons-shared/src/main/java/com/eternalcode/commons/scheduler/Task.java
index 6535067..98507c0 100644
--- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/scheduler/Task.java
+++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/scheduler/Task.java
@@ -1,4 +1,4 @@
-package com.eternalcode.commons.shared.scheduler;
+package com.eternalcode.commons.scheduler;
 
 public interface Task {
 
diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/DurationParser.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/DurationParser.java
similarity index 98%
rename from eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/DurationParser.java
rename to eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/DurationParser.java
index c6df384..66a4b9a 100644
--- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/DurationParser.java
+++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/DurationParser.java
@@ -1,4 +1,4 @@
-package com.eternalcode.commons.shared.time;
+package com.eternalcode.commons.time;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/PeriodParser.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/PeriodParser.java
similarity index 98%
rename from eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/PeriodParser.java
rename to eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/PeriodParser.java
index 2abbcbd..63fb6e2 100644
--- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/PeriodParser.java
+++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/PeriodParser.java
@@ -1,4 +1,4 @@
-package com.eternalcode.commons.shared.time;
+package com.eternalcode.commons.time;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/TemporalAmountParser.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/TemporalAmountParser.java
similarity index 99%
rename from eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/TemporalAmountParser.java
rename to eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/TemporalAmountParser.java
index 4d7f4a0..bf68f0b 100644
--- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/shared/time/TemporalAmountParser.java
+++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/time/TemporalAmountParser.java
@@ -1,4 +1,4 @@
-package com.eternalcode.commons.shared.time;
+package com.eternalcode.commons.time;
 
 import java.math.BigInteger;
 import java.time.Duration;
diff --git a/eternalcode-commons-shared/test/com/eternalcode/commons/shared/RandomElementUtilTest.java b/eternalcode-commons-shared/test/com/eternalcode/commons/RandomElementUtilTest.java
similarity index 96%
rename from eternalcode-commons-shared/test/com/eternalcode/commons/shared/RandomElementUtilTest.java
rename to eternalcode-commons-shared/test/com/eternalcode/commons/RandomElementUtilTest.java
index b715419..8a5df1b 100644
--- a/eternalcode-commons-shared/test/com/eternalcode/commons/shared/RandomElementUtilTest.java
+++ b/eternalcode-commons-shared/test/com/eternalcode/commons/RandomElementUtilTest.java
@@ -1,4 +1,4 @@
-package com.eternalcode.commons.shared;
+package com.eternalcode.commons;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/eternalcode-commons-shared/test/com/eternalcode/commons/shared/time/TemporalAmountParserTest.java b/eternalcode-commons-shared/test/com/eternalcode/commons/time/TemporalAmountParserTest.java
similarity index 98%
rename from eternalcode-commons-shared/test/com/eternalcode/commons/shared/time/TemporalAmountParserTest.java
rename to eternalcode-commons-shared/test/com/eternalcode/commons/time/TemporalAmountParserTest.java
index 6beee64..c58ca78 100644
--- a/eternalcode-commons-shared/test/com/eternalcode/commons/shared/time/TemporalAmountParserTest.java
+++ b/eternalcode-commons-shared/test/com/eternalcode/commons/time/TemporalAmountParserTest.java
@@ -1,9 +1,9 @@
-package com.eternalcode.commons.shared.time;
+package com.eternalcode.commons.time;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import com.eternalcode.commons.shared.time.TemporalAmountParser.LocalDateTimeProvider;
+import com.eternalcode.commons.time.TemporalAmountParser.LocalDateTimeProvider;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.Month;