diff --git a/src/main.js b/src/main.js
index 9ea71599..d7bd015e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
-import HomeServerApi from "./hs-api.js";
-import Session from "./session.js";
-import createIdbStorage from "./storage/idb/create.js";
-import Sync from "./sync.js";
+import HomeServerApi from "./matrix/hs-api.js";
+import Session from "./matrix/session.js";
+import createIdbStorage from "./matrix/storage/idb/create.js";
+import Sync from "./matrix/sync.js";
 
 const HOST = "localhost";
 const HOMESERVER = `http://${HOST}:8008`;
diff --git a/src/error.js b/src/matrix/error.js
similarity index 100%
rename from src/error.js
rename to src/matrix/error.js
diff --git a/src/hs-api.js b/src/matrix/hs-api.js
similarity index 100%
rename from src/hs-api.js
rename to src/matrix/hs-api.js
diff --git a/src/room/persister.js b/src/matrix/room/persister.js
similarity index 100%
rename from src/room/persister.js
rename to src/matrix/room/persister.js
diff --git a/src/room/room.js b/src/matrix/room/room.js
similarity index 100%
rename from src/room/room.js
rename to src/matrix/room/room.js
diff --git a/src/room/summary.js b/src/matrix/room/summary.js
similarity index 100%
rename from src/room/summary.js
rename to src/matrix/room/summary.js
diff --git a/src/session.js b/src/matrix/session.js
similarity index 100%
rename from src/session.js
rename to src/matrix/session.js
diff --git a/src/storage/idb/create.js b/src/matrix/storage/idb/create.js
similarity index 100%
rename from src/storage/idb/create.js
rename to src/matrix/storage/idb/create.js
diff --git a/src/storage/idb/query-target.js b/src/matrix/storage/idb/query-target.js
similarity index 100%
rename from src/storage/idb/query-target.js
rename to src/matrix/storage/idb/query-target.js
diff --git a/src/storage/idb/storage.js b/src/matrix/storage/idb/storage.js
similarity index 100%
rename from src/storage/idb/storage.js
rename to src/matrix/storage/idb/storage.js
diff --git a/src/storage/idb/store.js b/src/matrix/storage/idb/store.js
similarity index 100%
rename from src/storage/idb/store.js
rename to src/matrix/storage/idb/store.js
diff --git a/src/storage/idb/stores/RoomStateStore.js b/src/matrix/storage/idb/stores/RoomStateStore.js
similarity index 100%
rename from src/storage/idb/stores/RoomStateStore.js
rename to src/matrix/storage/idb/stores/RoomStateStore.js
diff --git a/src/storage/idb/stores/RoomSummaryStore.js b/src/matrix/storage/idb/stores/RoomSummaryStore.js
similarity index 100%
rename from src/storage/idb/stores/RoomSummaryStore.js
rename to src/matrix/storage/idb/stores/RoomSummaryStore.js
diff --git a/src/storage/idb/stores/RoomTimelineStore.js b/src/matrix/storage/idb/stores/RoomTimelineStore.js
similarity index 100%
rename from src/storage/idb/stores/RoomTimelineStore.js
rename to src/matrix/storage/idb/stores/RoomTimelineStore.js
diff --git a/src/storage/idb/stores/SessionStore.js b/src/matrix/storage/idb/stores/SessionStore.js
similarity index 100%
rename from src/storage/idb/stores/SessionStore.js
rename to src/matrix/storage/idb/stores/SessionStore.js
diff --git a/src/storage/idb/stores/member.js b/src/matrix/storage/idb/stores/member.js
similarity index 100%
rename from src/storage/idb/stores/member.js
rename to src/matrix/storage/idb/stores/member.js
diff --git a/src/storage/idb/transaction.js b/src/matrix/storage/idb/transaction.js
similarity index 100%
rename from src/storage/idb/transaction.js
rename to src/matrix/storage/idb/transaction.js
diff --git a/src/storage/idb/utils.js b/src/matrix/storage/idb/utils.js
similarity index 100%
rename from src/storage/idb/utils.js
rename to src/matrix/storage/idb/utils.js
diff --git a/src/storage/sortkey.js b/src/matrix/storage/sortkey.js
similarity index 100%
rename from src/storage/sortkey.js
rename to src/matrix/storage/sortkey.js
diff --git a/src/sync.js b/src/matrix/sync.js
similarity index 98%
rename from src/sync.js
rename to src/matrix/sync.js
index b37b0f1b..538fb8ec 100644
--- a/src/sync.js
+++ b/src/matrix/sync.js
@@ -3,7 +3,7 @@ import {
 	HomeServerError,
 	StorageError
 } from "./error.js";
-import EventEmitter from "./event-emitter.js";
+import EventEmitter from "../event-emitter.js";
 
 const INCREMENTAL_TIMEOUT = 30000;
 const SYNC_EVENT_LIMIT = 10;