diff --git a/ConversationsClassic/AppData/AppError.swift b/ConversationsClassic/AppData/AppError.swift
index e90a5e0..5f5677f 100644
--- a/ConversationsClassic/AppData/AppError.swift
+++ b/ConversationsClassic/AppData/AppError.swift
@@ -3,12 +3,9 @@ enum AppError: Error {
     case rosterNotFound
     case imageNotFound
     case videoNotFound
-    case fileStoreError
     case noData
     case fileTooBig
     case invalidContentType
-    case invalidPath
     case invalidLocalName
-    case moduleNotAvailable
     case featureNotSupported
 }
diff --git a/ConversationsClassic/AppData/Client/Client+MartinDisco.swift b/ConversationsClassic/AppData/Client/Client+MartinDisco.swift
index 68d2101..d2f5e52 100644
--- a/ConversationsClassic/AppData/Client/Client+MartinDisco.swift
+++ b/ConversationsClassic/AppData/Client/Client+MartinDisco.swift
@@ -1,4 +1,3 @@
-
 import Combine
 import Foundation
 import GRDB
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/ContactsPicker/ContactsPickerView.swift b/ConversationsClassic/View/Main/Conversation/Attachments/ContactsPickerView.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/ContactsPicker/ContactsPickerView.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/ContactsPickerView.swift
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/FilesPicker/FilesPickerView.swift b/ConversationsClassic/View/Main/Conversation/Attachments/FilesPickerView.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/FilesPicker/FilesPickerView.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/FilesPickerView.swift
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/LocationPicker/LocationPickerView.swift b/ConversationsClassic/View/Main/Conversation/Attachments/LocationPickerView.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/LocationPicker/LocationPickerView.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/LocationPickerView.swift
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraCellPreview.swift b/ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/CameraCellPreview.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraCellPreview.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/CameraCellPreview.swift
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraPicker.swift b/ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/CameraPicker.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraPicker.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/CameraPicker.swift
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraView.swift b/ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/CameraView.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/CameraView.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/CameraView.swift
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/GalleryView.swift b/ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/GalleryView.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/GalleryView.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerComponents/GalleryView.swift
diff --git a/ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/MediaPickerView.swift b/ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerView.swift
similarity index 100%
rename from ConversationsClassic/View/Main/Conversation/Attachments/MediaPicker/MediaPickerView.swift
rename to ConversationsClassic/View/Main/Conversation/Attachments/MediaPickerView.swift