diff --git a/src/application/applicationView.nim b/src/app/application/applicationView.nim
similarity index 100%
rename from src/application/applicationView.nim
rename to src/app/application/applicationView.nim
diff --git a/src/chat/chatView.nim b/src/app/chat/chatView.nim
similarity index 100%
rename from src/chat/chatView.nim
rename to src/app/chat/chatView.nim
diff --git a/src/chat/core.nim b/src/app/chat/core.nim
similarity index 96%
rename from src/chat/core.nim
rename to src/app/chat/core.nim
index 17042f11f1..d720d0ffd1 100644
--- a/src/chat/core.nim
+++ b/src/app/chat/core.nim
@@ -1,5 +1,5 @@
 import NimQml
-import "../status/chat" as status_chat
+import "../../status/chat" as status_chat
 import chatView
 
 var sendMessage = proc (msg: string): string =
diff --git a/src/node/core.nim b/src/app/node/core.nim
similarity index 93%
rename from src/node/core.nim
rename to src/app/node/core.nim
index 4273c96265..01091ac29d 100644
--- a/src/node/core.nim
+++ b/src/app/node/core.nim
@@ -1,5 +1,5 @@
 import NimQml
-import "../status/core" as status
+import "../../status/core" as status
 import nodeView
 
 type NodeController* = ref object
diff --git a/src/node/nodeView.nim b/src/app/node/nodeView.nim
similarity index 100%
rename from src/node/nodeView.nim
rename to src/app/node/nodeView.nim
diff --git a/src/wallet/core.nim b/src/app/wallet/core.nim
similarity index 96%
rename from src/wallet/core.nim
rename to src/app/wallet/core.nim
index af9c7306d7..e9aad143e1 100644
--- a/src/wallet/core.nim
+++ b/src/app/wallet/core.nim
@@ -3,7 +3,7 @@ import strformat
 import strutils
 
 import walletView
-import ../status/wallet as status_wallet
+import ../../status/wallet as status_wallet
 
 type WalletController* = ref object
   view*: WalletView
diff --git a/src/wallet/walletView.nim b/src/app/wallet/walletView.nim
similarity index 100%
rename from src/wallet/walletView.nim
rename to src/app/wallet/walletView.nim
diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index 2c3c5f5644..f56630e3e0 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -1,8 +1,8 @@
 import NimQml
-import application/applicationView
-import chat/core as chat
-import wallet/core as wallet
-import node/core as node
+import app/application/applicationView
+import app/chat/core as chat
+import app/wallet/core as wallet
+import app/node/core as node
 import state
 
 import status/core as status
diff --git a/src/state.nim b/src/state.nim
index 3def0bd2fa..7c68ce277b 100644
--- a/src/state.nim
+++ b/src/state.nim
@@ -2,7 +2,7 @@ import status/types
 import tables
 
 ##########################################################
-## warning: this section is still very much in flux
+## warning: this file is still very much in flux
 ##########################################################
 
 type