session-view: Move to the root of the crate

To reduce nesting by one level.

po/POTFILES.in

@@ -109,96 +109,96 @@ src/session/model/room_list/mod.rs
 src/session/model/sidebar_data/section/name.rs
 src/session/model/sidebar_data/icon_item.rs
 src/session/model/user_sessions_list/user_session.rs
-src/session/view/content/explore/mod.blp
-src/session/view/content/explore/public_room_row.rs
-src/session/view/content/explore/servers_popover.blp
-src/session/view/content/explore/server_row.blp
-src/session/view/content/invite.rs
-src/session/view/content/invite.blp
-src/session/view/content/invite_request.rs
-src/session/view/content/invite_request.blp
-src/session/view/content/mod.blp
-src/session/view/content/room_details/addresses_subpage/completion_popover.blp
-src/session/view/content/room_details/addresses_subpage/mod.rs
-src/session/view/content/room_details/addresses_subpage/mod.blp
-src/session/view/content/room_details/edit_details_subpage.rs
-src/session/view/content/room_details/edit_details_subpage.blp
-src/session/view/content/room_details/general_page.rs
-src/session/view/content/room_details/general_page.blp
-src/session/view/content/room_details/history_viewer/audio.blp
-src/session/view/content/room_details/history_viewer/file_row.rs
-src/session/view/content/room_details/history_viewer/file_row.blp
-src/session/view/content/room_details/history_viewer/file.blp
-src/session/view/content/room_details/history_viewer/visual_media.blp
-src/session/view/content/room_details/history_visibility_subpage.blp
-src/session/view/content/room_details/history_visibility_subpage.rs
-src/session/view/content/room_details/invite_subpage/list.rs
-src/session/view/content/room_details/invite_subpage/mod.rs
-src/session/view/content/room_details/invite_subpage/mod.blp
-src/session/view/content/room_details/join_rule_subpage.rs
-src/session/view/content/room_details/join_rule_subpage.blp
-src/session/view/content/room_details/member_row.blp
-src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs
-src/session/view/content/room_details/members_page/members_list_view/mod.rs
-src/session/view/content/room_details/members_page/members_list_view/mod.blp
-src/session/view/content/room_details/mod.rs
-src/session/view/content/room_details/mod.blp
-src/session/view/content/room_details/permissions/add_members_subpage.blp
-src/session/view/content/room_details/permissions/members_subpage.rs
-src/session/view/content/room_details/permissions/members_subpage.blp
-src/session/view/content/room_details/permissions/permissions_subpage.rs
-src/session/view/content/room_details/permissions/permissions_subpage.blp
-src/session/view/content/room_details/upgrade_dialog/mod.rs
-src/session/view/content/room_details/upgrade_dialog/mod.blp
-src/session/view/content/room_history/divider_row.rs
-src/session/view/content/room_history/event_actions/context_menu.rs
-src/session/view/content/room_history/event_actions/context_menu.blp
-src/session/view/content/room_history/event_actions/group.rs
-src/session/view/content/room_history/event_actions/properties_dialog.rs
-src/session/view/content/room_history/event_actions/properties_dialog.blp
-src/session/view/content/room_history/event_actions/quick_reaction_chooser.blp
-src/session/view/content/room_history/message_row/audio.rs
-src/session/view/content/room_history/message_row/content.rs
-src/session/view/content/room_history/message_row/file.rs
-src/session/view/content/room_history/message_row/file.blp
-src/session/view/content/room_history/message_row/location.rs
-src/session/view/content/room_history/message_row/location.blp
-src/session/view/content/room_history/message_row/message_state_stack.blp
-src/session/view/content/room_history/message_row/mod.rs
-src/session/view/content/room_history/message_row/mod.blp
-src/session/view/content/room_history/message_row/reaction/mod.rs
-src/session/view/content/room_history/message_row/reaction_list.blp
-src/session/view/content/room_history/message_row/reply.blp
-src/session/view/content/room_history/message_row/sender_name.rs
-src/session/view/content/room_history/message_row/text/widgets.rs
-src/session/view/content/room_history/message_row/visual_media.rs
-src/session/view/content/room_history/message_row/visual_media.blp
-src/session/view/content/room_history/message_toolbar/attachment_dialog.blp
-src/session/view/content/room_history/message_toolbar/completion/completion_popover.rs
-src/session/view/content/room_history/message_toolbar/mod.rs
-src/session/view/content/room_history/message_toolbar/mod.blp
-src/session/view/content/room_history/member_timestamp/row.rs
-src/session/view/content/room_history/mod.rs
-src/session/view/content/room_history/mod.blp
-src/session/view/content/room_history/read_receipts_list/mod.rs
-src/session/view/content/room_history/state/content.rs
-src/session/view/content/room_history/state/creation.rs
-src/session/view/content/room_history/state/creation.blp
-src/session/view/content/room_history/state/group_row.rs
-src/session/view/content/room_history/title.blp
-src/session/view/content/room_history/typing_row.rs
-src/session/view/content/room_history/verification_info_bar.rs
-src/session/view/create_direct_chat_dialog/mod.rs
-src/session/view/create_direct_chat_dialog/mod.blp
-src/session/view/create_room_dialog.rs
-src/session/view/create_room_dialog.blp
-src/session/view/media_viewer.rs
-src/session/view/media_viewer.blp
-src/session/view/sidebar/mod.rs
-src/session/view/sidebar/mod.blp
-src/session/view/sidebar/room_row.rs
-src/session/view/sidebar/row.rs
-src/session/view/sidebar/section_row.rs
+src/session_view/content/explore/mod.blp
+src/session_view/content/explore/public_room_row.rs
+src/session_view/content/explore/servers_popover.blp
+src/session_view/content/explore/server_row.blp
+src/session_view/content/invite.rs
+src/session_view/content/invite.blp
+src/session_view/content/invite_request.rs
+src/session_view/content/invite_request.blp
+src/session_view/content/mod.blp
+src/session_view/content/room_details/addresses_subpage/completion_popover.blp
+src/session_view/content/room_details/addresses_subpage/mod.rs
+src/session_view/content/room_details/addresses_subpage/mod.blp
+src/session_view/content/room_details/edit_details_subpage.rs
+src/session_view/content/room_details/edit_details_subpage.blp
+src/session_view/content/room_details/general_page.rs
+src/session_view/content/room_details/general_page.blp
+src/session_view/content/room_details/history_viewer/audio.blp
+src/session_view/content/room_details/history_viewer/file_row.rs
+src/session_view/content/room_details/history_viewer/file_row.blp
+src/session_view/content/room_details/history_viewer/file.blp
+src/session_view/content/room_details/history_viewer/visual_media.blp
+src/session_view/content/room_details/history_visibility_subpage.blp
+src/session_view/content/room_details/history_visibility_subpage.rs
+src/session_view/content/room_details/invite_subpage/list.rs
+src/session_view/content/room_details/invite_subpage/mod.rs
+src/session_view/content/room_details/invite_subpage/mod.blp
+src/session_view/content/room_details/join_rule_subpage.rs
+src/session_view/content/room_details/join_rule_subpage.blp
+src/session_view/content/room_details/member_row.blp
+src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs
+src/session_view/content/room_details/members_page/members_list_view/mod.rs
+src/session_view/content/room_details/members_page/members_list_view/mod.blp
+src/session_view/content/room_details/mod.rs
+src/session_view/content/room_details/mod.blp
+src/session_view/content/room_details/permissions/add_members_subpage.blp
+src/session_view/content/room_details/permissions/members_subpage.rs
+src/session_view/content/room_details/permissions/members_subpage.blp
+src/session_view/content/room_details/permissions/permissions_subpage.rs
+src/session_view/content/room_details/permissions/permissions_subpage.blp
+src/session_view/content/room_details/upgrade_dialog/mod.rs
+src/session_view/content/room_details/upgrade_dialog/mod.blp
+src/session_view/content/room_history/divider_row.rs
+src/session_view/content/room_history/event_actions/context_menu.rs
+src/session_view/content/room_history/event_actions/context_menu.blp
+src/session_view/content/room_history/event_actions/group.rs
+src/session_view/content/room_history/event_actions/properties_dialog.rs
+src/session_view/content/room_history/event_actions/properties_dialog.blp
+src/session_view/content/room_history/event_actions/quick_reaction_chooser.blp
+src/session_view/content/room_history/message_row/audio.rs
+src/session_view/content/room_history/message_row/content.rs
+src/session_view/content/room_history/message_row/file.rs
+src/session_view/content/room_history/message_row/file.blp
+src/session_view/content/room_history/message_row/location.rs
+src/session_view/content/room_history/message_row/location.blp
+src/session_view/content/room_history/message_row/message_state_stack.blp
+src/session_view/content/room_history/message_row/mod.rs
+src/session_view/content/room_history/message_row/mod.blp
+src/session_view/content/room_history/message_row/reaction/mod.rs
+src/session_view/content/room_history/message_row/reaction_list.blp
+src/session_view/content/room_history/message_row/reply.blp
+src/session_view/content/room_history/message_row/sender_name.rs
+src/session_view/content/room_history/message_row/text/widgets.rs
+src/session_view/content/room_history/message_row/visual_media.rs
+src/session_view/content/room_history/message_row/visual_media.blp
+src/session_view/content/room_history/message_toolbar/attachment_dialog.blp
+src/session_view/content/room_history/message_toolbar/completion/completion_popover.rs
+src/session_view/content/room_history/message_toolbar/mod.rs
+src/session_view/content/room_history/message_toolbar/mod.blp
+src/session_view/content/room_history/member_timestamp/row.rs
+src/session_view/content/room_history/mod.rs
+src/session_view/content/room_history/mod.blp
+src/session_view/content/room_history/read_receipts_list/mod.rs
+src/session_view/content/room_history/state/content.rs
+src/session_view/content/room_history/state/creation.rs
+src/session_view/content/room_history/state/creation.blp
+src/session_view/content/room_history/state/group_row.rs
+src/session_view/content/room_history/title.blp
+src/session_view/content/room_history/typing_row.rs
+src/session_view/content/room_history/verification_info_bar.rs
+src/session_view/create_direct_chat_dialog/mod.rs
+src/session_view/create_direct_chat_dialog/mod.blp
+src/session_view/create_room_dialog.rs
+src/session_view/create_room_dialog.blp
+src/session_view/media_viewer.rs
+src/session_view/media_viewer.blp
+src/session_view/sidebar/mod.rs
+src/session_view/sidebar/mod.blp
+src/session_view/sidebar/room_row.rs
+src/session_view/sidebar/row.rs
+src/session_view/sidebar/section_row.rs
 src/session_list/mod.rs
 src/shortcuts-dialog.blp
 src/user_facing_error.rs

src/components/pill/mod.rs

@@ -15,10 +15,8 @@ pub use self::{
 use super::{Avatar, AvatarImageSafetySetting, RoomPreviewDialog, UserProfileDialog};
 use crate::{
     prelude::*,
-    session::{
-        model::{Member, RemoteRoom, Room},
-        view::SessionView,
-    },
+    session::model::{Member, RemoteRoom, Room},
+    session_view::SessionView,
     utils::{BoundObject, key_bindings},
 };
 

src/main.rs

@@ -20,6 +20,7 @@ mod prelude;
 mod secret;
 mod session;
 mod session_list;
+mod session_view;
 mod system_settings;
 mod user_facing_error;
 mod utils;

src/session/mod.rs

@@ -1,2 +1 @@
 pub mod model;
-pub mod view;

src/session/view/mod.rs

@@ -1,12 +0,0 @@
-mod content;
-mod create_direct_chat_dialog;
-mod create_room_dialog;
-mod media_viewer;
-mod session_view;
-mod sidebar;
-
-pub use self::session_view::SessionView;
-use self::{
-    content::Content, create_direct_chat_dialog::CreateDirectChatDialog,
-    create_room_dialog::CreateRoomDialog, media_viewer::MediaViewer, sidebar::Sidebar,
-};

src/session_view/content/explore/mod.rs

@@ -29,7 +29,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/mod.ui")]
     #[properties(wrapper_type = super::Explore)]
     pub struct Explore {
         #[template_child]

src/session_view/content/explore/public_room_row.rs

@@ -20,7 +20,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/public_room_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/public_room_row.ui")]
     #[properties(wrapper_type = super::PublicRoomRow)]
     pub struct PublicRoomRow {
         #[template_child]

src/session_view/content/explore/server_row.rs

@@ -11,7 +11,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/server_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/server_row.ui")]
     #[properties(wrapper_type = super::ExploreServerRow)]
     pub struct ExploreServerRow {
         #[template_child]

src/session_view/content/explore/servers_popover.rs

@@ -14,7 +14,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/explore/servers_popover.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/explore/servers_popover.ui")]
     #[properties(wrapper_type = super::ExploreServersPopover)]
     pub struct ExploreServersPopover {
         #[template_child]

src/session_view/content/invite.rs

@@ -22,7 +22,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/invite.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/invite.ui")]
     #[properties(wrapper_type = super::Invite)]
     pub struct Invite {
         #[template_child]

src/session_view/content/invite_request.rs

@@ -17,7 +17,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/invite_request.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/invite_request.ui")]
     #[properties(wrapper_type = super::InviteRequest)]
     pub struct InviteRequest {
         #[template_child]

src/session_view/content/mod.rs

@@ -45,7 +45,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/mod.ui")]
     #[properties(wrapper_type = super::Content)]
     pub struct Content {
         #[template_child]

src/session_view/content/room_details/addresses_subpage/completion_popover.rs

@@ -13,7 +13,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/addresses_subpage/completion_popover.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/addresses_subpage/completion_popover.ui"
     )]
     #[properties(wrapper_type = super::CompletionPopover)]
     pub struct CompletionPopover {

src/session_view/content/room_details/addresses_subpage/mod.rs

@@ -29,7 +29,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/addresses_subpage/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/addresses_subpage/mod.ui"
     )]
     #[properties(wrapper_type = super::AddressesSubpage)]
     pub struct AddressesSubpage {

src/session_view/content/room_details/edit_details_subpage.rs

@@ -28,7 +28,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/edit_details_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/edit_details_subpage.ui"
     )]
     #[properties(wrapper_type = super::EditDetailsSubpage)]
     pub struct EditDetailsSubpage {

src/session_view/content/room_details/general_page.rs

@@ -49,7 +49,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/general_page.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/general_page.ui"
     )]
     #[properties(wrapper_type = super::GeneralPage)]
     pub struct GeneralPage {

src/session_view/content/room_details/history_viewer/audio.rs

@@ -22,7 +22,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/audio.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/audio.ui"
     )]
     #[properties(wrapper_type = super::AudioHistoryViewer)]
     pub struct AudioHistoryViewer {

src/session_view/content/room_details/history_viewer/audio_row.rs

@@ -13,7 +13,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/audio_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/audio_row.ui"
     )]
     #[properties(wrapper_type = super::AudioRow)]
     pub struct AudioRow {

src/session_view/content/room_details/history_viewer/file.rs

@@ -22,7 +22,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/file.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/file.ui"
     )]
     #[properties(wrapper_type = super::FileHistoryViewer)]
     pub struct FileHistoryViewer {

src/session_view/content/room_details/history_viewer/file_row.rs

@@ -15,7 +15,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/file_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/file_row.ui"
     )]
     #[properties(wrapper_type = super::FileRow)]
     pub struct FileRow {

src/session_view/content/room_details/history_viewer/visual_media.rs

@@ -6,7 +6,7 @@ use super::{HistoryViewerEvent, HistoryViewerEventType, HistoryViewerTimeline, V
 use crate::{
     components::LoadingRow,
     prelude::*,
-    session::view::MediaViewer,
+    session_view::MediaViewer,
     spawn,
     utils::{BoundConstructOnlyObject, LoadingState},
 };
@@ -25,7 +25,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/visual_media.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/visual_media.ui"
     )]
     #[properties(wrapper_type = super::VisualMediaHistoryViewer)]
     pub struct VisualMediaHistoryViewer {

src/session_view/content/room_details/history_viewer/visual_media_item.rs

@@ -44,7 +44,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_viewer/visual_media_item.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_viewer/visual_media_item.ui"
     )]
     #[properties(wrapper_type = super::VisualMediaItem)]
     pub struct VisualMediaItem {

src/session_view/content/room_details/history_visibility_subpage.rs

@@ -23,7 +23,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/history_visibility_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/history_visibility_subpage.ui"
     )]
     #[properties(wrapper_type = super::HistoryVisibilitySubpage)]
     pub struct HistoryVisibilitySubpage {

src/session_view/content/room_details/invite_subpage/mod.rs

@@ -28,7 +28,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/invite_subpage/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/mod.ui"
     )]
     #[properties(wrapper_type = super::InviteSubpage)]
     pub struct InviteSubpage {

src/session_view/content/room_details/invite_subpage/row.rs

@@ -13,7 +13,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/invite_subpage/row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/invite_subpage/row.ui"
     )]
     #[properties(wrapper_type = super::InviteRow)]
     pub struct InviteRow {

src/session_view/content/room_details/join_rule_subpage.rs

@@ -21,7 +21,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/join_rule_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/join_rule_subpage.ui"
     )]
     #[properties(wrapper_type = super::JoinRuleSubpage)]
     pub struct JoinRuleSubpage {

src/session_view/content/room_details/member_row.rs

@@ -14,7 +14,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/room_details/member_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_details/member_row.ui")]
     #[properties(wrapper_type = super::MemberRow)]
     pub struct MemberRow {
         #[template_child]

src/session_view/content/room_details/members_page/members_list_view/item_row.rs

@@ -4,10 +4,8 @@ use gtk::glib;
 use super::MembershipSubpageRow;
 use crate::{
     prelude::*,
-    session::{
-        model::Member,
-        view::content::room_details::{MemberRow, MembershipSubpageItem},
-    },
+    session::model::Member,
+    session_view::content::room_details::{MemberRow, MembershipSubpageItem},
 };
 
 mod imp {

src/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.rs

@@ -1,9 +1,9 @@
 use gettextrs::npgettext;
 use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*};
 
-use crate::session::{
-    model::MembershipListKind,
-    view::content::room_details::membership_subpage_item::MembershipSubpageItem,
+use crate::{
+    session::model::MembershipListKind,
+    session_view::content::room_details::membership_subpage_item::MembershipSubpageItem,
 };
 
 mod imp {
@@ -15,7 +15,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/members_list_view/membership_subpage_row.ui"
     )]
     #[properties(wrapper_type = super::MembershipSubpageRow)]
     pub struct MembershipSubpageRow {

src/session_view/content/room_details/members_page/members_list_view/mod.rs

@@ -12,10 +12,8 @@ use self::{item_row::ItemRow, membership_subpage_row::MembershipSubpageRow};
 use crate::{
     components::LoadingRow,
     prelude::*,
-    session::{
-        model::{Member, MemberList, MembershipListKind, Room},
-        view::content::room_details::MembershipSubpageItem,
-    },
+    session::model::{Member, MemberList, MembershipListKind, Room},
+    session_view::content::room_details::MembershipSubpageItem,
     utils::{BoundObjectWeakRef, ExpressionListModel, LoadingState, expression},
 };
 
@@ -31,7 +29,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/members_page/members_list_view/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/members_list_view/mod.ui"
     )]
     #[properties(wrapper_type = super::MembersListView)]
     pub struct MembersListView {

src/session_view/content/room_details/members_page/mod.rs

@@ -13,7 +13,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/members_page/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/members_page/mod.ui"
     )]
     #[properties(wrapper_type = super::MembersPage)]
     pub struct MembersPage {

src/session_view/content/room_details/mod.rs

@@ -89,7 +89,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/room_details/mod.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_details/mod.ui")]
     #[properties(wrapper_type = super::RoomDetails)]
     pub struct RoomDetails {
         /// The room to show the details for.

src/session_view/content/room_details/permissions/add_members_subpage.rs

@@ -26,7 +26,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/permissions/add_members_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/add_members_subpage.ui"
     )]
     #[properties(wrapper_type = super::PermissionsAddMembersSubpage)]
     pub struct PermissionsAddMembersSubpage {

src/session_view/content/room_details/permissions/member_row.rs

@@ -23,7 +23,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/permissions/member_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/member_row.ui"
     )]
     #[properties(wrapper_type = super::PermissionsMemberRow)]
     pub struct PermissionsMemberRow {

src/session_view/content/room_details/permissions/members_subpage.rs

@@ -18,7 +18,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/permissions/members_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/members_subpage.ui"
     )]
     #[properties(wrapper_type = super::PermissionsMembersSubpage)]
     pub struct PermissionsMembersSubpage {

src/session_view/content/room_details/permissions/permissions_subpage.rs

@@ -30,7 +30,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/permissions/permissions_subpage.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/permissions_subpage.ui"
     )]
     #[properties(wrapper_type = super::PermissionsSubpage)]
     pub struct PermissionsSubpage {

src/session_view/content/room_details/permissions/select_member_row.rs

@@ -12,7 +12,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/permissions/select_member_row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/permissions/select_member_row.ui"
     )]
     #[properties(wrapper_type = super::PermissionsSelectMemberRow)]
     pub struct PermissionsSelectMemberRow {

src/session_view/content/room_details/upgrade_dialog/mod.rs

@@ -23,7 +23,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/upgrade_dialog/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_details/upgrade_dialog/mod.ui"
     )]
     pub struct UpgradeDialog {
         #[template_child]

src/session_view/content/room_history/divider_row.rs

@@ -13,7 +13,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
-    #[template(resource = "/org/gnome/Fractal/ui/session/view/content/room_history/divider_row.ui")]
+    #[template(resource = "/org/gnome/Fractal/ui/session_view/content/room_history/divider_row.ui")]
     #[properties(wrapper_type = super::DividerRow)]
     pub struct DividerRow {
         #[template_child]

src/session_view/content/room_history/event_actions/context_menu.rs

@@ -70,7 +70,7 @@ impl EventActionsContextMenu {
 impl Default for EventActionsContextMenu {
     fn default() -> Self {
         let menu_model = gtk::Builder::from_resource(
-            "/org/gnome/Fractal/ui/session/view/content/room_history/event_actions/context_menu.ui",
+            "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/context_menu.ui",
         )
         .object::<gio::Menu>("event-actions-menu")
         .expect("GResource and menu should exist");

src/session_view/content/room_history/event_actions/properties_dialog.rs

@@ -20,7 +20,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_history/event_actions/properties_dialog.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/properties_dialog.ui"
     )]
     #[properties(wrapper_type = super::EventPropertiesDialog)]
     pub struct EventPropertiesDialog {

src/session_view/content/room_history/event_actions/quick_reaction_chooser.rs

@@ -70,7 +70,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_history/event_actions/quick_reaction_chooser.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/event_actions/quick_reaction_chooser.ui"
     )]
     #[properties(wrapper_type = super::QuickReactionChooser)]
     pub struct QuickReactionChooser {

src/session_view/content/room_history/event_row.rs

@@ -6,7 +6,8 @@ use super::{EventActionsGroup, MessageRow, RoomHistory, StateRow};
 use crate::{
     components::ContextMenuBin,
     prelude::*,
-    session::{model::Event, view::content::room_history::message_toolbar::ComposerState},
+    session::model::Event,
+    session_view::content::room_history::message_toolbar::ComposerState,
     utils::{BoundObject, BoundObjectWeakRef},
 };
 

src/session_view/content/room_history/member_timestamp/row.rs

@@ -16,7 +16,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_history/member_timestamp/row.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/member_timestamp/row.ui"
     )]
     #[properties(wrapper_type = super::MemberTimestampRow)]
     pub struct MemberTimestampRow {

src/session_view/content/room_history/message_row/audio.rs

@@ -16,7 +16,7 @@ mod imp {
 
     #[derive(Debug, Default, gtk::CompositeTemplate, glib::Properties)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_history/message_row/audio.ui"
+        resource = "/org/gnome/Fractal/ui/session_view/content/room_history/message_row/audio.ui"
     )]
     #[properties(wrapper_type = super::MessageAudio)]
     pub struct MessageAudio {