diff --git a/SignalMessaging/ViewControllers/AttachmentSharing.h b/SignalMessaging/attachments/AttachmentSharing.h
similarity index 100%
rename from SignalMessaging/ViewControllers/AttachmentSharing.h
rename to SignalMessaging/attachments/AttachmentSharing.h
diff --git a/SignalMessaging/ViewControllers/AttachmentSharing.m b/SignalMessaging/attachments/AttachmentSharing.m
similarity index 100%
rename from SignalMessaging/ViewControllers/AttachmentSharing.m
rename to SignalMessaging/attachments/AttachmentSharing.m
diff --git a/SignalMessaging/ViewControllers/OWSVideoPlayer.swift b/SignalMessaging/attachments/OWSVideoPlayer.swift
similarity index 100%
rename from SignalMessaging/ViewControllers/OWSVideoPlayer.swift
rename to SignalMessaging/attachments/OWSVideoPlayer.swift
diff --git a/SignalMessaging/ViewControllers/ShareViewDelegate.swift b/SignalMessaging/attachments/ShareViewDelegate.swift
similarity index 100%
rename from SignalMessaging/ViewControllers/ShareViewDelegate.swift
rename to SignalMessaging/attachments/ShareViewDelegate.swift
diff --git a/SignalMessaging/ViewControllers/SignalAttachment.swift b/SignalMessaging/attachments/SignalAttachment.swift
similarity index 100%
rename from SignalMessaging/ViewControllers/SignalAttachment.swift
rename to SignalMessaging/attachments/SignalAttachment.swift
diff --git a/SignalMessaging/ViewControllers/OWSContactsManager.h b/SignalMessaging/contacts/OWSContactsManager.h
similarity index 100%
rename from SignalMessaging/ViewControllers/OWSContactsManager.h
rename to SignalMessaging/contacts/OWSContactsManager.h
diff --git a/SignalMessaging/ViewControllers/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m
similarity index 100%
rename from SignalMessaging/ViewControllers/OWSContactsManager.m
rename to SignalMessaging/contacts/OWSContactsManager.m
diff --git a/SignalMessaging/ViewControllers/OWSContactsSyncing.h b/SignalMessaging/contacts/OWSContactsSyncing.h
similarity index 100%
rename from SignalMessaging/ViewControllers/OWSContactsSyncing.h
rename to SignalMessaging/contacts/OWSContactsSyncing.h
diff --git a/SignalMessaging/ViewControllers/OWSContactsSyncing.m b/SignalMessaging/contacts/OWSContactsSyncing.m
similarity index 100%
rename from SignalMessaging/ViewControllers/OWSContactsSyncing.m
rename to SignalMessaging/contacts/OWSContactsSyncing.m
diff --git a/SignalMessaging/ViewControllers/SystemContactsFetcher.swift b/SignalMessaging/contacts/SystemContactsFetcher.swift
similarity index 100%
rename from SignalMessaging/ViewControllers/SystemContactsFetcher.swift
rename to SignalMessaging/contacts/SystemContactsFetcher.swift