diff --git a/matrix_sdk_base/src/store/mod.rs b/matrix_sdk_base/src/store/mod.rs
new file mode 100644
index 00000000..1448409b
--- /dev/null
+++ b/matrix_sdk_base/src/store/mod.rs
@@ -0,0 +1,260 @@
+// Copyright 2021 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.
+
+use std::{collections::BTreeMap, ops::Deref, path::Path, sync::Arc};
+
+use dashmap::DashMap;
+use futures::stream::StreamExt;
+use matrix_sdk_common::{
+    events::{
+        presence::PresenceEvent, room::member::MemberEventContent, AnyBasicEvent,
+        AnyStrippedStateEvent, AnySyncStateEvent, EventContent,
+    },
+    identifiers::{RoomId, UserId},
+    locks::RwLock,
+};
+
+use sled::transaction::TransactionError;
+
+use crate::{
+    deserialized_responses::{MemberEvent, StrippedMemberEvent},
+    rooms::{RoomInfo, RoomType, StrippedRoom},
+    InvitedRoom, JoinedRoom, LeftRoom, Room, RoomState, Session,
+};
+
+mod sled_store;
+pub use sled_store::SledStore;
+
+#[derive(Debug, thiserror::Error)]
+pub enum StoreError {
+    #[error(transparent)]
+    Sled(#[from] sled::Error),
+    #[error(transparent)]
+    Json(#[from] serde_json::Error),
+    #[error(transparent)]
+    Identifier(#[from] matrix_sdk_common::identifiers::Error),
+}
+
+impl From<TransactionError<serde_json::Error>> for StoreError {
+    fn from(e: TransactionError<serde_json::Error>) -> Self {
+        match e {
+            TransactionError::Abort(e) => Self::Json(e),
+            TransactionError::Storage(e) => Self::Sled(e),
+        }
+    }
+}
+
+/// A `StateStore` specific result type.
+pub type Result<T> = std::result::Result<T, StoreError>;
+
+#[derive(Debug, Clone)]
+pub struct Store {
+    inner: SledStore,
+    session: Arc<RwLock<Option<Session>>>,
+    sync_token: Arc<RwLock<Option<String>>>,
+    rooms: Arc<DashMap<RoomId, Room>>,
+    stripped_rooms: Arc<DashMap<RoomId, StrippedRoom>>,
+}
+
+impl Store {
+    pub fn new(
+        session: Arc<RwLock<Option<Session>>>,
+        sync_token: Arc<RwLock<Option<String>>>,
+        inner: SledStore,
+    ) -> Self {
+        Self {
+            inner,
+            session,
+            sync_token,
+            rooms: DashMap::new().into(),
+            stripped_rooms: DashMap::new().into(),
+        }
+    }
+
+    pub(crate) async fn restore_session(&self, session: Session) -> Result<()> {
+        let mut infos = self.inner.get_room_infos().await;
+
+        // TODO restore stripped rooms.
+        while let Some(info) = infos.next().await {
+            let room = Room::restore(&session.user_id, self.inner.clone(), info?);
+            self.rooms.insert(room.room_id().to_owned(), room);
+        }
+
+        let token = self.get_sync_token().await?;
+
+        *self.sync_token.write().await = token;
+        *self.session.write().await = Some(session);
+
+        Ok(())
+    }
+
+    pub fn open_default(path: impl AsRef<Path>) -> Result<Self> {
+        let inner = SledStore::open_with_path(path)?;
+        Ok(Self::new(
+            Arc::new(RwLock::new(None)),
+            Arc::new(RwLock::new(None)),
+            inner,
+        ))
+    }
+
+    pub(crate) fn get_bare_room(&self, room_id: &RoomId) -> Option<Room> {
+        #[allow(clippy::map_clone)]
+        self.rooms.get(room_id).map(|r| r.clone())
+    }
+
+    pub fn get_rooms(&self) -> Vec<RoomState> {
+        self.rooms
+            .iter()
+            .filter_map(|r| self.get_room(r.key()))
+            .collect()
+    }
+
+    pub fn get_joined_room(&self, room_id: &RoomId) -> Option<JoinedRoom> {
+        self.get_room(room_id).map(|r| r.joined()).flatten()
+    }
+
+    pub fn get_invited_room(&self, room_id: &RoomId) -> Option<InvitedRoom> {
+        self.get_room(room_id).map(|r| r.invited()).flatten()
+    }
+
+    pub fn get_left_room(&self, room_id: &RoomId) -> Option<LeftRoom> {
+        self.get_room(room_id).map(|r| r.left()).flatten()
+    }
+
+    pub fn get_room(&self, room_id: &RoomId) -> Option<RoomState> {
+        self.get_bare_room(room_id)
+            .map(|r| match r.room_type() {
+                RoomType::Joined => Some(RoomState::Joined(JoinedRoom { inner: r })),
+                RoomType::Left => Some(RoomState::Left(LeftRoom { inner: r })),
+                RoomType::Invited => self
+                    .get_stripped_room(room_id)
+                    .map(|r| RoomState::Invited(InvitedRoom { inner: r })),
+            })
+            .flatten()
+    }
+
+    fn get_stripped_room(&self, room_id: &RoomId) -> Option<StrippedRoom> {
+        #[allow(clippy::map_clone)]
+        self.stripped_rooms.get(room_id).map(|r| r.clone())
+    }
+
+    pub(crate) async fn get_or_create_stripped_room(&self, room_id: &RoomId) -> StrippedRoom {
+        let session = self.session.read().await;
+        let user_id = &session
+            .as_ref()
+            .expect("Creating room while not being logged in")
+            .user_id;
+
+        self.stripped_rooms
+            .entry(room_id.clone())
+            .or_insert_with(|| StrippedRoom::new(user_id, self.inner.clone(), room_id))
+            .clone()
+    }
+
+    pub(crate) async fn get_or_create_room(&self, room_id: &RoomId, room_type: RoomType) -> Room {
+        let session = self.session.read().await;
+        let user_id = &session
+            .as_ref()
+            .expect("Creating room while not being logged in")
+            .user_id;
+
+        self.rooms
+            .entry(room_id.clone())
+            .or_insert_with(|| Room::new(user_id, self.inner.clone(), room_id, room_type))
+            .clone()
+    }
+}
+
+impl Deref for Store {
+    type Target = SledStore;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+#[derive(Debug, Default)]
+pub struct StateChanges {
+    pub sync_token: Option<String>,
+    pub session: Option<Session>,
+    pub account_data: BTreeMap<String, AnyBasicEvent>,
+    pub presence: BTreeMap<UserId, PresenceEvent>,
+
+    pub members: BTreeMap<RoomId, BTreeMap<UserId, MemberEvent>>,
+    pub profiles: BTreeMap<RoomId, BTreeMap<UserId, MemberEventContent>>,
+    pub state: BTreeMap<RoomId, BTreeMap<String, BTreeMap<String, AnySyncStateEvent>>>,
+    pub room_account_data: BTreeMap<RoomId, BTreeMap<String, AnyBasicEvent>>,
+    pub room_infos: BTreeMap<RoomId, RoomInfo>,
+
+    pub stripped_state: BTreeMap<RoomId, BTreeMap<String, BTreeMap<String, AnyStrippedStateEvent>>>,
+    pub stripped_members: BTreeMap<RoomId, BTreeMap<UserId, StrippedMemberEvent>>,
+    pub invited_room_info: BTreeMap<RoomId, RoomInfo>,
+}
+
+impl StateChanges {
+    pub fn new(sync_token: String) -> Self {
+        Self {
+            sync_token: Some(sync_token),
+            ..Default::default()
+        }
+    }
+
+    pub fn add_presence_event(&mut self, event: PresenceEvent) {
+        self.presence.insert(event.sender.clone(), event);
+    }
+
+    pub fn add_room(&mut self, room: RoomInfo) {
+        self.room_infos
+            .insert(room.room_id.as_ref().to_owned(), room);
+    }
+
+    pub fn add_account_data(&mut self, event: AnyBasicEvent) {
+        self.account_data
+            .insert(event.content().event_type().to_owned(), event);
+    }
+
+    pub fn add_room_account_data(&mut self, room_id: &RoomId, event: AnyBasicEvent) {
+        self.room_account_data
+            .entry(room_id.to_owned())
+            .or_insert_with(BTreeMap::new)
+            .insert(event.content().event_type().to_owned(), event);
+    }
+
+    pub fn add_stripped_state_event(&mut self, room_id: &RoomId, event: AnyStrippedStateEvent) {
+        self.stripped_state
+            .entry(room_id.to_owned())
+            .or_insert_with(BTreeMap::new)
+            .entry(event.content().event_type().to_string())
+            .or_insert_with(BTreeMap::new)
+            .insert(event.state_key().to_string(), event);
+    }
+
+    pub fn add_stripped_member(&mut self, room_id: &RoomId, event: StrippedMemberEvent) {
+        let user_id = event.state_key.clone();
+
+        self.stripped_members
+            .entry(room_id.to_owned())
+            .or_insert_with(BTreeMap::new)
+            .insert(user_id, event);
+    }
+
+    pub fn add_state_event(&mut self, room_id: &RoomId, event: AnySyncStateEvent) {
+        self.state
+            .entry(room_id.to_owned())
+            .or_insert_with(BTreeMap::new)
+            .entry(event.content().event_type().to_string())
+            .or_insert_with(BTreeMap::new)
+            .insert(event.state_key().to_string(), event);
+    }
+}
diff --git a/matrix_sdk_base/src/store.rs b/matrix_sdk_base/src/store/sled_store.rs
similarity index 65%
rename from matrix_sdk_base/src/store.rs
rename to matrix_sdk_base/src/store/sled_store.rs
index 9c6ead4b..bdfd7b66 100644
--- a/matrix_sdk_base/src/store.rs
+++ b/matrix_sdk_base/src/store/sled_store.rs
@@ -1,17 +1,27 @@
-use std::{
-    collections::BTreeMap, convert::TryFrom, ops::Deref, path::Path, sync::Arc, time::SystemTime,
-};
+// Copyright 2021 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.
 
-use dashmap::DashMap;
-use futures::stream::{self, Stream, StreamExt};
+use std::{convert::TryFrom, path::Path, time::SystemTime};
+
+use futures::stream::{self, Stream};
 use matrix_sdk_common::{
     events::{
         presence::PresenceEvent,
         room::member::{MemberEventContent, MembershipState},
-        AnyBasicEvent, AnyStrippedStateEvent, AnySyncStateEvent, EventContent, EventType,
+        AnySyncStateEvent, EventContent, EventType,
     },
     identifiers::{RoomId, UserId},
-    locks::RwLock,
 };
 
 use sled::{
@@ -20,159 +30,9 @@ use sled::{
 };
 use tracing::info;
 
-use crate::{
-    deserialized_responses::{MemberEvent, StrippedMemberEvent},
-    rooms::{RoomInfo, RoomType, StrippedRoom},
-    InvitedRoom, JoinedRoom, LeftRoom, Room, RoomState, Session,
-};
+use crate::deserialized_responses::MemberEvent;
 
-#[derive(Debug, thiserror::Error)]
-pub enum StoreError {
-    #[error(transparent)]
-    Sled(#[from] sled::Error),
-    #[error(transparent)]
-    Json(#[from] serde_json::Error),
-    #[error(transparent)]
-    Identifier(#[from] matrix_sdk_common::identifiers::Error),
-}
-
-impl From<TransactionError<serde_json::Error>> for StoreError {
-    fn from(e: TransactionError<serde_json::Error>) -> Self {
-        match e {
-            TransactionError::Abort(e) => Self::Json(e),
-            TransactionError::Storage(e) => Self::Sled(e),
-        }
-    }
-}
-
-/// A `StateStore` specific result type.
-pub type Result<T> = std::result::Result<T, StoreError>;
-
-#[derive(Debug, Clone)]
-pub struct Store {
-    inner: SledStore,
-    session: Arc<RwLock<Option<Session>>>,
-    sync_token: Arc<RwLock<Option<String>>>,
-    rooms: Arc<DashMap<RoomId, Room>>,
-    stripped_rooms: Arc<DashMap<RoomId, StrippedRoom>>,
-}
-
-impl Store {
-    pub fn new(
-        session: Arc<RwLock<Option<Session>>>,
-        sync_token: Arc<RwLock<Option<String>>>,
-        inner: SledStore,
-    ) -> Self {
-        Self {
-            inner,
-            session,
-            sync_token,
-            rooms: DashMap::new().into(),
-            stripped_rooms: DashMap::new().into(),
-        }
-    }
-
-    pub(crate) async fn restore_session(&self, session: Session) -> Result<()> {
-        let mut infos = self.inner.get_room_infos().await;
-
-        // TODO restore stripped rooms.
-        while let Some(info) = infos.next().await {
-            let room = Room::restore(&session.user_id, self.inner.clone(), info?);
-            self.rooms.insert(room.room_id().to_owned(), room);
-        }
-
-        let token = self.get_sync_token().await?;
-
-        *self.sync_token.write().await = token;
-        *self.session.write().await = Some(session);
-
-        Ok(())
-    }
-
-    pub fn open_default(path: impl AsRef<Path>) -> Result<Self> {
-        let inner = SledStore::open_with_path(path)?;
-        Ok(Self::new(
-            Arc::new(RwLock::new(None)),
-            Arc::new(RwLock::new(None)),
-            inner,
-        ))
-    }
-
-    pub(crate) fn get_bare_room(&self, room_id: &RoomId) -> Option<Room> {
-        #[allow(clippy::map_clone)]
-        self.rooms.get(room_id).map(|r| r.clone())
-    }
-
-    pub fn get_rooms(&self) -> Vec<RoomState> {
-        self.rooms
-            .iter()
-            .filter_map(|r| self.get_room(r.key()))
-            .collect()
-    }
-
-    pub fn get_joined_room(&self, room_id: &RoomId) -> Option<JoinedRoom> {
-        self.get_room(room_id).map(|r| r.joined()).flatten()
-    }
-
-    pub fn get_invited_room(&self, room_id: &RoomId) -> Option<InvitedRoom> {
-        self.get_room(room_id).map(|r| r.invited()).flatten()
-    }
-
-    pub fn get_left_room(&self, room_id: &RoomId) -> Option<LeftRoom> {
-        self.get_room(room_id).map(|r| r.left()).flatten()
-    }
-
-    pub fn get_room(&self, room_id: &RoomId) -> Option<RoomState> {
-        self.get_bare_room(room_id)
-            .map(|r| match r.room_type() {
-                RoomType::Joined => Some(RoomState::Joined(JoinedRoom { inner: r })),
-                RoomType::Left => Some(RoomState::Left(LeftRoom { inner: r })),
-                RoomType::Invited => self
-                    .get_stripped_room(room_id)
-                    .map(|r| RoomState::Invited(InvitedRoom { inner: r })),
-            })
-            .flatten()
-    }
-
-    fn get_stripped_room(&self, room_id: &RoomId) -> Option<StrippedRoom> {
-        #[allow(clippy::map_clone)]
-        self.stripped_rooms.get(room_id).map(|r| r.clone())
-    }
-
-    pub(crate) async fn get_or_create_stripped_room(&self, room_id: &RoomId) -> StrippedRoom {
-        let session = self.session.read().await;
-        let user_id = &session
-            .as_ref()
-            .expect("Creating room while not being logged in")
-            .user_id;
-
-        self.stripped_rooms
-            .entry(room_id.clone())
-            .or_insert_with(|| StrippedRoom::new(user_id, self.inner.clone(), room_id))
-            .clone()
-    }
-
-    pub(crate) async fn get_or_create_room(&self, room_id: &RoomId, room_type: RoomType) -> Room {
-        let session = self.session.read().await;
-        let user_id = &session
-            .as_ref()
-            .expect("Creating room while not being logged in")
-            .user_id;
-
-        self.rooms
-            .entry(room_id.clone())
-            .or_insert_with(|| Room::new(user_id, self.inner.clone(), room_id, room_type))
-            .clone()
-    }
-}
-
-impl Deref for Store {
-    type Target = SledStore;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
+use super::{Result, RoomInfo, StateChanges, StoreError};
 
 #[derive(Debug, Clone)]
 pub struct SledStore {
@@ -192,81 +52,6 @@ pub struct SledStore {
     presence: Tree,
 }
 
-#[derive(Debug, Default)]
-pub struct StateChanges {
-    pub sync_token: Option<String>,
-    pub session: Option<Session>,
-    pub account_data: BTreeMap<String, AnyBasicEvent>,
-    pub presence: BTreeMap<UserId, PresenceEvent>,
-
-    pub members: BTreeMap<RoomId, BTreeMap<UserId, MemberEvent>>,
-    pub profiles: BTreeMap<RoomId, BTreeMap<UserId, MemberEventContent>>,
-    pub state: BTreeMap<RoomId, BTreeMap<String, BTreeMap<String, AnySyncStateEvent>>>,
-    pub room_account_data: BTreeMap<RoomId, BTreeMap<String, AnyBasicEvent>>,
-    pub room_infos: BTreeMap<RoomId, RoomInfo>,
-
-    pub stripped_state: BTreeMap<RoomId, BTreeMap<String, BTreeMap<String, AnyStrippedStateEvent>>>,
-    pub stripped_members: BTreeMap<RoomId, BTreeMap<UserId, StrippedMemberEvent>>,
-    pub invited_room_info: BTreeMap<RoomId, RoomInfo>,
-}
-
-impl StateChanges {
-    pub fn new(sync_token: String) -> Self {
-        Self {
-            sync_token: Some(sync_token),
-            ..Default::default()
-        }
-    }
-
-    pub fn add_presence_event(&mut self, event: PresenceEvent) {
-        self.presence.insert(event.sender.clone(), event);
-    }
-
-    pub fn add_room(&mut self, room: RoomInfo) {
-        self.room_infos
-            .insert(room.room_id.as_ref().to_owned(), room);
-    }
-
-    pub fn add_account_data(&mut self, event: AnyBasicEvent) {
-        self.account_data
-            .insert(event.content().event_type().to_owned(), event);
-    }
-
-    pub fn add_room_account_data(&mut self, room_id: &RoomId, event: AnyBasicEvent) {
-        self.room_account_data
-            .entry(room_id.to_owned())
-            .or_insert_with(BTreeMap::new)
-            .insert(event.content().event_type().to_owned(), event);
-    }
-
-    pub fn add_stripped_state_event(&mut self, room_id: &RoomId, event: AnyStrippedStateEvent) {
-        self.stripped_state
-            .entry(room_id.to_owned())
-            .or_insert_with(BTreeMap::new)
-            .entry(event.content().event_type().to_string())
-            .or_insert_with(BTreeMap::new)
-            .insert(event.state_key().to_string(), event);
-    }
-
-    pub fn add_stripped_member(&mut self, room_id: &RoomId, event: StrippedMemberEvent) {
-        let user_id = event.state_key.clone();
-
-        self.stripped_members
-            .entry(room_id.to_owned())
-            .or_insert_with(BTreeMap::new)
-            .insert(user_id, event);
-    }
-
-    pub fn add_state_event(&mut self, room_id: &RoomId, event: AnySyncStateEvent) {
-        self.state
-            .entry(room_id.to_owned())
-            .or_insert_with(BTreeMap::new)
-            .entry(event.content().event_type().to_string())
-            .or_insert_with(BTreeMap::new)
-            .insert(event.state_key().to_string(), event);
-    }
-}
-
 impl SledStore {
     fn open_helper(db: Db) -> Result<Self> {
         let session = db.open_tree("session")?;