diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index ce8ee00c..8b2477e7 100644
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -67,8 +67,8 @@ import org.asamk.signal.storage.groups.GroupInfo;
 import org.asamk.signal.storage.groups.JsonGroupStore;
 import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
 import org.asamk.signal.storage.protocol.JsonSignalProtocolStore;
-import org.asamk.signal.storage.thread.JsonThreadStore;
-import org.asamk.signal.storage.thread.ThreadInfo;
+import org.asamk.signal.storage.threads.JsonThreadStore;
+import org.asamk.signal.storage.threads.ThreadInfo;
 import org.asamk.signal.util.Base64;
 import org.asamk.signal.util.Util;
 import org.whispersystems.libsignal.DuplicateMessageException;
diff --git a/src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java b/src/main/java/org/asamk/signal/storage/threads/JsonThreadStore.java
similarity index 97%
rename from src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java
rename to src/main/java/org/asamk/signal/storage/threads/JsonThreadStore.java
index ce77a15f..b32d629d 100644
--- a/src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java
+++ b/src/main/java/org/asamk/signal/storage/threads/JsonThreadStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.thread;
+package org.asamk.signal.storage.threads;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java b/src/main/java/org/asamk/signal/storage/threads/ThreadInfo.java
similarity index 81%
rename from src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java
rename to src/main/java/org/asamk/signal/storage/threads/ThreadInfo.java
index da94f219..3fc28405 100644
--- a/src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java
+++ b/src/main/java/org/asamk/signal/storage/threads/ThreadInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.storage.thread;
+package org.asamk.signal.storage.threads;
 
 import com.fasterxml.jackson.annotation.JsonProperty;