diff --git a/BuildExtensions/Package.resolved b/Components/BuildExtensions/Package.resolved
similarity index 100%
rename from BuildExtensions/Package.resolved
rename to Components/BuildExtensions/Package.resolved
diff --git a/BuildExtensions/Package.swift b/Components/BuildExtensions/Package.swift
similarity index 100%
rename from BuildExtensions/Package.swift
rename to Components/BuildExtensions/Package.swift
diff --git a/BuildExtensions/Sources/Macros/AppHook.swift b/Components/BuildExtensions/Sources/Macros/AppHook.swift
similarity index 100%
rename from BuildExtensions/Sources/Macros/AppHook.swift
rename to Components/BuildExtensions/Sources/Macros/AppHook.swift
diff --git a/BuildExtensions/Sources/Macros/UserPreference.swift b/Components/BuildExtensions/Sources/Macros/UserPreference.swift
similarity index 100%
rename from BuildExtensions/Sources/Macros/UserPreference.swift
rename to Components/BuildExtensions/Sources/Macros/UserPreference.swift
diff --git a/BuildExtensions/Sources/MacrosImplementation/AppHookMacro.swift b/Components/BuildExtensions/Sources/MacrosImplementation/AppHookMacro.swift
similarity index 100%
rename from BuildExtensions/Sources/MacrosImplementation/AppHookMacro.swift
rename to Components/BuildExtensions/Sources/MacrosImplementation/AppHookMacro.swift
diff --git a/BuildExtensions/Sources/MacrosImplementation/Plugin.swift b/Components/BuildExtensions/Sources/MacrosImplementation/Plugin.swift
similarity index 100%
rename from BuildExtensions/Sources/MacrosImplementation/Plugin.swift
rename to Components/BuildExtensions/Sources/MacrosImplementation/Plugin.swift
diff --git a/BuildExtensions/Sources/MacrosImplementation/UserPreferenceMacro.swift b/Components/BuildExtensions/Sources/MacrosImplementation/UserPreferenceMacro.swift
similarity index 100%
rename from BuildExtensions/Sources/MacrosImplementation/UserPreferenceMacro.swift
rename to Components/BuildExtensions/Sources/MacrosImplementation/UserPreferenceMacro.swift
diff --git a/BuildExtensions/Tests/MacrosTests/UserPreferenceMacroTests.swift b/Components/BuildExtensions/Tests/MacrosTests/UserPreferenceMacroTests.swift
similarity index 100%
rename from BuildExtensions/Tests/MacrosTests/UserPreferenceMacroTests.swift
rename to Components/BuildExtensions/Tests/MacrosTests/UserPreferenceMacroTests.swift
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 93dd3816c..eecc42bf5 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3020,7 +3020,7 @@
 		DEBB74427E24AF30CDB131B7 /* DeferredFulfillmentTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeferredFulfillmentTests.swift; sourceTree = "<group>"; };
 		DEC1D382565A4E9CAC2F14EA /* MediaFileHandleProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaFileHandleProxy.swift; sourceTree = "<group>"; };
 		DEC6D4E798C1207298964778 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DEF8766F9B1A5CEB15FD0935 /* BuildExtensions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = BuildExtensions; path = BuildExtensions; sourceTree = SOURCE_ROOT; };
+		DEF8766F9B1A5CEB15FD0935 /* BuildExtensions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = BuildExtensions; path = Components/BuildExtensions; sourceTree = SOURCE_ROOT; };
 		DF05DA24F71B455E8EFEBC3B /* SessionVerificationViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationViewModelTests.swift; sourceTree = "<group>"; };
 		DF17EA323AD0205A6AB621AA /* Snapshotting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Snapshotting.swift; sourceTree = "<group>"; };
 		DF3D25B3EDB283B5807EADCF /* ReadMarkerRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadMarkerRoomTimelineItem.swift; sourceTree = "<group>"; };
@@ -7812,7 +7812,7 @@
 				6582B5AF3F104B0F7E031E7D /* XCRemoteSwiftPackageReference "SwiftState" */,
 				EC6D0C817B1C21D9D096505A /* XCRemoteSwiftPackageReference "Version" */,
 				EE40B0E16A55BD23ECBFFD22 /* XCRemoteSwiftPackageReference "matrix-rich-text-editor-swift" */,
-				FE1E8395D966E5C36506BB4A /* XCLocalSwiftPackageReference "BuildExtensions" */,
+				5041EBEAA51463D649A3CF31 /* XCLocalSwiftPackageReference "Components/BuildExtensions" */,
 				C89CF7729E028671C5DC461E /* XCLocalSwiftPackageReference "compound-ios" */,
 			);
 			preferredProjectObjectVersion = 77;
@@ -10674,14 +10674,14 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
+		5041EBEAA51463D649A3CF31 /* XCLocalSwiftPackageReference "Components/BuildExtensions" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Components/BuildExtensions;
+		};
 		C89CF7729E028671C5DC461E /* XCLocalSwiftPackageReference "compound-ios" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = "compound-ios";
 		};
-		FE1E8395D966E5C36506BB4A /* XCLocalSwiftPackageReference "BuildExtensions" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = BuildExtensions;
-		};
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCRemoteSwiftPackageReference section */
diff --git a/project.yml b/project.yml
index d1075f0e9..c6405cf20 100644
--- a/project.yml
+++ b/project.yml
@@ -79,7 +79,7 @@ packages:
   Compound:
     path: compound-ios
   BuildExtensions:
-    path: BuildExtensions
+    path: Components/BuildExtensions
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events
     minorVersion: 0.37.0