diff --git a/matrix_sdk_crypto/src/identities/manager.rs b/matrix_sdk_crypto/src/identities/manager.rs
index d80c8c2e..ef9d60db 100644
--- a/matrix_sdk_crypto/src/identities/manager.rs
+++ b/matrix_sdk_crypto/src/identities/manager.rs
@@ -27,12 +27,12 @@ use matrix_sdk_common::{
 
 use crate::{
     error::OlmResult,
-    group_manager::GroupSessionManager,
     identities::{
         MasterPubkey, OwnUserIdentity, ReadOnlyDevice, SelfSigningPubkey, UserIdentities,
         UserIdentity, UserSigningPubkey,
     },
     requests::KeysQueryRequest,
+    session_manager::GroupSessionManager,
     store::{Result as StoreResult, Store},
 };
 
@@ -376,10 +376,10 @@ pub(crate) mod test {
     use serde_json::json;
 
     use crate::{
-        group_manager::GroupSessionManager,
         identities::IdentityManager,
         machine::test::response_from_file,
         olm::{Account, ReadOnlyAccount},
+        session_manager::GroupSessionManager,
         store::{CryptoStore, MemoryStore, Store},
         verification::VerificationMachine,
     };
diff --git a/matrix_sdk_crypto/src/lib.rs b/matrix_sdk_crypto/src/lib.rs
index 6f168126..0a1f0300 100644
--- a/matrix_sdk_crypto/src/lib.rs
+++ b/matrix_sdk_crypto/src/lib.rs
@@ -29,7 +29,6 @@
 
 mod error;
 mod file_encryption;
-mod group_manager;
 mod identities;
 mod key_request;
 mod machine;
diff --git a/matrix_sdk_crypto/src/machine.rs b/matrix_sdk_crypto/src/machine.rs
index 3e64e48a..03127c25 100644
--- a/matrix_sdk_crypto/src/machine.rs
+++ b/matrix_sdk_crypto/src/machine.rs
@@ -46,7 +46,6 @@ use matrix_sdk_common::{
 use crate::store::sqlite::SqliteStore;
 use crate::{
     error::{EventError, MegolmError, MegolmResult, OlmError, OlmResult},
-    group_manager::GroupSessionManager,
     identities::{Device, IdentityManager, ReadOnlyDevice, UserDevices, UserIdentities},
     key_request::KeyRequestMachine,
     olm::{
@@ -54,7 +53,7 @@ use crate::{
         InboundGroupSession, ReadOnlyAccount,
     },
     requests::{IncomingResponse, OutgoingRequest},
-    session_manager::SessionManager,
+    session_manager::{GroupSessionManager, SessionManager},
     store::{CryptoStore, MemoryStore, Result as StoreResult, Store},
     verification::{Sas, VerificationMachine},
     ToDeviceRequest,
diff --git a/matrix_sdk_crypto/src/group_manager.rs b/matrix_sdk_crypto/src/session_manager/group_sessions.rs
similarity index 100%
rename from matrix_sdk_crypto/src/group_manager.rs
rename to matrix_sdk_crypto/src/session_manager/group_sessions.rs
diff --git a/matrix_sdk_crypto/src/session_manager/mod.rs b/matrix_sdk_crypto/src/session_manager/mod.rs
new file mode 100644
index 00000000..7750262e
--- /dev/null
+++ b/matrix_sdk_crypto/src/session_manager/mod.rs
@@ -0,0 +1,19 @@
+// Copyright 2020 The Matrix.org Foundation C.I.C.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod group_sessions;
+mod sessions;
+
+pub(crate) use group_sessions::GroupSessionManager;
+pub(crate) use sessions::SessionManager;
diff --git a/matrix_sdk_crypto/src/session_manager.rs b/matrix_sdk_crypto/src/session_manager/sessions.rs
similarity index 100%
rename from matrix_sdk_crypto/src/session_manager.rs
rename to matrix_sdk_crypto/src/session_manager/sessions.rs