diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentContactsPickerView.swift b/ConversationsClassic/View/Screens/Sharing/SharingContactsPickerView.swift
similarity index 98%
rename from ConversationsClassic/View/Screens/Attachments/AttachmentContactsPickerView.swift
rename to ConversationsClassic/View/Screens/Sharing/SharingContactsPickerView.swift
index 77aa04e..0817297 100644
--- a/ConversationsClassic/View/Screens/Attachments/AttachmentContactsPickerView.swift
+++ b/ConversationsClassic/View/Screens/Sharing/SharingContactsPickerView.swift
@@ -1,6 +1,6 @@
 import SwiftUI
 
-struct AttachmentContactsPickerView: View {
+struct SharingContactsPickerView: View {
     @EnvironmentObject var store: AppStore
     @State private var selectedContact: Roster?
 
diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentFilesPickerView.swift b/ConversationsClassic/View/Screens/Sharing/SharingFilesPickerView.swift
similarity index 97%
rename from ConversationsClassic/View/Screens/Attachments/AttachmentFilesPickerView.swift
rename to ConversationsClassic/View/Screens/Sharing/SharingFilesPickerView.swift
index 5d236fd..3bf6734 100644
--- a/ConversationsClassic/View/Screens/Attachments/AttachmentFilesPickerView.swift
+++ b/ConversationsClassic/View/Screens/Sharing/SharingFilesPickerView.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 import UIKit
 
-struct AttachmentFilesPickerView: View {
+struct SharingFilesPickerView: View {
     @EnvironmentObject var store: AppStore
 
     var body: some View {
diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentHeader.swift b/ConversationsClassic/View/Screens/Sharing/SharingHeader.swift
similarity index 95%
rename from ConversationsClassic/View/Screens/Attachments/AttachmentHeader.swift
rename to ConversationsClassic/View/Screens/Sharing/SharingHeader.swift
index f9b61e4..3d39276 100644
--- a/ConversationsClassic/View/Screens/Attachments/AttachmentHeader.swift
+++ b/ConversationsClassic/View/Screens/Sharing/SharingHeader.swift
@@ -1,6 +1,6 @@
 import SwiftUI
 
-struct AttachmentHeader: View {
+struct SharingHeader: View {
     @EnvironmentObject var store: AppStore
 
     var body: some View {
diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentLocationPickerView.swift b/ConversationsClassic/View/Screens/Sharing/SharingLocationPickerView.swift
similarity index 99%
rename from ConversationsClassic/View/Screens/Attachments/AttachmentLocationPickerView.swift
rename to ConversationsClassic/View/Screens/Sharing/SharingLocationPickerView.swift
index 3509cca..def4bff 100644
--- a/ConversationsClassic/View/Screens/Attachments/AttachmentLocationPickerView.swift
+++ b/ConversationsClassic/View/Screens/Sharing/SharingLocationPickerView.swift
@@ -1,7 +1,7 @@
 import MapKit
 import SwiftUI
 
-struct AttachmentLocationPickerView: View {
+struct SharingLocationPickerView: View {
     @StateObject var locationManager = LocationManager()
     @State private var region = MKCoordinateRegion()
 
diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentMediaPickerView.swift b/ConversationsClassic/View/Screens/Sharing/SharingMediaPickerView.swift
similarity index 99%
rename from ConversationsClassic/View/Screens/Attachments/AttachmentMediaPickerView.swift
rename to ConversationsClassic/View/Screens/Sharing/SharingMediaPickerView.swift
index 17481fb..905202b 100644
--- a/ConversationsClassic/View/Screens/Attachments/AttachmentMediaPickerView.swift
+++ b/ConversationsClassic/View/Screens/Sharing/SharingMediaPickerView.swift
@@ -3,7 +3,7 @@ import MobileCoreServices
 import Photos
 import SwiftUI
 
-struct AttachmentMediaPickerView: View {
+struct SharingMediaPickerView: View {
     @EnvironmentObject var store: AppStore
     @State private var showCameraPicker = false
     @State private var cameraReady = false
diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentPickerScreen.swift b/ConversationsClassic/View/Screens/Sharing/SharingPickerScreen.swift
similarity index 63%
rename from ConversationsClassic/View/Screens/Attachments/AttachmentPickerScreen.swift
rename to ConversationsClassic/View/Screens/Sharing/SharingPickerScreen.swift
index 304eab1..857267b 100644
--- a/ConversationsClassic/View/Screens/Attachments/AttachmentPickerScreen.swift
+++ b/ConversationsClassic/View/Screens/Sharing/SharingPickerScreen.swift
@@ -3,7 +3,7 @@ import SwiftUI
 struct AttachmentPickerScreen: View {
     @EnvironmentObject var store: AppStore
 
-    @State private var selectedTab: AttachmentTab = .media
+    @State private var selectedTab: SharingTab = .media
 
     var body: some View {
         ZStack {
@@ -14,25 +14,25 @@ struct AttachmentPickerScreen: View {
             // Content
             VStack(spacing: 0) {
                 // Header
-                AttachmentHeader()
+                SharingHeader()
 
                 // Pickers
                 switch selectedTab {
                 case .media:
-                    AttachmentMediaPickerView()
+                    SharingMediaPickerView()
 
                 case .files:
-                    AttachmentFilesPickerView()
+                    SharingFilesPickerView()
 
                 case .location:
-                    AttachmentLocationPickerView()
+                    SharingLocationPickerView()
 
                 case .contacts:
-                    AttachmentContactsPickerView()
+                    SharingContactsPickerView()
                 }
 
                 // Tab bar
-                AttachmentTabBar(selectedTab: $selectedTab)
+                SharingTabBar(selectedTab: $selectedTab)
             }
         }
     }
diff --git a/ConversationsClassic/View/Screens/Attachments/AttachmentTabBar.swift b/ConversationsClassic/View/Screens/Sharing/SharingTabBar.swift
similarity index 78%
rename from ConversationsClassic/View/Screens/Attachments/AttachmentTabBar.swift
rename to ConversationsClassic/View/Screens/Sharing/SharingTabBar.swift
index 684175b..770dc04 100644
--- a/ConversationsClassic/View/Screens/Attachments/AttachmentTabBar.swift
+++ b/ConversationsClassic/View/Screens/Sharing/SharingTabBar.swift
@@ -1,14 +1,14 @@
 import SwiftUI
 
-enum AttachmentTab: Int, CaseIterable {
+enum SharingTab: Int, CaseIterable {
     case media
     case files
     case location
     case contacts
 }
 
-struct AttachmentTabBar: View {
-    @Binding var selectedTab: AttachmentTab
+struct SharingTabBar: View {
+    @Binding var selectedTab: SharingTab
 
     var body: some View {
         VStack(spacing: 0) {
@@ -17,10 +17,10 @@ struct AttachmentTabBar: View {
                 .frame(height: 0.2)
                 .foregroundColor(.Material.Shape.separator)
             HStack(spacing: 0) {
-                AttachmentTabBarButton(tab: .media, selected: $selectedTab)
-                AttachmentTabBarButton(tab: .files, selected: $selectedTab)
-                AttachmentTabBarButton(tab: .location, selected: $selectedTab)
-                AttachmentTabBarButton(tab: .contacts, selected: $selectedTab)
+                SharingTabBarButton(tab: .media, selected: $selectedTab)
+                SharingTabBarButton(tab: .files, selected: $selectedTab)
+                SharingTabBarButton(tab: .location, selected: $selectedTab)
+                SharingTabBarButton(tab: .contacts, selected: $selectedTab)
             }
             .background(Color.Material.Background.dark)
         }
@@ -28,9 +28,9 @@ struct AttachmentTabBar: View {
     }
 }
 
-private struct AttachmentTabBarButton: View {
-    let tab: AttachmentTab
-    @Binding var selected: AttachmentTab
+private struct SharingTabBarButton: View {
+    let tab: SharingTab
+    @Binding var selected: SharingTab
 
     var body: some View {
         ZStack {