diff --git a/src/Tabs/messageTab.tsx b/src/Tabs/messageTab.tsx
index 217088b3..3f971d40 100644
--- a/src/Tabs/messageTab.tsx
+++ b/src/Tabs/messageTab.tsx
@@ -2,10 +2,10 @@ import * as React from "bloatless-react";
 
 import { closeChatView, isShowingChatTools, selectedChat, toggleChatTools } from "../Model/model";
 
-import { ChatOptionModal } from "../Views/chatOptionModal";
-import { ChatToolView } from "../Views/chatToolView";
-import { MessageComposer } from "../Views/messageComposer";
-import { ThreadView } from "../Views/threadView";
+import { ChatOptionModal } from "../Views/Chat/chatOptionModal";
+import { ChatToolView } from "../Views/Chat/chatToolView";
+import { MessageComposer } from "../Views/Chat/messageComposer";
+import { ThreadView } from "../Views/Chat/threadView";
 import { translation } from "../translations";
 
 export function MessageTab() {
diff --git a/src/Tabs/overviewTab.tsx b/src/Tabs/overviewTab.tsx
index e94b48ee..dfe8a2dd 100644
--- a/src/Tabs/overviewTab.tsx
+++ b/src/Tabs/overviewTab.tsx
@@ -2,9 +2,9 @@ import * as React from "bloatless-react";
 
 import { isConnected, isEncryptionAvailable } from "../Model/model";
 
-import { ChatListSection } from "../Views/chatListSection";
-import { ConnectionSection } from "../Views/connectionSection";
-import { PersonalSection } from "../Views/personalSection";
+import { ChatListSection } from "../Views/Overview/chatListSection";
+import { ConnectionSection } from "../Views/Overview/connectionSection";
+import { PersonalSection } from "../Views/Overview/personalSection";
 import { translation } from "../translations";
 
 export function OverviewTab() {
diff --git a/src/Views/chatOptionModal.tsx b/src/Views/Chat/chatOptionModal.tsx
similarity index 96%
rename from src/Views/chatOptionModal.tsx
rename to src/Views/Chat/chatOptionModal.tsx
index 93630f9b..cecaa584 100644
--- a/src/Views/chatOptionModal.tsx
+++ b/src/Views/Chat/chatOptionModal.tsx
@@ -1,8 +1,8 @@
 import * as React from "bloatless-react";
 
-import { Chat } from "../Model/chatModel";
-import { closeChatView } from "../Model/model";
-import { translation } from "../translations";
+import { Chat } from "../../Model/chatModel";
+import { closeChatView } from "../../Model/model";
+import { translation } from "../../translations";
 
 export function ChatOptionModal(chat: Chat, isPresented: React.State<boolean>) {
   function closeModal() {
diff --git a/src/Views/chatToolView.tsx b/src/Views/Chat/chatToolView.tsx
similarity index 83%
rename from src/Views/chatToolView.tsx
rename to src/Views/Chat/chatToolView.tsx
index 5ebf2585..c480a08d 100644
--- a/src/Views/chatToolView.tsx
+++ b/src/Views/Chat/chatToolView.tsx
@@ -1,8 +1,8 @@
 import * as React from "bloatless-react";
 
-import { Chat, Item } from "../Model/chatModel";
+import { Chat, Item } from "../../Model/chatModel";
 
-import { translation } from "../translations";
+import { translation } from "../../translations";
 
 export function ChatToolView(chat: Chat) {
   function createItem() {
diff --git a/src/Views/messageComposer.tsx b/src/Views/Chat/messageComposer.tsx
similarity index 86%
rename from src/Views/messageComposer.tsx
rename to src/Views/Chat/messageComposer.tsx
index 8d2e281c..61b839ca 100644
--- a/src/Views/messageComposer.tsx
+++ b/src/Views/Chat/messageComposer.tsx
@@ -1,7 +1,7 @@
 import * as React from "bloatless-react";
 
-import { Chat } from "../Model/chatModel";
-import { translation } from "../translations";
+import { Chat } from "../../Model/chatModel";
+import { translation } from "../../translations";
 
 export function MessageComposer(chat: Chat) {
   return (
diff --git a/src/Views/threadView.tsx b/src/Views/Chat/threadView.tsx
similarity index 96%
rename from src/Views/threadView.tsx
rename to src/Views/Chat/threadView.tsx
index 72bb5ca1..0c7ce983 100644
--- a/src/Views/threadView.tsx
+++ b/src/Views/Chat/threadView.tsx
@@ -1,9 +1,9 @@
 import * as React from "bloatless-react";
 
-import { Chat, ChatMessage } from "../Model/chatModel";
+import { Chat, ChatMessage } from "../../Model/chatModel";
 
-import { isShowingChatTools } from "../Model/model";
-import { translation } from "../translations";
+import { isShowingChatTools } from "../../Model/model";
+import { translation } from "../../translations";
 
 export function ThreadView(chat: Chat) {
   const messageConverter: React.StateItemConverter<ChatMessage> = (message) => {
diff --git a/src/Views/chatListSection.tsx b/src/Views/Overview/chatListSection.tsx
similarity index 92%
rename from src/Views/chatListSection.tsx
rename to src/Views/Overview/chatListSection.tsx
index 123dab3a..3e57b4bc 100644
--- a/src/Views/chatListSection.tsx
+++ b/src/Views/Overview/chatListSection.tsx
@@ -7,10 +7,10 @@ import {
   newChatName,
   selectChat,
   selectedChat,
-} from "../Model/model";
+} from "../../Model/model";
 
-import { Chat } from "../Model/chatModel";
-import { translation } from "../translations";
+import { Chat } from "../../Model/chatModel";
+import { translation } from "../../translations";
 
 const chatConverter: React.StateItemConverter<Chat> = (chat) => {
   function select() {
diff --git a/src/Views/connectionSection.tsx b/src/Views/Overview/connectionSection.tsx
similarity index 97%
rename from src/Views/connectionSection.tsx
rename to src/Views/Overview/connectionSection.tsx
index 6bb22e64..5df139ac 100644
--- a/src/Views/connectionSection.tsx
+++ b/src/Views/Overview/connectionSection.tsx
@@ -13,9 +13,9 @@ import {
   requestMailbox,
   resetAddressInput,
   serverAddressInput,
-} from "../Model/model";
+} from "../../Model/model";
 
-import { translation } from "../translations";
+import { translation } from "../../translations";
 
 const addressConverter: React.StateItemConverter<string> = (address) => {
   return <option>{address}</option>;
diff --git a/src/Views/personalSection.tsx b/src/Views/Overview/personalSection.tsx
similarity index 81%
rename from src/Views/personalSection.tsx
rename to src/Views/Overview/personalSection.tsx
index 8fe8db75..cab91625 100644
--- a/src/Views/personalSection.tsx
+++ b/src/Views/Overview/personalSection.tsx
@@ -1,7 +1,7 @@
 import * as React from "bloatless-react";
 
-import { senderName } from "../Model/model";
-import { translation } from "../translations";
+import { senderName } from "../../Model/model";
+import { translation } from "../../translations";
 
 export function PersonalSection() {
   return (