diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index de2a1d54e2..3169481b8e 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -7435,16 +7435,9 @@
 			isa = PBXGroup;
 			children = (
 				66E1AD7F2B8FDA5500C56B7B /* AttachmentReference */,
-				66E1AD512B8D016000C56B7B /* TSResourceStore */,
-				66E1AD772B8FD0D800C56B7B /* Attachment+TSResource.swift */,
+				66E1AD512B8D016000C56B7B /* AttachmentStore */,
+				66E1AD8C2B912A3000C56B7B /* TSResource */,
 				66E1AD752B8FD0B700C56B7B /* Attachment.swift */,
-				66E1AD542B8D033E00C56B7B /* ConcreteTSResource.swift */,
-				66C102F92B630F9600B47EC2 /* TSAttachment+TSResource.swift */,
-				66C102F12B61E38100B47EC2 /* TSResource.swift */,
-				66E1AD4F2B80126200C56B7B /* TSResourceId.swift */,
-				66C102F52B61E3D700B47EC2 /* TSResourcePointer.swift */,
-				66C102F32B61E3CD00B47EC2 /* TSResourceStream.swift */,
-				66C102F72B6306B900B47EC2 /* TSResourceThumbnail.swift */,
 			);
 			path = V2;
 			sourceTree = "<group>";
@@ -7615,15 +7608,12 @@
 			path = Provisioning;
 			sourceTree = "<group>";
 		};
-		66E1AD512B8D016000C56B7B /* TSResourceStore */ = {
+		66E1AD512B8D016000C56B7B /* AttachmentStore */ = {
 			isa = PBXGroup;
 			children = (
-				6619A1C22B2B7199004B38FE /* TSAttachmentStore.swift */,
-				66E1AD522B8D017400C56B7B /* TSResourceStore.swift */,
-				66E1AD582B8D59D700C56B7B /* TSResourceStoreImpl.swift */,
-				66E1AD5A2B8D5A1900C56B7B /* TSResourceStoreMock.swift */,
+				66E1AD8A2B91298C00C56B7B /* TSResource */,
 			);
-			path = TSResourceStore;
+			path = AttachmentStore;
 			sourceTree = "<group>";
 		};
 		66E1AD7F2B8FDA5500C56B7B /* AttachmentReference */ = {
@@ -7646,6 +7636,33 @@
 			path = TSResource;
 			sourceTree = "<group>";
 		};
+		66E1AD8A2B91298C00C56B7B /* TSResource */ = {
+			isa = PBXGroup;
+			children = (
+				6619A1C22B2B7199004B38FE /* TSAttachmentStore.swift */,
+				66E1AD522B8D017400C56B7B /* TSResourceStore.swift */,
+				66E1AD582B8D59D700C56B7B /* TSResourceStoreImpl.swift */,
+				66E1AD5A2B8D5A1900C56B7B /* TSResourceStoreMock.swift */,
+			);
+			path = TSResource;
+			sourceTree = "<group>";
+		};
+		66E1AD8C2B912A3000C56B7B /* TSResource */ = {
+			isa = PBXGroup;
+			children = (
+				66E1AD772B8FD0D800C56B7B /* Attachment+TSResource.swift */,
+				66E1AD542B8D033E00C56B7B /* ConcreteTSResource.swift */,
+				66C102F92B630F9600B47EC2 /* TSAttachment+TSResource.swift */,
+				66C102F12B61E38100B47EC2 /* TSResource.swift */,
+				66E1AD4F2B80126200C56B7B /* TSResourceId.swift */,
+				66C102F52B61E3D700B47EC2 /* TSResourcePointer.swift */,
+				66C102F32B61E3CD00B47EC2 /* TSResourceStream.swift */,
+				66C102F72B6306B900B47EC2 /* TSResourceThumbnail.swift */,
+			);
+			name = TSResource;
+			path = ../TSResource;
+			sourceTree = "<group>";
+		};
 		66FC636C29DF78FE00F00DAC /* BodyRanges */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/Attachment+TSResource.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/Attachment+TSResource.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/Attachment+TSResource.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/Attachment+TSResource.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/ConcreteTSResource.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/ConcreteTSResource.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/ConcreteTSResource.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/ConcreteTSResource.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSAttachment+TSResource.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/TSAttachment+TSResource.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSAttachment+TSResource.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/TSAttachment+TSResource.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResource.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/TSResource.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResource.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/TSResource.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourceId.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/TSResourceId.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourceId.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/TSResourceId.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourcePointer.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/TSResourcePointer.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourcePointer.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/TSResourcePointer.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourceStream.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/TSResourceStream.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourceStream.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/TSResourceStream.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourceThumbnail.swift b/SignalServiceKit/src/Messages/Attachments/TSResource/TSResourceThumbnail.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourceThumbnail.swift
rename to SignalServiceKit/src/Messages/Attachments/TSResource/TSResourceThumbnail.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSAttachmentStore.swift b/SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSAttachmentStore.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSAttachmentStore.swift
rename to SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSAttachmentStore.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSResourceStore.swift b/SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSResourceStore.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSResourceStore.swift
rename to SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSResourceStore.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSResourceStoreImpl.swift b/SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSResourceStoreImpl.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSResourceStoreImpl.swift
rename to SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSResourceStoreImpl.swift
diff --git a/SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSResourceStoreMock.swift b/SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSResourceStoreMock.swift
similarity index 100%
rename from SignalServiceKit/src/Messages/Attachments/V2/TSResourceStore/TSResourceStoreMock.swift
rename to SignalServiceKit/src/Messages/Attachments/V2/AttachmentStore/TSResource/TSResourceStoreMock.swift