From 480ad52f60cadecb23673d20201cb4551bf19932 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Tue, 7 Dec 2021 14:43:39 +0200
Subject: [PATCH] Merge together SwiftUI template model files and update folder
 structure.

---
 .../TemplateUserProfileCoordinator.swift      |  34 ++---
 ...lateUserProfileCoordinatorParameters.swift |  21 ---
 .../MockTemplateUserProfileScreenState.swift  |   0
 .../TemplateUserProfileStateAction.swift      |  22 ----
 .../Model/TemplateUserProfileViewAction.swift |  24 ----
 .../TemplateUserProfileViewModelResult.swift  |  22 ----
 .../Model/TemplateUserProfileViewState.swift  |  24 ----
 ....swift => TemplateUserProfileModels.swift} |  34 ++++-
 .../TemplateUserProfileViewModel.swift        |   2 -
 ...TemplateUserProfileViewModelProtocol.swift |   0
 .../TemplateRoomChatCoordinator.swift         |  34 ++---
 ...emplateRoomChatCoordinatorParamaters.swift |  21 ---
 .../MockTemplateRoomChatScreenState.swift     |   1 -
 .../Model/TemplateRoomChatBubble.swift        |  26 ----
 .../TemplateRoomChatBubbleImageContent.swift  |  24 ----
 .../Model/TemplateRoomChatBubbleItem.swift    |  28 ----
 .../TemplateRoomChatBubbleItemContent.swift   |  23 ----
 .../Model/TemplateRoomChatMember.swift        |  36 ------
 .../Model/TemplateRoomChatMessage.swift       |  27 ----
 .../TemplateRoomChatMessageContent.swift      |  25 ----
 .../TemplateRoomChatMessageTextContent.swift  |  25 ----
 ...lateRoomChatRoomInitializationStatus.swift |  23 ----
 .../Model/TemplateRoomChatStateAction.swift   |  24 ----
 .../Model/TemplateRoomChatViewAction.swift    |  23 ----
 .../TemplateRoomChatViewModelAction.swift     |  22 ----
 .../TemplateRoomChatViewModelBindings.swift   |  22 ----
 .../Model/TemplateRoomChatViewState.swift     |  32 -----
 .../TemplateRoomChatModels.swift              | 122 ++++++++++++++++++
 .../TemplateRoomChatViewModel.swift           |   0
 .../TemplateRoomChatViewModelProtocol.swift   |   0
 .../TemplateRoomListCoordinator.swift         |  34 ++---
 ...emplateRoomListCoordinatorParamaters.swift |  21 ---
 .../MockTemplateRoomListScreenState.swift     |   0
 .../TemplateRoomListCoordinatorAction.swift   |  23 ----
 .../Model/TemplateRoomListRoom.swift          |  25 ----
 .../Model/TemplateRoomListStateAction.swift   |  22 ----
 .../Model/TemplateRoomListViewAction.swift    |  23 ----
 .../TemplateRoomListViewModelAction.swift     |  23 ----
 ...ate.swift => TemplateRoomListModels.swift} |  35 +++++
 .../TemplateRoomListViewModel.swift           |   0
 .../TemplateRoomListViewModelProtocol.swift   |   0
 Tools/Templates/createSwiftUISingleScreen.sh  |   3 -
 Tools/Templates/createSwiftUITwoScreen.sh     |   6 -
 43 files changed, 244 insertions(+), 692 deletions(-)
 delete mode 100644 RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinatorParameters.swift
 rename RiotSwiftUI/Modules/Template/SimpleUserProfileExample/{Service/Mock => }/MockTemplateUserProfileScreenState.swift (100%)
 delete mode 100644 RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileStateAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewModelResult.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
 rename RiotSwiftUI/Modules/Template/SimpleUserProfileExample/{Model/TemplateUserProfilePresence.swift => TemplateUserProfileModels.swift} (60%)
 rename RiotSwiftUI/Modules/Template/SimpleUserProfileExample/{ViewModel => }/TemplateUserProfileViewModel.swift (99%)
 rename RiotSwiftUI/Modules/Template/SimpleUserProfileExample/{ViewModel => }/TemplateUserProfileViewModelProtocol.swift (100%)
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/{Service/Mock => }/MockTemplateRoomChatScreenState.swift (99%)
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
 create mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatModels.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/{ViewModel => }/TemplateRoomChatViewModel.swift (100%)
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/{ViewModel => }/TemplateRoomChatViewModelProtocol.swift (100%)
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/{Service/Mock => }/MockTemplateRoomListScreenState.swift (100%)
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
 delete mode 100644 RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/{Model/TemplateRoomListViewState.swift => TemplateRoomListModels.swift} (50%)
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/{ViewModel => }/TemplateRoomListViewModel.swift (100%)
 rename RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/{ViewModel => }/TemplateRoomListViewModelProtocol.swift (100%)

diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
index 02874dee9..190d12a9f 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinator.swift
@@ -1,23 +1,27 @@
-/*
- Copyright 2021 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 
 import Foundation
 import UIKit
 import SwiftUI
 
+struct TemplateUserProfileCoordinatorParameters {
+    let session: MXSession
+}
+
 final class TemplateUserProfileCoordinator: Coordinator {
     
     // MARK: - Properties
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinatorParameters.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinatorParameters.swift
deleted file mode 100644
index 7f162ce38..000000000
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Coordinator/TemplateUserProfileCoordinatorParameters.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-struct TemplateUserProfileCoordinatorParameters {
-    let session: MXSession
-}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/MockTemplateUserProfileScreenState.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Service/Mock/MockTemplateUserProfileScreenState.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/MockTemplateUserProfileScreenState.swift
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileStateAction.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileStateAction.swift
deleted file mode 100644
index f0695826b..000000000
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileStateAction.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-enum TemplateUserProfileStateAction {
-    case viewAction(TemplateUserProfileViewAction)
-    case updatePresence(TemplateUserProfilePresence)
-}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewAction.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewAction.swift
deleted file mode 100644
index 69d45742f..000000000
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewAction.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-enum TemplateUserProfileViewAction {
-    case incrementCount
-    case decrementCount
-    case cancel
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewModelResult.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewModelResult.swift
deleted file mode 100644
index 2c2965f5b..000000000
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewModelResult.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-enum TemplateUserProfileViewModelResult {
-    case cancel
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
deleted file mode 100644
index 7f78fc8d5..000000000
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfileViewState.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-struct TemplateUserProfileViewState: BindableState {
-    let avatar: AvatarInputProtocol?
-    let displayName: String?
-    var presence: TemplateUserProfilePresence
-    var count: Int
-}
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfilePresence.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileModels.swift
similarity index 60%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfilePresence.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileModels.swift
index c2d61aaea..62e4c895c 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/Model/TemplateUserProfilePresence.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileModels.swift
@@ -16,13 +16,17 @@
 
 import Foundation
 
+// MARK: - Coordinator
+
 enum TemplateUserProfilePresence {
     case online
     case idle
     case offline
 }
 
-extension TemplateUserProfilePresence {
+extension TemplateUserProfilePresence: Identifiable, CaseIterable {
+    var id: Self { self }
+    
     var title: String {
         switch self {
         case .online:
@@ -35,8 +39,30 @@ extension TemplateUserProfilePresence {
     }
 }
 
-extension TemplateUserProfilePresence: CaseIterable { }
+// MARK: View model
 
-extension TemplateUserProfilePresence: Identifiable {
-    var id: Self { self }
+enum TemplateUserProfileStateAction {
+    case viewAction(TemplateUserProfileViewAction)
+    case updatePresence(TemplateUserProfilePresence)
+}
+
+enum TemplateUserProfileViewModelResult {
+    case cancel
+    case done
+}
+
+// MARK: View
+
+struct TemplateUserProfileViewState: BindableState {
+    let avatar: AvatarInputProtocol?
+    let displayName: String?
+    var presence: TemplateUserProfilePresence
+    var count: Int
+}
+
+enum TemplateUserProfileViewAction {
+    case incrementCount
+    case decrementCount
+    case cancel
+    case done
 }
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModel.swift
similarity index 99%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModel.swift
index 604665f3c..e476b467e 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModel.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModel.swift
@@ -17,8 +17,6 @@
 import SwiftUI
 import Combine
 
-
-
 @available(iOS 14, *)
 typealias TemplateUserProfileViewModelType = StateStoreViewModel<TemplateUserProfileViewState,
                                                                  TemplateUserProfileStateAction,
diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModelProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/SimpleUserProfileExample/ViewModel/TemplateUserProfileViewModelProtocol.swift
rename to RiotSwiftUI/Modules/Template/SimpleUserProfileExample/TemplateUserProfileViewModelProtocol.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
index 33f27e14a..feef94130 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinator.swift
@@ -1,23 +1,27 @@
-/*
- Copyright 2021 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 
 import Foundation
 import UIKit
 import SwiftUI
 
+struct TemplateRoomChatCoordinatorParameters {
+    let room: MXRoom
+}
+
 final class TemplateRoomChatCoordinator: Coordinator, Presentable {
     
     // MARK: - Properties
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
deleted file mode 100644
index ed6db9cb0..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Coordinator/TemplateRoomChatCoordinatorParamaters.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-struct TemplateRoomChatCoordinatorParameters {
- let room: MXRoom
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/MockTemplateRoomChatScreenState.swift
similarity index 99%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/MockTemplateRoomChatScreenState.swift
index 3a3fad18d..925c5c614 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/Mock/MockTemplateRoomChatScreenState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/MockTemplateRoomChatScreenState.swift
@@ -17,7 +17,6 @@
 import Foundation
 import SwiftUI
 
-
 /// Using an enum for the screen allows you define the different state cases with
 /// the relevant associated data for each case.
 @available(iOS 14.0, *)
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
deleted file mode 100644
index ed9b4b5f1..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubble.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Represents a grouped bubble in the View(For example multiple message of different time sent close together).
-struct TemplateRoomChatBubble {
-    let id: String
-    let sender: TemplateRoomChatMember
-    var items: [TemplateRoomChatBubbleItem]
-}
-
-extension TemplateRoomChatBubble: Identifiable, Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
deleted file mode 100644
index 2a9eda6f8..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleImageContent.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import UIKit
-
-/// An image sent as a message.
-struct TemplateRoomChatMessageImageContent {
-    var image: UIImage
-}
-
-extension TemplateRoomChatMessageImageContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
deleted file mode 100644
index 9d8809917..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItem.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import UIKit
-
-/// One of the items grouped within a bubble(could be message types like text, image or video, or could be other items like url previews).
-struct TemplateRoomChatBubbleItem {
-    let id: String
-    var timestamp: Date
-    var content: TemplateRoomChatBubbleItemContent
-}
-
-extension TemplateRoomChatBubbleItem: Identifiable, Equatable { }
-
-
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
deleted file mode 100644
index 17c05ab54..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatBubbleItemContent.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-enum TemplateRoomChatBubbleItemContent {
-    case message(TemplateRoomChatMessageContent)
-}
-
-extension TemplateRoomChatBubbleItemContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
deleted file mode 100644
index 54f6121c1..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMember.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// A user who is a member of the room.
-struct TemplateRoomChatMember {
-    let id: String
-    let avatarUrl: String?
-    let displayName: String?
-}
-
-extension TemplateRoomChatMember: Avatarable {
-    var mxContentUri: String? {
-        avatarUrl
-    }
-    
-    var matrixItemId: String {
-        id
-    }
-}
-
-extension TemplateRoomChatMember: Identifiable, Equatable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
deleted file mode 100644
index 46ad7daf8..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessage.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// A chat message send to the timeline within a room.
-struct TemplateRoomChatMessage {
-    let id: String
-    let content: TemplateRoomChatMessageContent
-    let sender: TemplateRoomChatMember
-    let timestamp: Date
-}
-
-extension TemplateRoomChatMessage: Identifiable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
deleted file mode 100644
index c7e54a7d0..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageContent.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// The type of message a long with it's content.
-enum TemplateRoomChatMessageContent {
-    case text(TemplateRoomChatMessageTextContent)
-    case image(TemplateRoomChatMessageImageContent)
-}
-
-extension TemplateRoomChatMessageContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
deleted file mode 100644
index 4aeda448c..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatMessageTextContent.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// The text content of a message sent by a user.
-struct TemplateRoomChatMessageTextContent {
-    var body: String
-}
-
-
-extension TemplateRoomChatMessageTextContent: Equatable { }
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
deleted file mode 100644
index 6469eefe1..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatRoomInitializationStatus.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-enum TemplateRoomChatRoomInitializationStatus {
-    case notInitialized
-    case initialized
-    case failedToInitialize
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
deleted file mode 100644
index 7c0b510c5..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatStateAction.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Actions to be performed on the `ViewModel` State
-enum TemplateRoomChatStateAction {
-    case updateRoomInitializationStatus(TemplateRoomChatRoomInitializationStatus)
-    case updateBubbles([TemplateRoomChatBubble])
-    case clearMessageInput
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
deleted file mode 100644
index 76f0abfea..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Actions send from the `View` to the `ViewModel`.
-enum TemplateRoomChatViewAction {
-    case sendMessage
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift
deleted file mode 100644
index 603480035..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelAction.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Actions sent by the `ViewModel` to the `Coordinator`
-enum TemplateRoomChatViewModelAction {
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift
deleted file mode 100644
index 9137b6ca0..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewModelBindings.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// State bound directly to SwiftUI elements.
-struct TemplateRoomChatViewModelBindings {
-    var messageInput: String
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
deleted file mode 100644
index c296d6d38..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Model/TemplateRoomChatViewState.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// State managed by the `ViewModel` delivered to the `View`.
-struct TemplateRoomChatViewState: BindableState {
-    var roomInitializationStatus: TemplateRoomChatRoomInitializationStatus
-    let roomName: String?
-    var bubbles: [TemplateRoomChatBubble]
-    var bindings: TemplateRoomChatViewModelBindings
-}
-
-extension TemplateRoomChatViewState {
-    var sendButtonEnabled: Bool {
-        !bindings.messageInput.isEmpty
-    }
-}
-
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatModels.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatModels.swift
new file mode 100644
index 000000000..de30950e2
--- /dev/null
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatModels.swift
@@ -0,0 +1,122 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import UIKit
+
+// MARK: - Coordinator
+
+/// An image sent as a message.
+struct TemplateRoomChatMessageImageContent: Equatable {
+    var image: UIImage
+}
+
+/// The text content of a message sent by a user.
+struct TemplateRoomChatMessageTextContent: Equatable {
+    var body: String
+}
+
+/// The type of message a long with it's content.
+enum TemplateRoomChatMessageContent: Equatable {
+    case text(TemplateRoomChatMessageTextContent)
+    case image(TemplateRoomChatMessageImageContent)
+}
+
+enum TemplateRoomChatBubbleItemContent: Equatable {
+    case message(TemplateRoomChatMessageContent)
+}
+
+/// One of the items grouped within a bubble(could be message types like text, image or video, or could be other items like url previews).
+struct TemplateRoomChatBubbleItem: Identifiable, Equatable {
+    let id: String
+    var timestamp: Date
+    var content: TemplateRoomChatBubbleItemContent
+}
+
+/// A user who is a member of the room.
+struct TemplateRoomChatMember: Identifiable, Equatable, Avatarable {
+    let id: String
+    let avatarUrl: String?
+    let displayName: String?
+    
+    var mxContentUri: String? {
+        avatarUrl
+    }
+    
+    var matrixItemId: String {
+        id
+    }
+}
+
+/// Represents a grouped bubble in the View(For example multiple message of different time sent close together).
+struct TemplateRoomChatBubble: Identifiable, Equatable {
+    let id: String
+    let sender: TemplateRoomChatMember
+    var items: [TemplateRoomChatBubbleItem]
+}
+
+/// A chat message send to the timeline within a room.
+struct TemplateRoomChatMessage: Identifiable {
+    let id: String
+    let content: TemplateRoomChatMessageContent
+    let sender: TemplateRoomChatMember
+    let timestamp: Date
+}
+
+// MARK: - View model
+
+enum TemplateRoomChatRoomInitializationStatus {
+    case notInitialized
+    case initialized
+    case failedToInitialize
+}
+
+/// Actions to be performed on the `ViewModel` State
+enum TemplateRoomChatStateAction {
+    case updateRoomInitializationStatus(TemplateRoomChatRoomInitializationStatus)
+    case updateBubbles([TemplateRoomChatBubble])
+    case clearMessageInput
+}
+
+/// Actions sent by the `ViewModel` to the `Coordinator`
+enum TemplateRoomChatViewModelAction {
+    case done
+}
+
+
+// MARK: - View
+
+/// Actions send from the `View` to the `ViewModel`.
+enum TemplateRoomChatViewAction {
+    case sendMessage
+    case done
+}
+
+/// State managed by the `ViewModel` delivered to the `View`.
+struct TemplateRoomChatViewState: BindableState {
+    var roomInitializationStatus: TemplateRoomChatRoomInitializationStatus
+    let roomName: String?
+    var bubbles: [TemplateRoomChatBubble]
+    var bindings: TemplateRoomChatViewModelBindings
+    
+    var sendButtonEnabled: Bool {
+        !bindings.messageInput.isEmpty
+    }
+}
+
+/// State bound directly to SwiftUI elements.
+struct TemplateRoomChatViewModelBindings {
+    var messageInput: String
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModel.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModel.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModel.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModelProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/ViewModel/TemplateRoomChatViewModelProtocol.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/TemplateRoomChatViewModelProtocol.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
index 99636eb73..4f0453231 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinator.swift
@@ -1,23 +1,27 @@
-/*
- Copyright 2021 New Vector Ltd
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
+//
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 
 import Foundation
 import UIKit
 import SwiftUI
 
+struct TemplateRoomListCoordinatorParameters {
+    let session: MXSession
+}
+
 final class TemplateRoomListCoordinator: Coordinator, Presentable {
     
     // MARK: - Properties
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
deleted file mode 100644
index 986bca4f6..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Coordinator/TemplateRoomListCoordinatorParamaters.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-struct TemplateRoomListCoordinatorParameters {
- let session: MXSession
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/MockTemplateRoomListScreenState.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Service/Mock/MockTemplateRoomListScreenState.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/MockTemplateRoomListScreenState.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
deleted file mode 100644
index 9228e33a9..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListCoordinatorAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Actions returned by the coordinator callback
-enum TemplateRoomListCoordinatorAction {
-    case didSelectRoom(String)
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
deleted file mode 100644
index 9db425230..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListRoom.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-struct TemplateRoomListRoom {
-    let id: String
-    let avatar: AvatarInput
-    let displayName: String?
-}
-
-extension TemplateRoomListRoom: Identifiable, Equatable {}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
deleted file mode 100644
index 95a3e19f0..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListStateAction.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Actions to be performed on the `ViewModel` State
-enum TemplateRoomListStateAction {
-    case updateRooms([TemplateRoomListRoom])
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
deleted file mode 100644
index baae86649..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Actions send from the `View` to the `ViewModel`.
-enum TemplateRoomListViewAction {
-    case done
-    case didSelectRoom(String)
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
deleted file mode 100644
index f21fdfa32..000000000
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewModelAction.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import Foundation
-
-/// Actions sent by the`ViewModel` to the `Coordinator`.
-enum TemplateRoomListViewModelAction {
-    case didSelectRoom(String)
-    case done
-}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListModels.swift
similarity index 50%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListModels.swift
index 9c5728786..6adb43c0c 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/Model/TemplateRoomListViewState.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListModels.swift
@@ -16,7 +16,42 @@
 
 import Foundation
 
+// MARK: - Coordinator
+
+struct TemplateRoomListRoom: Identifiable, Equatable {
+    let id: String
+    let avatar: AvatarInput
+    let displayName: String?
+}
+
+/// Actions returned by the coordinator callback
+enum TemplateRoomListCoordinatorAction {
+    case didSelectRoom(String)
+    case done
+}
+
+// MARK: - View model
+
+/// Actions to be performed on the `ViewModel` State
+enum TemplateRoomListStateAction {
+    case updateRooms([TemplateRoomListRoom])
+}
+
+/// Actions sent by the`ViewModel` to the `Coordinator`.
+enum TemplateRoomListViewModelAction {
+    case didSelectRoom(String)
+    case done
+}
+
+// MARK: - View
+
 /// State managed by the `ViewModel` delivered to the `View`.
 struct TemplateRoomListViewState: BindableState {
     var rooms: [TemplateRoomListRoom]
 }
+
+/// Actions send from the `View` to the `ViewModel`.
+enum TemplateRoomListViewAction {
+    case done
+    case didSelectRoom(String)
+}
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModel.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModel.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModel.swift
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModelProtocol.swift
similarity index 100%
rename from RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/ViewModel/TemplateRoomListViewModelProtocol.swift
rename to RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomList/TemplateRoomListViewModelProtocol.swift
diff --git a/Tools/Templates/createSwiftUISingleScreen.sh b/Tools/Templates/createSwiftUISingleScreen.sh
index 52729ead1..d5a0f567c 100755
--- a/Tools/Templates/createSwiftUISingleScreen.sh
+++ b/Tools/Templates/createSwiftUISingleScreen.sh
@@ -27,8 +27,5 @@ do
   perl -p -i -e "s/TemplateUserProfile/"$SCREEN_NAME"/g" $file
   perl -p -i -e "s/templateUserProfile/"$SCREEN_VAR_NAME"/g" $file
 
-  echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-  echo '// File created from SimpleUserProfileExample' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-
   mv ${file} ${file/TemplateUserProfile/$SCREEN_NAME}
 done
diff --git a/Tools/Templates/createSwiftUITwoScreen.sh b/Tools/Templates/createSwiftUITwoScreen.sh
index e82027fc1..5d822d42e 100755
--- a/Tools/Templates/createSwiftUITwoScreen.sh
+++ b/Tools/Templates/createSwiftUITwoScreen.sh
@@ -53,9 +53,3 @@ do
     mv ${file} ${file/TemplateRoomChat/$DETAIL_SCREEN_NAME}
   fi
 done
-
-for file in $(find * -type f -print)
-do
-  echo "// $ createSwiftUITwoScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-  echo '// File created from TemplateAdvancedRoomsExample' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
-done