diff --git a/src/main/java/org/asamk/signal/ContactInfo.java b/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
similarity index 100%
rename from src/main/java/org/asamk/signal/ContactInfo.java
rename to src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
diff --git a/src/main/java/org/asamk/signal/JsonContactsStore.java b/src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonContactsStore.java
rename to src/main/java/org/asamk/signal/storage/contacts/JsonContactsStore.java
diff --git a/src/main/java/org/asamk/signal/GroupInfo.java b/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
similarity index 100%
rename from src/main/java/org/asamk/signal/GroupInfo.java
rename to src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
diff --git a/src/main/java/org/asamk/signal/JsonGroupStore.java b/src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonGroupStore.java
rename to src/main/java/org/asamk/signal/storage/groups/JsonGroupStore.java
diff --git a/src/main/java/org/asamk/signal/JsonIdentityKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonIdentityKeyStore.java
rename to src/main/java/org/asamk/signal/storage/protocol/JsonIdentityKeyStore.java
diff --git a/src/main/java/org/asamk/signal/JsonPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonPreKeyStore.java
rename to src/main/java/org/asamk/signal/storage/protocol/JsonPreKeyStore.java
diff --git a/src/main/java/org/asamk/signal/JsonSessionStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonSessionStore.java
rename to src/main/java/org/asamk/signal/storage/protocol/JsonSessionStore.java
diff --git a/src/main/java/org/asamk/signal/JsonSignalProtocolStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonSignalProtocolStore.java
rename to src/main/java/org/asamk/signal/storage/protocol/JsonSignalProtocolStore.java
diff --git a/src/main/java/org/asamk/signal/JsonSignedPreKeyStore.java b/src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonSignedPreKeyStore.java
rename to src/main/java/org/asamk/signal/storage/protocol/JsonSignedPreKeyStore.java
diff --git a/src/main/java/org/asamk/signal/JsonThreadStore.java b/src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java
similarity index 100%
rename from src/main/java/org/asamk/signal/JsonThreadStore.java
rename to src/main/java/org/asamk/signal/storage/thread/JsonThreadStore.java
diff --git a/src/main/java/org/asamk/signal/ThreadInfo.java b/src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java
similarity index 100%
rename from src/main/java/org/asamk/signal/ThreadInfo.java
rename to src/main/java/org/asamk/signal/storage/thread/ThreadInfo.java
diff --git a/src/main/java/org/asamk/signal/Base64.java b/src/main/java/org/asamk/signal/util/Base64.java
similarity index 100%
rename from src/main/java/org/asamk/signal/Base64.java
rename to src/main/java/org/asamk/signal/util/Base64.java
diff --git a/src/main/java/org/asamk/signal/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
similarity index 100%
rename from src/main/java/org/asamk/signal/Hex.java
rename to src/main/java/org/asamk/signal/util/Hex.java
diff --git a/src/main/java/org/asamk/signal/Util.java b/src/main/java/org/asamk/signal/util/Util.java
similarity index 100%
rename from src/main/java/org/asamk/signal/Util.java
rename to src/main/java/org/asamk/signal/util/Util.java