diff --git a/src/chats.nim b/src/chat/chatView.nim
similarity index 97%
rename from src/chats.nim
rename to src/chat/chatView.nim
index aad70314f4..476b6f5e28 100644
--- a/src/chats.nim
+++ b/src/chat/chatView.nim
@@ -1,6 +1,6 @@
 import NimQml
 import Tables
-import chat/core as chat
+import core as chat
 
 type
   RoleNames {.pure.} = enum
diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index 7d1cb1c4f8..8b7ff5ef03 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -1,7 +1,7 @@
 import NimQml
 import applicationView
-import chats
-import assets
+import chat/chatView
+import wallet/assetsView
 import json
 import state
 import status/utils
@@ -71,8 +71,6 @@ proc mainProc() =
   let chatsVariant = newQVariant(chatsModel)
   defer: chatsVariant.delete
 
-
-
   appState.subscribe(proc () =
     chatsModel.names = @[]
     for channel in appState.channels:
diff --git a/src/assets.nim b/src/wallet/assetsView.nim
similarity index 100%
rename from src/assets.nim
rename to src/wallet/assetsView.nim