diff --git a/src/ui/viewmodels/SessionViewModel.js b/src/domain/session/SessionViewModel.js
similarity index 89%
rename from src/ui/viewmodels/SessionViewModel.js
rename to src/domain/session/SessionViewModel.js
index 470ee517..03a985ce 100644
--- a/src/ui/viewmodels/SessionViewModel.js
+++ b/src/domain/session/SessionViewModel.js
@@ -1,6 +1,6 @@
 import EventEmitter from "../../EventEmitter.js";
-import RoomTileViewModel from "./RoomTileViewModel.js";
-import RoomViewModel from "./RoomViewModel.js";
+import RoomTileViewModel from "./roomlist/RoomTileViewModel.js";
+import RoomViewModel from "./room/RoomViewModel.js";
 
 export default class SessionViewModel extends EventEmitter {
     constructor(session) {
diff --git a/src/ui/viewmodels/RoomViewModel.js b/src/domain/session/room/RoomViewModel.js
similarity index 94%
rename from src/ui/viewmodels/RoomViewModel.js
rename to src/domain/session/room/RoomViewModel.js
index bc75dea6..cec084b7 100644
--- a/src/ui/viewmodels/RoomViewModel.js
+++ b/src/domain/session/room/RoomViewModel.js
@@ -1,4 +1,4 @@
-import EventEmitter from "../../EventEmitter.js";
+import EventEmitter from "../../../EventEmitter.js";
 
 export default class RoomViewModel extends EventEmitter {
     constructor(room) {
diff --git a/src/ui/viewmodels/RoomTileViewModel.js b/src/domain/session/roomlist/RoomTileViewModel.js
similarity index 100%
rename from src/ui/viewmodels/RoomTileViewModel.js
rename to src/domain/session/roomlist/RoomTileViewModel.js
diff --git a/src/main.js b/src/main.js
index 7c165d73..96d38873 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,7 @@ import Session from "./matrix/session.js";
 import createIdbStorage from "./matrix/storage/idb/create.js";
 import Sync from "./matrix/sync.js";
 import SessionView from "./ui/web/SessionView.js";
-import SessionViewModel from "./ui/viewmodels/SessionViewModel.js";
+import SessionViewModel from "./domain/session/SessionViewModel.js";
 
 const HOST = "localhost";
 const HOMESERVER = `http://${HOST}:8008`;