diff --git a/apps/smp-server/Main.hs b/apps/smp-server/Main.hs
index 172174459..03fc60990 100644
--- a/apps/smp-server/Main.hs
+++ b/apps/smp-server/Main.hs
@@ -1,7 +1,7 @@
 module Main where
 
-import Env.STM
-import Server (runSMPServer)
+import Simplex.Messaging.Server (runSMPServer)
+import Simplex.Messaging.Server.Env.STM
 
 cfg :: Config
 cfg =
diff --git a/src/Server.hs b/src/Simplex/Messaging/Server.hs
similarity index 96%
rename from src/Server.hs
rename to src/Simplex/Messaging/Server.hs
index 5af42705a..41b84ddb2 100644
--- a/src/Server.hs
+++ b/src/Simplex/Messaging/Server.hs
@@ -10,7 +10,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 
-module Server (runSMPServer) where
+module Simplex.Messaging.Server (runSMPServer) where
 
 import Control.Concurrent.STM (stateTVar)
 import Control.Monad
@@ -22,13 +22,13 @@ import qualified Data.ByteString.Char8 as B
 import Data.Functor (($>))
 import qualified Data.Map.Strict as M
 import Data.Time.Clock
-import Env.STM
-import MsgStore
-import MsgStore.STM (MsgQueue)
-import QueueStore
-import QueueStore.STM (QueueStore)
-import Transmission
-import Transport
+import Simplex.Messaging.Server.Env.STM
+import Simplex.Messaging.Server.MsgStore
+import Simplex.Messaging.Server.MsgStore.STM (MsgQueue)
+import Simplex.Messaging.Server.QueueStore
+import Simplex.Messaging.Server.QueueStore.STM (QueueStore)
+import Simplex.Messaging.Server.Transmission
+import Simplex.Messaging.Transport
 import UnliftIO.Async
 import UnliftIO.Concurrent
 import UnliftIO.Exception
diff --git a/src/Env/STM.hs b/src/Simplex/Messaging/Server/Env/STM.hs
similarity index 90%
rename from src/Env/STM.hs
rename to src/Simplex/Messaging/Server/Env/STM.hs
index b929b2036..6a7bf0ed9 100644
--- a/src/Env/STM.hs
+++ b/src/Simplex/Messaging/Server/Env/STM.hs
@@ -1,18 +1,18 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
-module Env.STM where
+module Simplex.Messaging.Server.Env.STM where
 
 import Control.Concurrent (ThreadId)
 import Control.Monad.IO.Unlift
 import Crypto.Random
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
-import MsgStore.STM
 import Network.Socket (ServiceName)
 import Numeric.Natural
-import QueueStore.STM
-import Transmission
+import Simplex.Messaging.Server.MsgStore.STM
+import Simplex.Messaging.Server.QueueStore.STM
+import Simplex.Messaging.Server.Transmission
 import UnliftIO.STM
 
 data Config = Config
diff --git a/src/MsgStore.hs b/src/Simplex/Messaging/Server/MsgStore.hs
similarity index 86%
rename from src/MsgStore.hs
rename to src/Simplex/Messaging/Server/MsgStore.hs
index 18d2860f5..1d0d66daa 100644
--- a/src/MsgStore.hs
+++ b/src/Simplex/Messaging/Server/MsgStore.hs
@@ -1,9 +1,9 @@
 {-# LANGUAGE FunctionalDependencies #-}
 
-module MsgStore where
+module Simplex.Messaging.Server.MsgStore where
 
 import Data.Time.Clock
-import Transmission
+import Simplex.Messaging.Server.Transmission
 
 data Message = Message
   { msgId :: Encoded,
diff --git a/src/MsgStore/STM.hs b/src/Simplex/Messaging/Server/MsgStore/STM.hs
similarity index 91%
rename from src/MsgStore/STM.hs
rename to src/Simplex/Messaging/Server/MsgStore/STM.hs
index 85d7ef31c..3e124dc88 100644
--- a/src/MsgStore/STM.hs
+++ b/src/Simplex/Messaging/Server/MsgStore/STM.hs
@@ -4,12 +4,12 @@
 {-# LANGUAGE InstanceSigs #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 
-module MsgStore.STM where
+module Simplex.Messaging.Server.MsgStore.STM where
 
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
-import MsgStore
-import Transmission
+import Simplex.Messaging.Server.MsgStore
+import Simplex.Messaging.Server.Transmission
 import UnliftIO.STM
 
 newtype MsgQueue = MsgQueue {msgQueue :: TQueue Message}
diff --git a/src/QueueStore.hs b/src/Simplex/Messaging/Server/QueueStore.hs
similarity index 91%
rename from src/QueueStore.hs
rename to src/Simplex/Messaging/Server/QueueStore.hs
index 349097ac7..6ec83f2e9 100644
--- a/src/QueueStore.hs
+++ b/src/Simplex/Messaging/Server/QueueStore.hs
@@ -3,9 +3,9 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
-module QueueStore where
+module Simplex.Messaging.Server.QueueStore where
 
-import Transmission
+import Simplex.Messaging.Server.Transmission
 
 data QueueRec = QueueRec
   { recipientId :: QueueId,
diff --git a/src/QueueStore/STM.hs b/src/Simplex/Messaging/Server/QueueStore/STM.hs
similarity index 95%
rename from src/QueueStore/STM.hs
rename to src/Simplex/Messaging/Server/QueueStore/STM.hs
index 5e58dfdda..28aab19df 100644
--- a/src/QueueStore/STM.hs
+++ b/src/Simplex/Messaging/Server/QueueStore/STM.hs
@@ -9,12 +9,12 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-module QueueStore.STM where
+module Simplex.Messaging.Server.QueueStore.STM where
 
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
-import QueueStore
-import Transmission
+import Simplex.Messaging.Server.QueueStore
+import Simplex.Messaging.Server.Transmission
 import UnliftIO.STM
 
 data QueueStoreData = QueueStoreData
diff --git a/src/Transmission.hs b/src/Simplex/Messaging/Server/Transmission.hs
similarity index 98%
rename from src/Transmission.hs
rename to src/Simplex/Messaging/Server/Transmission.hs
index ad0dc09b9..11e5b250f 100644
--- a/src/Transmission.hs
+++ b/src/Simplex/Messaging/Server/Transmission.hs
@@ -8,7 +8,7 @@
 {-# LANGUAGE UndecidableInstances #-}
 {-# OPTIONS_GHC -fno-warn-unticked-promoted-constructors #-}
 
-module Transmission where
+module Simplex.Messaging.Server.Transmission where
 
 import Data.ByteString.Base64
 import Data.ByteString.Char8 (ByteString)
diff --git a/src/Transport.hs b/src/Simplex/Messaging/Transport.hs
similarity index 97%
rename from src/Transport.hs
rename to src/Simplex/Messaging/Transport.hs
index f48b33426..efb3ce549 100644
--- a/src/Transport.hs
+++ b/src/Simplex/Messaging/Transport.hs
@@ -6,18 +6,18 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 
-module Transport where
+module Simplex.Messaging.Transport where
 
 import Control.Monad.IO.Class
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
 import Data.ByteString.Base64
 import Data.ByteString.Char8 (ByteString)
-import qualified Data.ByteString.Char8 as B
+import qualified  Data.ByteString.Char8 as B
 import Network.Socket
+import Simplex.Messaging.Server.Transmission
 import System.IO
 import Text.Read
-import Transmission
 import UnliftIO.Concurrent
 import qualified UnliftIO.Exception as E
 import qualified UnliftIO.IO as IO
diff --git a/tests/SMPClient.hs b/tests/SMPClient.hs
index 6e971abcb..f7bc3eb8d 100644
--- a/tests/SMPClient.hs
+++ b/tests/SMPClient.hs
@@ -6,12 +6,12 @@ module SMPClient where
 
 import Control.Monad.IO.Unlift
 import Crypto.Random
-import Env.STM
 import Network.Socket
-import Server
+import Simplex.Messaging.Server
+import Simplex.Messaging.Server.Env.STM
+import Simplex.Messaging.Server.Transmission
+import Simplex.Messaging.Transport
 import Test.Hspec
-import Transmission
-import Transport
 import UnliftIO.Concurrent
 import qualified UnliftIO.Exception as E
 import UnliftIO.IO
diff --git a/tests/Test.hs b/tests/Test.hs
index b0ff53005..1bdd88077 100644
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -10,12 +10,12 @@ import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import Data.Either
 import SMPClient
+import Simplex.Messaging.Server.Transmission
+import Simplex.Messaging.Transport
 import System.IO (Handle)
 import System.Timeout
 import Test.HUnit
 import Test.Hspec
-import Transmission
-import Transport
 
 main :: IO ()
 main = hspec do