diff --git a/examples/pingpong.nim b/examples/pingpong.nim
index 99ef647..bfdb67c 100644
--- a/examples/pingpong.nim
+++ b/examples/pingpong.nim
@@ -2,11 +2,11 @@ import chronicles
 import chronos
 import strformat
 
-import chat_sdk
+import chat
 import content_types
 
 # TEsting
-import ../src/chat_sdk/crypto
+import ../src/chat/crypto
 
 
 proc getContent(content: ContentFrame): string =
diff --git a/examples/tui/persistence.nim b/examples/tui/persistence.nim
index 3582914..cfcfe46 100644
--- a/examples/tui/persistence.nim
+++ b/examples/tui/persistence.nim
@@ -12,9 +12,9 @@ import strformat
 import strutils
 import tables
 
-import chat_sdk/crypto/ecdh
-import chat_sdk/delivery/waku_client
-import chat_sdk/identity
+import chat/crypto/ecdh
+import chat/delivery/waku_client
+import chat/identity
 
 
 const REGISTRATION_DIR = ".registry"
diff --git a/examples/tui/tui.nim b/examples/tui/tui.nim
index 4fbd462..f49c608 100644
--- a/examples/tui/tui.nim
+++ b/examples/tui/tui.nim
@@ -10,7 +10,7 @@ import strutils
 import sugar
 import tables
 
-import chat_sdk
+import chat
 import content_types/all
 
 import layout
diff --git a/src/chat_sdk.nim b/src/chat.nim
similarity index 93%
rename from src/chat_sdk.nim
rename to src/chat.nim
index de9b9ac..46f2833 100644
--- a/src/chat_sdk.nim
+++ b/src/chat.nim
@@ -1,4 +1,4 @@
-import chat_sdk/[
+import chat/[
   client,
   crypto,
   conversations,
diff --git a/src/chat_sdk/client.nim b/src/chat/client.nim
similarity index 100%
rename from src/chat_sdk/client.nim
rename to src/chat/client.nim
diff --git a/src/chat_sdk/conversation_store.nim b/src/chat/conversation_store.nim
similarity index 100%
rename from src/chat_sdk/conversation_store.nim
rename to src/chat/conversation_store.nim
diff --git a/src/chat_sdk/conversations.nim b/src/chat/conversations.nim
similarity index 100%
rename from src/chat_sdk/conversations.nim
rename to src/chat/conversations.nim
diff --git a/src/chat_sdk/conversations/convo_impl.nim b/src/chat/conversations/convo_impl.nim
similarity index 100%
rename from src/chat_sdk/conversations/convo_impl.nim
rename to src/chat/conversations/convo_impl.nim
diff --git a/src/chat_sdk/conversations/convo_type.nim b/src/chat/conversations/convo_type.nim
similarity index 100%
rename from src/chat_sdk/conversations/convo_type.nim
rename to src/chat/conversations/convo_type.nim
diff --git a/src/chat_sdk/conversations/message.nim b/src/chat/conversations/message.nim
similarity index 100%
rename from src/chat_sdk/conversations/message.nim
rename to src/chat/conversations/message.nim
diff --git a/src/chat_sdk/conversations/private_v1.nim b/src/chat/conversations/private_v1.nim
similarity index 100%
rename from src/chat_sdk/conversations/private_v1.nim
rename to src/chat/conversations/private_v1.nim
diff --git a/src/chat_sdk/crypto.nim b/src/chat/crypto.nim
similarity index 100%
rename from src/chat_sdk/crypto.nim
rename to src/chat/crypto.nim
diff --git a/src/chat_sdk/crypto/curve25519.nim b/src/chat/crypto/curve25519.nim
similarity index 100%
rename from src/chat_sdk/crypto/curve25519.nim
rename to src/chat/crypto/curve25519.nim
diff --git a/src/chat_sdk/crypto/ecdh.nim b/src/chat/crypto/ecdh.nim
similarity index 100%
rename from src/chat_sdk/crypto/ecdh.nim
rename to src/chat/crypto/ecdh.nim
diff --git a/src/chat_sdk/delivery/waku_client.nim b/src/chat/delivery/waku_client.nim
similarity index 100%
rename from src/chat_sdk/delivery/waku_client.nim
rename to src/chat/delivery/waku_client.nim
diff --git a/src/chat_sdk/errors.nim b/src/chat/errors.nim
similarity index 100%
rename from src/chat_sdk/errors.nim
rename to src/chat/errors.nim
diff --git a/src/chat_sdk/identity.nim b/src/chat/identity.nim
similarity index 100%
rename from src/chat_sdk/identity.nim
rename to src/chat/identity.nim
diff --git a/src/chat_sdk/inbox.nim b/src/chat/inbox.nim
similarity index 100%
rename from src/chat_sdk/inbox.nim
rename to src/chat/inbox.nim
diff --git a/src/chat_sdk/links.nim b/src/chat/links.nim
similarity index 100%
rename from src/chat_sdk/links.nim
rename to src/chat/links.nim
diff --git a/src/chat_sdk/proto_types.nim b/src/chat/proto_types.nim
similarity index 100%
rename from src/chat_sdk/proto_types.nim
rename to src/chat/proto_types.nim
diff --git a/src/chat_sdk/types.nim b/src/chat/types.nim
similarity index 100%
rename from src/chat_sdk/types.nim
rename to src/chat/types.nim
diff --git a/src/chat_sdk/utils.nim b/src/chat/utils.nim
similarity index 100%
rename from src/chat_sdk/utils.nim
rename to src/chat/utils.nim
diff --git a/src/content_types/all.nim b/src/content_types/all.nim
index 8bd3f53..4fd7d25 100644
--- a/src/content_types/all.nim
+++ b/src/content_types/all.nim
@@ -6,7 +6,7 @@ import protobuf_serialization/proto_parser
 import results
 import strformat
 
-import ../chat_sdk/proto_types
+import ../chat/proto_types
 
 
 export protobuf_serialization
diff --git a/tests/test_curve25519.nim b/tests/test_curve25519.nim
index 02051af..1b5cb55 100644
--- a/tests/test_curve25519.nim
+++ b/tests/test_curve25519.nim
@@ -1,8 +1,8 @@
 import results
 import unittest
 
-import ../src/chat_sdk/crypto/ecdh # TODO use config.nims
-import ../src/chat_sdk/utils
+import ../src/chat/crypto/ecdh # TODO use config.nims
+import ../src/chat/utils
 
 # Key share test from RFC-7748:
 const ks7748_a_priv = "77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a"