diff --git a/pdb-utils/src/main/java/org/lucares/utils/BeginningOfNextInterval.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/BeginningOfNextInterval.java
similarity index 97%
rename from pdb-utils/src/main/java/org/lucares/utils/BeginningOfNextInterval.java
rename to data-store/src/main/java/org/lucares/pdb/datastore/internal/BeginningOfNextInterval.java
index d039c2e..81e1140 100644
--- a/pdb-utils/src/main/java/org/lucares/utils/BeginningOfNextInterval.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/BeginningOfNextInterval.java
@@ -1,4 +1,4 @@
-package org.lucares.utils;
+package org.lucares.pdb.datastore.internal;
 
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
diff --git a/pdb-utils/src/main/java/org/lucares/utils/DateBucketUnit.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DateBucketUnit.java
similarity index 65%
rename from pdb-utils/src/main/java/org/lucares/utils/DateBucketUnit.java
rename to data-store/src/main/java/org/lucares/pdb/datastore/internal/DateBucketUnit.java
index a9ce487..a1225ab 100644
--- a/pdb-utils/src/main/java/org/lucares/utils/DateBucketUnit.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DateBucketUnit.java
@@ -1,4 +1,4 @@
-package org.lucares.utils;
+package org.lucares.pdb.datastore.internal;
 
 public enum DateBucketUnit {
     SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR;
diff --git a/data-store/src/main/java/org/lucares/pdb/datastore/internal/DateIndexExtension.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DateIndexExtension.java
index f305b05..364fbd7 100644
--- a/data-store/src/main/java/org/lucares/pdb/datastore/internal/DateIndexExtension.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/DateIndexExtension.java
@@ -7,8 +7,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.lucares.pdb.api.DateTimeRange;
-import org.lucares.utils.DateBucketUnit;
-import org.lucares.utils.LongToDateBucket;
 
 public class DateIndexExtension {
 
diff --git a/pdb-utils/src/main/java/org/lucares/utils/EndOfInterval.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/EndOfInterval.java
similarity index 93%
rename from pdb-utils/src/main/java/org/lucares/utils/EndOfInterval.java
rename to data-store/src/main/java/org/lucares/pdb/datastore/internal/EndOfInterval.java
index c610b92..550d535 100644
--- a/pdb-utils/src/main/java/org/lucares/utils/EndOfInterval.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/EndOfInterval.java
@@ -1,4 +1,4 @@
-package org.lucares.utils;
+package org.lucares.pdb.datastore.internal;
 
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
diff --git a/pdb-utils/src/main/java/org/lucares/utils/LongToDateBucket.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/LongToDateBucket.java
similarity index 99%
rename from pdb-utils/src/main/java/org/lucares/utils/LongToDateBucket.java
rename to data-store/src/main/java/org/lucares/pdb/datastore/internal/LongToDateBucket.java
index 2ef0778..412d117 100644
--- a/pdb-utils/src/main/java/org/lucares/utils/LongToDateBucket.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/LongToDateBucket.java
@@ -1,4 +1,4 @@
-package org.lucares.utils;
+package org.lucares.pdb.datastore.internal;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
diff --git a/pdb-utils/src/main/java/org/lucares/utils/StartOfInterval.java b/data-store/src/main/java/org/lucares/pdb/datastore/internal/StartOfInterval.java
similarity index 98%
rename from pdb-utils/src/main/java/org/lucares/utils/StartOfInterval.java
rename to data-store/src/main/java/org/lucares/pdb/datastore/internal/StartOfInterval.java
index dfca56b..a66b234 100644
--- a/pdb-utils/src/main/java/org/lucares/utils/StartOfInterval.java
+++ b/data-store/src/main/java/org/lucares/pdb/datastore/internal/StartOfInterval.java
@@ -1,4 +1,4 @@
-package org.lucares.utils;
+package org.lucares.pdb.datastore.internal;
 
 import java.time.temporal.ChronoField;
 import java.time.temporal.Temporal;
diff --git a/pdb-utils/src/test/java/org/lucares/utils/LongToDateBucketTest.java b/data-store/src/test/java/org/lucares/pdb/datastore/internal/LongToDateBucketTest.java
similarity index 99%
rename from pdb-utils/src/test/java/org/lucares/utils/LongToDateBucketTest.java
rename to data-store/src/test/java/org/lucares/pdb/datastore/internal/LongToDateBucketTest.java
index a3172d3..771fe88 100644
--- a/pdb-utils/src/test/java/org/lucares/utils/LongToDateBucketTest.java
+++ b/data-store/src/test/java/org/lucares/pdb/datastore/internal/LongToDateBucketTest.java
@@ -1,4 +1,4 @@
-package org.lucares.utils;
+package org.lucares.pdb.datastore.internal;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/Interval.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/Interval.java
index 1e45139..1eefae6 100644
--- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/Interval.java
+++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/Interval.java
@@ -6,7 +6,7 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.lucares.pdb.api.DateTimeRange;
-import org.lucares.utils.LongToDateBucket;
+import org.lucares.pdb.datastore.internal.LongToDateBucket;
 
 public class Interval {
     private final IntervalTimeUnit intervalTimeUnit;
diff --git a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/IntervalTimeUnit.java b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/IntervalTimeUnit.java
index d8cd732..d903f13 100644
--- a/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/IntervalTimeUnit.java
+++ b/pdb-plotting/src/main/java/org/lucares/pdb/plot/api/IntervalTimeUnit.java
@@ -1,6 +1,6 @@
 package org.lucares.pdb.plot.api;
 
-import org.lucares.utils.DateBucketUnit;
+import org.lucares.pdb.datastore.internal.DateBucketUnit;
 
 public enum IntervalTimeUnit {
     SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, YEAR;