diff --git a/conversations/Cargo.toml b/libchat/conversations/Cargo.toml
similarity index 100%
rename from conversations/Cargo.toml
rename to libchat/conversations/Cargo.toml
diff --git a/conversations/src/api.rs b/libchat/conversations/src/api.rs
similarity index 100%
rename from conversations/src/api.rs
rename to libchat/conversations/src/api.rs
diff --git a/conversations/src/context.rs b/libchat/conversations/src/context.rs
similarity index 100%
rename from conversations/src/context.rs
rename to libchat/conversations/src/context.rs
diff --git a/conversations/src/conversation.rs b/libchat/conversations/src/conversation.rs
similarity index 100%
rename from conversations/src/conversation.rs
rename to libchat/conversations/src/conversation.rs
diff --git a/conversations/src/conversation/group_test.rs b/libchat/conversations/src/conversation/group_test.rs
similarity index 100%
rename from conversations/src/conversation/group_test.rs
rename to libchat/conversations/src/conversation/group_test.rs
diff --git a/conversations/src/conversation/privatev1.rs b/libchat/conversations/src/conversation/privatev1.rs
similarity index 100%
rename from conversations/src/conversation/privatev1.rs
rename to libchat/conversations/src/conversation/privatev1.rs
diff --git a/conversations/src/crypto.rs b/libchat/conversations/src/crypto.rs
similarity index 100%
rename from conversations/src/crypto.rs
rename to libchat/conversations/src/crypto.rs
diff --git a/conversations/src/errors.rs b/libchat/conversations/src/errors.rs
similarity index 100%
rename from conversations/src/errors.rs
rename to libchat/conversations/src/errors.rs
diff --git a/conversations/src/identity.rs b/libchat/conversations/src/identity.rs
similarity index 100%
rename from conversations/src/identity.rs
rename to libchat/conversations/src/identity.rs
diff --git a/conversations/src/inbox.rs b/libchat/conversations/src/inbox.rs
similarity index 100%
rename from conversations/src/inbox.rs
rename to libchat/conversations/src/inbox.rs
diff --git a/conversations/src/inbox/handler.rs b/libchat/conversations/src/inbox/handler.rs
similarity index 100%
rename from conversations/src/inbox/handler.rs
rename to libchat/conversations/src/inbox/handler.rs
diff --git a/conversations/src/inbox/handshake.rs b/libchat/conversations/src/inbox/handshake.rs
similarity index 100%
rename from conversations/src/inbox/handshake.rs
rename to libchat/conversations/src/inbox/handshake.rs
diff --git a/conversations/src/inbox/introduction.rs b/libchat/conversations/src/inbox/introduction.rs
similarity index 100%
rename from conversations/src/inbox/introduction.rs
rename to libchat/conversations/src/inbox/introduction.rs
diff --git a/conversations/src/lib.rs b/libchat/conversations/src/lib.rs
similarity index 100%
rename from conversations/src/lib.rs
rename to libchat/conversations/src/lib.rs
diff --git a/conversations/src/proto.rs b/libchat/conversations/src/proto.rs
similarity index 100%
rename from conversations/src/proto.rs
rename to libchat/conversations/src/proto.rs
diff --git a/conversations/src/types.rs b/libchat/conversations/src/types.rs
similarity index 100%
rename from conversations/src/types.rs
rename to libchat/conversations/src/types.rs
diff --git a/conversations/src/utils.rs b/libchat/conversations/src/utils.rs
similarity index 100%
rename from conversations/src/utils.rs
rename to libchat/conversations/src/utils.rs
diff --git a/crypto/Cargo.toml b/libchat/crypto/Cargo.toml
similarity index 100%
rename from crypto/Cargo.toml
rename to libchat/crypto/Cargo.toml
diff --git a/crypto/src/keys.rs b/libchat/crypto/src/keys.rs
similarity index 100%
rename from crypto/src/keys.rs
rename to libchat/crypto/src/keys.rs
diff --git a/crypto/src/lib.rs b/libchat/crypto/src/lib.rs
similarity index 100%
rename from crypto/src/lib.rs
rename to libchat/crypto/src/lib.rs
diff --git a/crypto/src/x3dh.rs b/libchat/crypto/src/x3dh.rs
similarity index 100%
rename from crypto/src/x3dh.rs
rename to libchat/crypto/src/x3dh.rs
diff --git a/crypto/src/xeddsa_sign.rs b/libchat/crypto/src/xeddsa_sign.rs
similarity index 100%
rename from crypto/src/xeddsa_sign.rs
rename to libchat/crypto/src/xeddsa_sign.rs
diff --git a/double-ratchets/Cargo.toml b/libchat/double-ratchets/Cargo.toml
similarity index 100%
rename from double-ratchets/Cargo.toml
rename to libchat/double-ratchets/Cargo.toml
diff --git a/double-ratchets/README.md b/libchat/double-ratchets/README.md
similarity index 100%
rename from double-ratchets/README.md
rename to libchat/double-ratchets/README.md
diff --git a/double-ratchets/examples/double_ratchet_basic.rs b/libchat/double-ratchets/examples/double_ratchet_basic.rs
similarity index 100%
rename from double-ratchets/examples/double_ratchet_basic.rs
rename to libchat/double-ratchets/examples/double_ratchet_basic.rs
diff --git a/double-ratchets/examples/out_of_order_demo.rs b/libchat/double-ratchets/examples/out_of_order_demo.rs
similarity index 100%
rename from double-ratchets/examples/out_of_order_demo.rs
rename to libchat/double-ratchets/examples/out_of_order_demo.rs
diff --git a/double-ratchets/examples/serialization_demo.rs b/libchat/double-ratchets/examples/serialization_demo.rs
similarity index 100%
rename from double-ratchets/examples/serialization_demo.rs
rename to libchat/double-ratchets/examples/serialization_demo.rs
diff --git a/double-ratchets/examples/storage_demo.rs b/libchat/double-ratchets/examples/storage_demo.rs
similarity index 100%
rename from double-ratchets/examples/storage_demo.rs
rename to libchat/double-ratchets/examples/storage_demo.rs
diff --git a/double-ratchets/ffi-nim-example/ffi_nim_example.nimble b/libchat/double-ratchets/ffi-nim-example/ffi_nim_example.nimble
similarity index 100%
rename from double-ratchets/ffi-nim-example/ffi_nim_example.nimble
rename to libchat/double-ratchets/ffi-nim-example/ffi_nim_example.nimble
diff --git a/double-ratchets/ffi-nim-example/src/ffi_nim_example.nim b/libchat/double-ratchets/ffi-nim-example/src/ffi_nim_example.nim
similarity index 100%
rename from double-ratchets/ffi-nim-example/src/ffi_nim_example.nim
rename to libchat/double-ratchets/ffi-nim-example/src/ffi_nim_example.nim
diff --git a/double-ratchets/src/aead.rs b/libchat/double-ratchets/src/aead.rs
similarity index 100%
rename from double-ratchets/src/aead.rs
rename to libchat/double-ratchets/src/aead.rs
diff --git a/double-ratchets/src/bin/generate-headers.rs b/libchat/double-ratchets/src/bin/generate-headers.rs
similarity index 100%
rename from double-ratchets/src/bin/generate-headers.rs
rename to libchat/double-ratchets/src/bin/generate-headers.rs
diff --git a/double-ratchets/src/errors.rs b/libchat/double-ratchets/src/errors.rs
similarity index 100%
rename from double-ratchets/src/errors.rs
rename to libchat/double-ratchets/src/errors.rs
diff --git a/double-ratchets/src/ffi/doubleratchet.rs b/libchat/double-ratchets/src/ffi/doubleratchet.rs
similarity index 100%
rename from double-ratchets/src/ffi/doubleratchet.rs
rename to libchat/double-ratchets/src/ffi/doubleratchet.rs
diff --git a/double-ratchets/src/ffi/key.rs b/libchat/double-ratchets/src/ffi/key.rs
similarity index 100%
rename from double-ratchets/src/ffi/key.rs
rename to libchat/double-ratchets/src/ffi/key.rs
diff --git a/double-ratchets/src/ffi/mod.rs b/libchat/double-ratchets/src/ffi/mod.rs
similarity index 100%
rename from double-ratchets/src/ffi/mod.rs
rename to libchat/double-ratchets/src/ffi/mod.rs
diff --git a/double-ratchets/src/ffi/utils.rs b/libchat/double-ratchets/src/ffi/utils.rs
similarity index 100%
rename from double-ratchets/src/ffi/utils.rs
rename to libchat/double-ratchets/src/ffi/utils.rs
diff --git a/double-ratchets/src/hkdf.rs b/libchat/double-ratchets/src/hkdf.rs
similarity index 100%
rename from double-ratchets/src/hkdf.rs
rename to libchat/double-ratchets/src/hkdf.rs
diff --git a/double-ratchets/src/keypair.rs b/libchat/double-ratchets/src/keypair.rs
similarity index 100%
rename from double-ratchets/src/keypair.rs
rename to libchat/double-ratchets/src/keypair.rs
diff --git a/double-ratchets/src/lib.rs b/libchat/double-ratchets/src/lib.rs
similarity index 100%
rename from double-ratchets/src/lib.rs
rename to libchat/double-ratchets/src/lib.rs
diff --git a/double-ratchets/src/reader.rs b/libchat/double-ratchets/src/reader.rs
similarity index 100%
rename from double-ratchets/src/reader.rs
rename to libchat/double-ratchets/src/reader.rs
diff --git a/double-ratchets/src/state.rs b/libchat/double-ratchets/src/state.rs
similarity index 100%
rename from double-ratchets/src/state.rs
rename to libchat/double-ratchets/src/state.rs
diff --git a/double-ratchets/src/storage/db.rs b/libchat/double-ratchets/src/storage/db.rs
similarity index 100%
rename from double-ratchets/src/storage/db.rs
rename to libchat/double-ratchets/src/storage/db.rs
diff --git a/double-ratchets/src/storage/errors.rs b/libchat/double-ratchets/src/storage/errors.rs
similarity index 100%
rename from double-ratchets/src/storage/errors.rs
rename to libchat/double-ratchets/src/storage/errors.rs
diff --git a/double-ratchets/src/storage/mod.rs b/libchat/double-ratchets/src/storage/mod.rs
similarity index 100%
rename from double-ratchets/src/storage/mod.rs
rename to libchat/double-ratchets/src/storage/mod.rs
diff --git a/double-ratchets/src/storage/session.rs b/libchat/double-ratchets/src/storage/session.rs
similarity index 100%
rename from double-ratchets/src/storage/session.rs
rename to libchat/double-ratchets/src/storage/session.rs
diff --git a/double-ratchets/src/storage/types.rs b/libchat/double-ratchets/src/storage/types.rs
similarity index 100%
rename from double-ratchets/src/storage/types.rs
rename to libchat/double-ratchets/src/storage/types.rs
diff --git a/double-ratchets/src/types.rs b/libchat/double-ratchets/src/types.rs
similarity index 100%
rename from double-ratchets/src/types.rs
rename to libchat/double-ratchets/src/types.rs
diff --git a/storage/Cargo.toml b/libchat/storage/Cargo.toml
similarity index 100%
rename from storage/Cargo.toml
rename to libchat/storage/Cargo.toml
diff --git a/storage/src/errors.rs b/libchat/storage/src/errors.rs
similarity index 100%
rename from storage/src/errors.rs
rename to libchat/storage/src/errors.rs
diff --git a/storage/src/lib.rs b/libchat/storage/src/lib.rs
similarity index 100%
rename from storage/src/lib.rs
rename to libchat/storage/src/lib.rs
diff --git a/storage/src/sqlite.rs b/libchat/storage/src/sqlite.rs
similarity index 100%
rename from storage/src/sqlite.rs
rename to libchat/storage/src/sqlite.rs