Use fully qualified imports in Firestore (#467)

This simplifies the import process back into google3 and allows us to add additional directories to the project without needing to update the project files for each directory we add. This shows up most clearly in the change to Firestore/Example/Firestore.xcodeproj/project.pbxproj: this no longer needs to list essentially every directory in the project as a header search path.

* Clang-format configuration for C++ files
* Add support C++-only sources to the podspec
* Podspec support for fully qualified imports
* xcodeproj changes for fully-qualified imports
* Use fully-qualified imports in Firestore sources

76 files changed, 434 insertions, 434 deletions

diff --git a/Firestore/Example/Tests/API/FIRGeoPointTests.m b/Firestore/Example/Tests/API/FIRGeoPointTests.m
index ca7d24c..3fc8b33 100644
--- a/Firestore/Example/Tests/API/FIRGeoPointTests.m
+++ b/Firestore/Example/Tests/API/FIRGeoPointTests.m
@@ -18,7 +18,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m b/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m
index 931a59f..c7cf22a 100644
--- a/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m
+++ b/Firestore/Example/Tests/Core/FSTDatabaseInfoTests.m
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Core/FSTEventManagerTests.m b/Firestore/Example/Tests/Core/FSTEventManagerTests.m
index 85afe58..99021ce 100644
--- a/Firestore/Example/Tests/Core/FSTEventManagerTests.m
+++ b/Firestore/Example/Tests/Core/FSTEventManagerTests.m
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#import "Core/FSTEventManager.h"
+#import "Firestore/Source/Core/FSTEventManager.h"
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTQuery.h"
-#import "Core/FSTSyncEngine.h"
-#import "Model/FSTDocumentSet.h"
-#import "Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSyncEngine.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Core/FSTQueryListenerTests.m b/Firestore/Example/Tests/Core/FSTQueryListenerTests.m
index 155eb00..1bb7a47 100644
--- a/Firestore/Example/Tests/Core/FSTQueryListenerTests.m
+++ b/Firestore/Example/Tests/Core/FSTQueryListenerTests.m
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#import "Core/FSTEventManager.h"
+#import "Firestore/Source/Core/FSTEventManager.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTQuery.h"
-#import "Core/FSTView.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentSet.h"
-#import "Remote/FSTRemoteEvent.h"
-#import "Util/FSTAsyncQueryListener.h"
-#import "Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTView.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Util/FSTAsyncQueryListener.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Core/FSTQueryTests.m b/Firestore/Example/Tests/Core/FSTQueryTests.m
index 051f10d..1fd0e8b 100644
--- a/Firestore/Example/Tests/Core/FSTQueryTests.m
+++ b/Firestore/Example/Tests/Core/FSTQueryTests.m
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#import "Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTQuery.h"
 
 #import <XCTest/XCTest.h>
 
-#import "API/FIRFirestore+Internal.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTPath.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h b/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h
index ff98e74..ab0697b 100644
--- a/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h
+++ b/Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Core/FSTSyncEngine.h"
+#import "Firestore/Source/Core/FSTSyncEngine.h"
 
 @class FSTDocumentKey;
 
diff --git a/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m b/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m
index 11a7f46..6f54fd1 100644
--- a/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m
+++ b/Firestore/Example/Tests/Core/FSTTargetIDGeneratorTests.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Core/FSTTargetIDGenerator.h"
+#import "Firestore/Source/Core/FSTTargetIDGenerator.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Core/FSTTimestampTests.m b/Firestore/Example/Tests/Core/FSTTimestampTests.m
index 8538078..a3765fe 100644
--- a/Firestore/Example/Tests/Core/FSTTimestampTests.m
+++ b/Firestore/Example/Tests/Core/FSTTimestampTests.m
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#import "Core/FSTTimestamp.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m b/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m
index 202fae8..5d3787a 100644
--- a/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m
+++ b/Firestore/Example/Tests/Core/FSTViewSnapshotTest.m
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#import "Core/FSTViewSnapshot.h"
+#import "Firestore/Source/Core/FSTViewSnapshot.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTQuery.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentSet.h"
-#import "Model/FSTPath.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Core/FSTViewTests.m b/Firestore/Example/Tests/Core/FSTViewTests.m
index d939d62..e6c4510 100644
--- a/Firestore/Example/Tests/Core/FSTViewTests.m
+++ b/Firestore/Example/Tests/Core/FSTViewTests.m
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-#import "Core/FSTView.h"
+#import "Firestore/Source/Core/FSTView.h"
 
 #import <XCTest/XCTest.h>
 
-#import "API/FIRFirestore+Internal.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTViewSnapshot.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTDocumentSet.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTPath.h"
-#import "Remote/FSTRemoteEvent.h"
-
-#import "FSTHelpers.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTViewSnapshot.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm
index 731e698..d22827a 100644
--- a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm
+++ b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm
@@ -17,7 +17,7 @@
 #import <XCTest/XCTest.h>
 #import <objc/runtime.h>
 
-#include "Util/FSTAssert.h"
+#include "Firestore/Source/Util/FSTAssert.h"
 #include "gtest/gtest.h"
 
 /**
diff --git a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m b/Firestore/Example/Tests/Integration/API/FIRCursorTests.m
index 2f8babd..72c55f6 100644
--- a/Firestore/Example/Tests/Integration/API/FIRCursorTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRCursorTests.m
@@ -18,7 +18,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FIRCursorTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m
index 6a6e49a..8ba8903 100644
--- a/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRDatabaseTests.m
@@ -18,9 +18,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTFirestoreClient.h"
-#import "FIRFirestore+Internal.h"
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
 
 @interface FIRDatabaseTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m
index d851556..60bf36b 100644
--- a/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRFieldsTests.m
@@ -18,9 +18,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
 
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FIRFieldsTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m
index 5824314..6b1f787 100644
--- a/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRListenerRegistrationTests.m
@@ -18,9 +18,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTFirestoreClient.h"
-#import "FIRFirestore+Internal.h"
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
 
 @interface FIRListenerRegistrationTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m b/Firestore/Example/Tests/Integration/API/FIRQueryTests.m
index f08df33..b80c52d 100644
--- a/Firestore/Example/Tests/Integration/API/FIRQueryTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRQueryTests.m
@@ -18,9 +18,9 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
 
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FIRQueryTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m
index 1d77e16..da9fb1a 100644
--- a/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRServerTimestampTests.m
@@ -18,10 +18,10 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
 
-#import "FSTEventAccumulator.h"
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FIRServerTimestampTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m b/Firestore/Example/Tests/Integration/API/FIRTypeTests.m
index 4e2c76e..02eccbc 100644
--- a/Firestore/Example/Tests/Integration/API/FIRTypeTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRTypeTests.m
@@ -18,7 +18,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FIRTypeTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m b/Firestore/Example/Tests/Integration/API/FIRValidationTests.m
index 7fa4c3e..444931e 100644
--- a/Firestore/Example/Tests/Integration/API/FIRValidationTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRValidationTests.m
@@ -18,8 +18,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FSTHelpers.h"
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 // We have tests for passing nil when nil is not supposed to be allowed. So suppress the warnings.
 #pragma clang diagnostic ignored "-Wnonnull"
diff --git a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m
index 159cbd7..906b27c 100644
--- a/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m
+++ b/Firestore/Example/Tests/Integration/API/FIRWriteBatchTests.m
@@ -18,8 +18,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FSTEventAccumulator.h"
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FIRWriteBatchTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m b/Firestore/Example/Tests/Integration/FSTDatastoreTests.m
index 54ab66b..d51b21a 100644
--- a/Firestore/Example/Tests/Integration/FSTDatastoreTests.m
+++ b/Firestore/Example/Tests/Integration/FSTDatastoreTests.m
@@ -20,29 +20,29 @@
 #import <GRPCClient/GRPCCall+Tests.h>
 #import <XCTest/XCTest.h>
 
-#import "API/FIRDocumentReference+Internal.h"
-#import "API/FSTUserDataConverter.h"
-#import "Auth/FSTEmptyCredentialsProvider.h"
-#import "Core/FSTDatabaseInfo.h"
-#import "Core/FSTFirestoreClient.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTTimestamp.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTMutationBatch.h"
-#import "Model/FSTPath.h"
-#import "Remote/FSTDatastore.h"
-#import "Remote/FSTRemoteEvent.h"
-#import "Remote/FSTRemoteStore.h"
-#import "Util/FSTAssert.h"
-#import "Util/FSTDispatchQueue.h"
-#import "Util/FSTUtil.h"
-
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Core/FSTFirestoreClient.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Remote/FSTRemoteStore.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTUtil.h"
+
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Integration/FSTSmokeTests.m b/Firestore/Example/Tests/Integration/FSTSmokeTests.m
index e0ad06c..13bace3 100644
--- a/Firestore/Example/Tests/Integration/FSTSmokeTests.m
+++ b/Firestore/Example/Tests/Integration/FSTSmokeTests.m
@@ -18,8 +18,8 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FSTEventAccumulator.h"
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FSTSmokeTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Integration/FSTStreamTests.m b/Firestore/Example/Tests/Integration/FSTStreamTests.m
index a9ee4d1..c8a9e9d 100644
--- a/Firestore/Example/Tests/Integration/FSTStreamTests.m
+++ b/Firestore/Example/Tests/Integration/FSTStreamTests.m
@@ -18,15 +18,15 @@
 
 #import <Firestore/FIRFirestoreSettings.h>
 
-#import "Auth/FSTEmptyCredentialsProvider.h"
-#import "Core/FSTDatabaseInfo.h"
-#import "FSTHelpers.h"
-#import "FSTIntegrationTestCase.h"
-#import "FSTTestDispatchQueue.h"
-#import "Model/FSTDatabaseID.h"
-#import "Remote/FSTDatastore.h"
-#import "Remote/FSTStream.h"
-#import "Util/FSTAssert.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h"
+#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTStream.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 /** Exposes otherwise private methods for testing. */
 @interface FSTStream (Testing)
diff --git a/Firestore/Example/Tests/Integration/FSTTransactionTests.m b/Firestore/Example/Tests/Integration/FSTTransactionTests.m
index a0b5bbe..014e4a7 100644
--- a/Firestore/Example/Tests/Integration/FSTTransactionTests.m
+++ b/Firestore/Example/Tests/Integration/FSTTransactionTests.m
@@ -19,7 +19,7 @@
 #import <XCTest/XCTest.h>
 #include <libkern/OSAtomic.h>
 
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 @interface FSTTransactionTests : FSTIntegrationTestCase
 @end
diff --git a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m
index 34c0685..1dd6d62 100644
--- a/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m
+++ b/Firestore/Example/Tests/Local/FSTEagerGarbageCollectorTests.m
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#import "Local/FSTEagerGarbageCollector.h"
+#import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Local/FSTReferenceSet.h"
-#import "Model/FSTDocumentKey.h"
+#import "Firestore/Source/Local/FSTReferenceSet.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm
index 3374fcf..998d23d 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLevelDBKeyTests.mm
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#import "Local/FSTLevelDBKey.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Model/FSTPath.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m
index d426149..f71f5c9 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m
+++ b/Firestore/Example/Tests/Local/FSTLevelDBLocalStoreTests.m
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import "Local/FSTLocalStore.h"
+#import "Firestore/Source/Local/FSTLocalStore.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Auth/FSTUser.h"
-#import "Local/FSTLevelDB.h"
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
 
-#import "FSTLocalStoreTests.h"
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTLocalStoreTests.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm
index ea6a895..6c26fd9 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLevelDBMutationQueueTests.mm
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#import "Local/FSTLevelDBMutationQueue.h"
+#import "Firestore/Source/Local/FSTLevelDBMutationQueue.h"
 
 #import <XCTest/XCTest.h>
 #include <leveldb/db.h>
 
-#import "Auth/FSTUser.h"
-#import "Local/FSTLevelDB.h"
-#import "Local/FSTLevelDBKey.h"
-#import "Local/FSTWriteGroup.h"
-#include "Port/ordered_code.h"
-#import "Protos/objc/firestore/local/Mutation.pbobjc.h"
+#include "Firestore/Port/ordered_code.h"
+#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
 
-#import "FSTMutationQueueTests.h"
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m
index 8149397..929ab9e 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTLevelDBQueryCacheTests.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "Local/FSTLevelDBQueryCache.h"
+#import "Firestore/Source/Local/FSTLevelDBQueryCache.h"
 
-#import "Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
 
-#import "FSTPersistenceTestHelpers.h"
-#import "FSTQueryCacheTests.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTQueryCacheTests.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm b/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm
index a6af103..1f84aa6 100644
--- a/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm
+++ b/Firestore/Example/Tests/Local/FSTLevelDBRemoteDocumentCacheTests.mm
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import "FSTRemoteDocumentCacheTests.h"
+#import "Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h"
 
 #include <leveldb/db.h>
 
-#import "Local/FSTLevelDB.h"
-#import "Local/FSTLevelDBKey.h"
-#include "Port/ordered_code.h"
+#include "Firestore/Port/ordered_code.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
 
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m
index 0080f89..90f9ca3 100644
--- a/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m
+++ b/Firestore/Example/Tests/Local/FSTLocalSerializerTests.m
@@ -14,33 +14,33 @@
  * limitations under the License.
  */
 
-#import "Local/FSTLocalSerializer.h"
+#import "Firestore/Source/Local/FSTLocalSerializer.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTTimestamp.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTMutationBatch.h"
-#import "Model/FSTPath.h"
-#import "Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
-#import "Protos/objc/firestore/local/Mutation.pbobjc.h"
-#import "Protos/objc/firestore/local/Target.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
-#import "Protos/objc/google/type/Latlng.pbobjc.h"
-#import "Remote/FSTSerializerBeta.h"
-
-#import "FSTHelpers.h"
+#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
+#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Protos/objc/firestore/local/Target.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
+#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
+
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTLocalStoreTests.m
index ab492a7..245e1c4 100644
--- a/Firestore/Example/Tests/Local/FSTLocalStoreTests.m
+++ b/Firestore/Example/Tests/Local/FSTLocalStoreTests.m
@@ -14,33 +14,33 @@
  * limitations under the License.
  */
 
-#import "Local/FSTLocalStore.h"
+#import "Firestore/Source/Local/FSTLocalStore.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Auth/FSTUser.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTTimestamp.h"
-#import "Local/FSTEagerGarbageCollector.h"
-#import "Local/FSTLocalWriteResult.h"
-#import "Local/FSTNoOpGarbageCollector.h"
-#import "Local/FSTPersistence.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTDocumentSet.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTMutationBatch.h"
-#import "Model/FSTPath.h"
-#import "Remote/FSTRemoteEvent.h"
-#import "Remote/FSTWatchChange.h"
-#import "Util/FSTClasses.h"
-
-#import "FSTHelpers.h"
-#import "FSTImmutableSortedDictionary+Testing.h"
-#import "FSTImmutableSortedSet+Testing.h"
-#import "FSTLocalStoreTests.h"
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
+#import "Firestore/Source/Local/FSTLocalWriteResult.h"
+#import "Firestore/Source/Local/FSTNoOpGarbageCollector.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTClasses.h"
+
+#import "Firestore/Example/Tests/Local/FSTLocalStoreTests.h"
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedDictionary+Testing.h"
+#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m b/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m
index e7486d0..b78239e 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryLocalStoreTests.m
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#import "Local/FSTLocalStore.h"
+#import "Firestore/Source/Local/FSTLocalStore.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Local/FSTMemoryPersistence.h"
+#import "Firestore/Source/Local/FSTMemoryPersistence.h"
 
-#import "FSTLocalStoreTests.h"
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTLocalStoreTests.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m
index 4d76393..ab7afee 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryMutationQueueTests.m
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#import "Local/FSTMemoryMutationQueue.h"
+#import "Firestore/Source/Local/FSTMemoryMutationQueue.h"
 
-#import "Auth/FSTUser.h"
-#import "Local/FSTMemoryPersistence.h"
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Local/FSTMemoryPersistence.h"
 
-#import "FSTMutationQueueTests.h"
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
 @interface FSTMemoryMutationQueueTests : FSTMutationQueueTests
 @end
diff --git a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m
index 6574647..fb7df6b 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryQueryCacheTests.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "Local/FSTMemoryQueryCache.h"
+#import "Firestore/Source/Local/FSTMemoryQueryCache.h"
 
-#import "Local/FSTMemoryPersistence.h"
+#import "Firestore/Source/Local/FSTMemoryPersistence.h"
 
-#import "FSTPersistenceTestHelpers.h"
-#import "FSTQueryCacheTests.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTQueryCacheTests.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m
index 7602134..162eef0 100644
--- a/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTMemoryRemoteDocumentCacheTests.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "Local/FSTMemoryRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTMemoryRemoteDocumentCache.h"
 
-#import "Local/FSTMemoryPersistence.h"
+#import "Firestore/Source/Local/FSTMemoryPersistence.h"
 
-#import "FSTPersistenceTestHelpers.h"
-#import "FSTRemoteDocumentCacheTests.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h"
 
 @interface FSTMemoryRemoteDocumentCacheTests : FSTRemoteDocumentCacheTests
 @end
diff --git a/Firestore/Example/Tests/Local/FSTMutationQueueTests.m b/Firestore/Example/Tests/Local/FSTMutationQueueTests.m
index 42ba0b3..f168ac9 100644
--- a/Firestore/Example/Tests/Local/FSTMutationQueueTests.m
+++ b/Firestore/Example/Tests/Local/FSTMutationQueueTests.m
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#import "FSTMutationQueueTests.h"
-
-#import "Auth/FSTUser.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTTimestamp.h"
-#import "Local/FSTEagerGarbageCollector.h"
-#import "Local/FSTMutationQueue.h"
-#import "Local/FSTPersistence.h"
-#import "Local/FSTWriteGroup.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTMutationBatch.h"
-
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTMutationQueueTests.h"
+
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
+#import "Firestore/Source/Local/FSTMutationQueue.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m b/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m
index f3d7914..c773b12 100644
--- a/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m
+++ b/Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.m
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
-#import "Local/FSTLevelDB.h"
-#import "Local/FSTLocalSerializer.h"
-#import "Local/FSTMemoryPersistence.h"
-#import "Model/FSTDatabaseID.h"
-#import "Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLocalSerializer.h"
+#import "Firestore/Source/Local/FSTMemoryPersistence.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.h b/Firestore/Example/Tests/Local/FSTQueryCacheTests.h
index a615372..e2089af 100644
--- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.h
+++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Local/FSTQueryCache.h"
+#import "Firestore/Source/Local/FSTQueryCache.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Local/FSTQueryCacheTests.m b/Firestore/Example/Tests/Local/FSTQueryCacheTests.m
index ed409b4..1fed440 100644
--- a/Firestore/Example/Tests/Local/FSTQueryCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTQueryCacheTests.m
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#import "FSTQueryCacheTests.h"
-
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Local/FSTEagerGarbageCollector.h"
-#import "Local/FSTPersistence.h"
-#import "Local/FSTQueryData.h"
-#import "Local/FSTWriteGroup.h"
-#import "Model/FSTDocumentKey.h"
-
-#import "FSTHelpers.h"
-#import "FSTImmutableSortedSet+Testing.h"
+#import "Firestore/Example/Tests/Local/FSTQueryCacheTests.h"
+
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+#import "Firestore/third_party/Immutable/Tests/FSTImmutableSortedSet+Testing.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTReferenceSetTests.m b/Firestore/Example/Tests/Local/FSTReferenceSetTests.m
index a8c783a..0b852a2 100644
--- a/Firestore/Example/Tests/Local/FSTReferenceSetTests.m
+++ b/Firestore/Example/Tests/Local/FSTReferenceSetTests.m
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "Local/FSTReferenceSet.h"
+#import "Firestore/Source/Local/FSTReferenceSet.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h
index fa2a857..29e7b86 100644
--- a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h
+++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Local/FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentCache.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m
index a875934..e6ec699 100644
--- a/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m
+++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.m
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#import "FSTRemoteDocumentCacheTests.h"
+#import "Firestore/Example/Tests/Local/FSTRemoteDocumentCacheTests.h"
 
-#import "Core/FSTQuery.h"
-#import "Local/FSTPersistence.h"
-#import "Local/FSTWriteGroup.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTDocumentSet.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m b/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m
index ebf7713..1970779 100644
--- a/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m
+++ b/Firestore/Example/Tests/Local/FSTRemoteDocumentChangeBufferTests.m
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#import "Local/FSTRemoteDocumentChangeBuffer.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentChangeBuffer.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Local/FSTLevelDB.h"
-#import "Local/FSTRemoteDocumentCache.h"
-#import "Model/FSTDocument.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTRemoteDocumentCache.h"
+#import "Firestore/Source/Model/FSTDocument.h"
 
-#import "FSTHelpers.h"
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm b/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm
index b829ccf..edd05a3 100644
--- a/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm
+++ b/Firestore/Example/Tests/Local/FSTWriteGroupTests.mm
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#import "Local/FSTWriteGroup.h"
+#import "Firestore/Source/Local/FSTWriteGroup.h"
 
 #import <XCTest/XCTest.h>
 #include <leveldb/db.h>
 
-#import "Local/FSTLevelDB.h"
-#import "Local/FSTLevelDBKey.h"
-#import "Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLevelDBKey.h"
 
-#import "FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
 
 using leveldb::ReadOptions;
 using leveldb::Status;
diff --git a/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m b/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m
index 9e7299f..cb1b19d 100644
--- a/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m
+++ b/Firestore/Example/Tests/Model/FSTDatabaseIDTests.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m b/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m
index ba68009..d66ee73 100644
--- a/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m
+++ b/Firestore/Example/Tests/Model/FSTDocumentKeyTests.m
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Model/FSTPath.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Model/FSTDocumentSetTests.m b/Firestore/Example/Tests/Model/FSTDocumentSetTests.m
index e473088..bf6cd21 100644
--- a/Firestore/Example/Tests/Model/FSTDocumentSetTests.m
+++ b/Firestore/Example/Tests/Model/FSTDocumentSetTests.m
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#import "Model/FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocument.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Model/FSTDocumentTests.m b/Firestore/Example/Tests/Model/FSTDocumentTests.m
index 9ceb0cd..e56ab34 100644
--- a/Firestore/Example/Tests/Model/FSTDocumentTests.m
+++ b/Firestore/Example/Tests/Model/FSTDocumentTests.m
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#import "Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocument.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTSnapshotVersion.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTPath.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Model/FSTFieldValueTests.m b/Firestore/Example/Tests/Model/FSTFieldValueTests.m
index a357e60..744bcc4 100644
--- a/Firestore/Example/Tests/Model/FSTFieldValueTests.m
+++ b/Firestore/Example/Tests/Model/FSTFieldValueTests.m
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-#import "Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
 
 #import <XCTest/XCTest.h>
 
-#import "API/FIRFirestore+Internal.h"
-#import "API/FSTUserDataConverter.h"
-#import "Core/FSTTimestamp.h"
 #import "Firestore/FIRGeoPoint.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTPath.h"
-
-#import "FSTHelpers.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
+
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 /** Helper to wrap the values in a set of equality groups using FSTTestFieldValue(). */
 NSArray *FSTWrapGroups(NSArray *groups) {
diff --git a/Firestore/Example/Tests/Model/FSTMutationTests.m b/Firestore/Example/Tests/Model/FSTMutationTests.m
index 5ad9f94..678755e 100644
--- a/Firestore/Example/Tests/Model/FSTMutationTests.m
+++ b/Firestore/Example/Tests/Model/FSTMutationTests.m
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#import "Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutation.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTTimestamp.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTPath.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
-#import "FSTHelpers.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 @interface FSTMutationTests : XCTestCase
 @end
diff --git a/Firestore/Example/Tests/Model/FSTPathTests.m b/Firestore/Example/Tests/Model/FSTPathTests.m
index a5d3d80..b8529e5 100644
--- a/Firestore/Example/Tests/Model/FSTPathTests.m
+++ b/Firestore/Example/Tests/Model/FSTPathTests.m
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FSTHelpers.h"
-#import "Model/FSTPath.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+#import "Firestore/Source/Model/FSTPath.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m
index 511de72..8c1c16f 100644
--- a/Firestore/Example/Tests/Remote/FSTDatastoreTests.m
+++ b/Firestore/Example/Tests/Remote/FSTDatastoreTests.m
@@ -15,7 +15,7 @@
  */
 
 #import "Firestore/FIRFirestoreErrors.h"
-#import "Remote/FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
 
 #import <GRPCClient/GRPCCall.h>
 #import <XCTest/XCTest.h>
diff --git a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m
index a172af7..a947eb4 100644
--- a/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m
+++ b/Firestore/Example/Tests/Remote/FSTRemoteEventTests.m
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-#import "Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Remote/FSTExistenceFilter.h"
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
 
-#import "FSTHelpers.h"
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m
index c4cf9df..54aa955 100644
--- a/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m
+++ b/Firestore/Example/Tests/Remote/FSTSerializerBetaTests.m
@@ -14,37 +14,37 @@
  * limitations under the License.
  */
 
-#import "Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
 
 #import <GRPCClient/GRPCCall.h>
 #import <XCTest/XCTest.h>
 
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTTimestamp.h"
 #import "Firestore/FIRFieldPath.h"
 #import "Firestore/FIRFirestoreErrors.h"
 #import "Firestore/FIRGeoPoint.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTMutationBatch.h"
-#import "Model/FSTPath.h"
-#import "Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
-#import "Protos/objc/firestore/local/Mutation.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
-#import "Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
-#import "Protos/objc/google/rpc/Status.pbobjc.h"
-#import "Protos/objc/google/type/Latlng.pbobjc.h"
-#import "Remote/FSTWatchChange.h"
-
-#import "FSTHelpers.h"
+#import "Firestore/Protos/objc/firestore/local/MaybeDocument.pbobjc.h"
+#import "Firestore/Protos/objc/firestore/local/Mutation.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Common.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Document.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Firestore.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Query.pbobjc.h"
+#import "Firestore/Protos/objc/google/firestore/v1beta1/Write.pbobjc.h"
+#import "Firestore/Protos/objc/google/rpc/Status.pbobjc.h"
+#import "Firestore/Protos/objc/google/type/Latlng.pbobjc.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTMutationBatch.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h
index f94fe05..73d8e34 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h
+++ b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h
@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Core/FSTTypes.h"
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m
index cb5e479..6bb314d 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m
+++ b/Firestore/Example/Tests/Remote/FSTWatchChange+Testing.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
 
-#import "Model/FSTDocument.h"
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m
index ccbd644..df2496b 100644
--- a/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m
+++ b/Firestore/Example/Tests/Remote/FSTWatchChangeTests.m
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import "Remote/FSTWatchChange.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Model/FSTDocument.h"
-#import "Remote/FSTExistenceFilter.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
 
-#import "FSTHelpers.h"
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m b/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m
index 88b3f12..a67f667 100644
--- a/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m
+++ b/Firestore/Example/Tests/SpecTests/FSTLevelDBSpecTests.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "FSTSpecTests.h"
+#import "Firestore/Example/Tests/SpecTests/FSTSpecTests.h"
 
-#import "Local/FSTLevelDB.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
 
-#import "FSTPersistenceTestHelpers.h"
-#import "FSTSyncEngineTestDriver.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m b/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m
index 9cf1f39..3030ab5 100644
--- a/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m
+++ b/Firestore/Example/Tests/SpecTests/FSTMemorySpecTests.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "FSTSpecTests.h"
+#import "Firestore/Example/Tests/SpecTests/FSTSpecTests.h"
 
-#import "Local/FSTMemoryPersistence.h"
+#import "Firestore/Source/Local/FSTMemoryPersistence.h"
 
-#import "FSTPersistenceTestHelpers.h"
-#import "FSTSyncEngineTestDriver.h"
+#import "Firestore/Example/Tests/Local/FSTPersistenceTestHelpers.h"
+#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h
index 8d65529..5420c2e 100644
--- a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h
+++ b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Remote/FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m
index d3b196b..9a1d719 100644
--- a/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m
+++ b/Firestore/Example/Tests/SpecTests/FSTMockDatastore.m
@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-#import "FSTMockDatastore.h"
-
-#import "Auth/FSTEmptyCredentialsProvider.h"
-#import "Core/FSTDatabaseInfo.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTMutation.h"
-#import "Remote/FSTSerializerBeta.h"
-#import "Remote/FSTStream.h"
-#import "Util/FSTAssert.h"
-#import "Util/FSTLogger.h"
-
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/SpecTests/FSTMockDatastore.h"
+
+#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h"
+#import "Firestore/Source/Core/FSTDatabaseInfo.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Remote/FSTSerializerBeta.h"
+#import "Firestore/Source/Remote/FSTStream.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTLogger.h"
+
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
 
 @class GRPCProtoCall;
 
diff --git a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m b/Firestore/Example/Tests/SpecTests/FSTSpecTests.m
index 08ff6c7..8782495 100644
--- a/Firestore/Example/Tests/SpecTests/FSTSpecTests.m
+++ b/Firestore/Example/Tests/SpecTests/FSTSpecTests.m
@@ -14,34 +14,34 @@
  * limitations under the License.
  */
 
-#import "FSTSpecTests.h"
+#import "Firestore/Example/Tests/SpecTests/FSTSpecTests.h"
 
 #import <GRPCClient/GRPCCall.h>
 
-#import "Auth/FSTUser.h"
-#import "Core/FSTEventManager.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTViewSnapshot.h"
 #import "Firestore/FIRFirestoreErrors.h"
-#import "Local/FSTEagerGarbageCollector.h"
-#import "Local/FSTNoOpGarbageCollector.h"
-#import "Local/FSTPersistence.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTPath.h"
-#import "Remote/FSTExistenceFilter.h"
-#import "Remote/FSTWatchChange.h"
-#import "Util/FSTAssert.h"
-#import "Util/FSTClasses.h"
-#import "Util/FSTLogger.h"
-
-#import "FSTHelpers.h"
-#import "FSTSyncEngineTestDriver.h"
-#import "FSTWatchChange+Testing.h"
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Core/FSTEventManager.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTViewSnapshot.h"
+#import "Firestore/Source/Local/FSTEagerGarbageCollector.h"
+#import "Firestore/Source/Local/FSTNoOpGarbageCollector.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTExistenceFilter.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTClasses.h"
+#import "Firestore/Source/Util/FSTLogger.h"
+
+#import "Firestore/Example/Tests/Remote/FSTWatchChange+Testing.h"
+#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h
index e78ef92..3d031bd 100644
--- a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h
+++ b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Core/FSTTypes.h"
+#import "Firestore/Source/Core/FSTTypes.h"
 
 @class FSTDocumentKey;
 @class FSTMutation;
diff --git a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m
index a4678e3..5a2c311 100644
--- a/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m
+++ b/Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.m
@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-#import "FSTSyncEngineTestDriver.h"
+#import "Firestore/Example/Tests/SpecTests/FSTSyncEngineTestDriver.h"
 
 #import <GRPCClient/GRPCCall.h>
 
-#import "Auth/FSTUser.h"
-#import "Core/FSTEventManager.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTSyncEngine.h"
 #import "Firestore/FIRFirestoreErrors.h"
-#import "Local/FSTLocalStore.h"
-#import "Local/FSTPersistence.h"
-#import "Model/FSTMutation.h"
-#import "Remote/FSTDatastore.h"
-#import "Remote/FSTWatchChange.h"
-#import "Util/FSTAssert.h"
-#import "Util/FSTDispatchQueue.h"
-#import "Util/FSTLogger.h"
-
-#import "FSTMockDatastore.h"
-#import "FSTSyncEngine+Testing.h"
+#import "Firestore/Source/Auth/FSTUser.h"
+#import "Firestore/Source/Core/FSTEventManager.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTSyncEngine.h"
+#import "Firestore/Source/Local/FSTLocalStore.h"
+#import "Firestore/Source/Local/FSTPersistence.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Remote/FSTDatastore.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTLogger.h"
+
+#import "Firestore/Example/Tests/Core/FSTSyncEngine+Testing.h"
+#import "Firestore/Example/Tests/SpecTests/FSTMockDatastore.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Util/FSTAssertTests.m b/Firestore/Example/Tests/Util/FSTAssertTests.m
index f0734df..0cba03f 100644
--- a/Firestore/Example/Tests/Util/FSTAssertTests.m
+++ b/Firestore/Example/Tests/Util/FSTAssertTests.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Util/FSTComparisonTests.m b/Firestore/Example/Tests/Util/FSTComparisonTests.m
index 9728f20..5632e64 100644
--- a/Firestore/Example/Tests/Util/FSTComparisonTests.m
+++ b/Firestore/Example/Tests/Util/FSTComparisonTests.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Util/FSTComparison.h"
+#import "Firestore/Source/Util/FSTComparison.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Util/FSTEventAccumulator.m b/Firestore/Example/Tests/Util/FSTEventAccumulator.m
index c7e5b41..b44ec67 100644
--- a/Firestore/Example/Tests/Util/FSTEventAccumulator.m
+++ b/Firestore/Example/Tests/Util/FSTEventAccumulator.m
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#import "FSTEventAccumulator.h"
+#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
 
 #import <XCTest/XCTest.h>
 
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
-#import "XCTestCase+Await.h"
+#import "Firestore/Example/Tests/Util/XCTestCase+Await.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Util/FSTHelpers.h b/Firestore/Example/Tests/Util/FSTHelpers.h
index 3facc9c..91ccbcf 100644
--- a/Firestore/Example/Tests/Util/FSTHelpers.h
+++ b/Firestore/Example/Tests/Util/FSTHelpers.h
@@ -16,10 +16,10 @@
 
 #import <Foundation/Foundation.h>
 
-#import "API/FIRDocumentReference+Internal.h"
-#import "Core/FSTTypes.h"
-#import "Model/FSTDocumentDictionary.h"
-#import "Model/FSTDocumentKeySet.h"
+#import "Firestore/Source/API/FIRDocumentReference+Internal.h"
+#import "Firestore/Source/Core/FSTTypes.h"
+#import "Firestore/Source/Model/FSTDocumentDictionary.h"
+#import "Firestore/Source/Model/FSTDocumentKeySet.h"
 
 @class FIRGeoPoint;
 @class FSTDeleteMutation;
diff --git a/Firestore/Example/Tests/Util/FSTHelpers.m b/Firestore/Example/Tests/Util/FSTHelpers.m
index 3b7f47f..7b24649 100644
--- a/Firestore/Example/Tests/Util/FSTHelpers.m
+++ b/Firestore/Example/Tests/Util/FSTHelpers.m
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-#import "FSTHelpers.h"
-
-#import "API/FIRFieldPath+Internal.h"
-#import "API/FSTUserDataConverter.h"
-#import "Core/FSTQuery.h"
-#import "Core/FSTSnapshotVersion.h"
-#import "Core/FSTTimestamp.h"
-#import "Core/FSTView.h"
+#import "Firestore/Example/Tests/Util/FSTHelpers.h"
+
 #import "Firestore/FIRFieldPath.h"
 #import "Firestore/FIRGeoPoint.h"
-#import "Local/FSTLocalViewChanges.h"
-#import "Local/FSTQueryData.h"
-#import "Model/FSTDatabaseID.h"
-#import "Model/FSTDocument.h"
-#import "Model/FSTDocumentKey.h"
-#import "Model/FSTDocumentSet.h"
-#import "Model/FSTFieldValue.h"
-#import "Model/FSTMutation.h"
-#import "Model/FSTPath.h"
-#import "Remote/FSTRemoteEvent.h"
-#import "Remote/FSTWatchChange.h"
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/API/FIRFieldPath+Internal.h"
+#import "Firestore/Source/API/FSTUserDataConverter.h"
+#import "Firestore/Source/Core/FSTQuery.h"
+#import "Firestore/Source/Core/FSTSnapshotVersion.h"
+#import "Firestore/Source/Core/FSTTimestamp.h"
+#import "Firestore/Source/Core/FSTView.h"
+#import "Firestore/Source/Local/FSTLocalViewChanges.h"
+#import "Firestore/Source/Local/FSTQueryData.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Model/FSTDocument.h"
+#import "Firestore/Source/Model/FSTDocumentKey.h"
+#import "Firestore/Source/Model/FSTDocumentSet.h"
+#import "Firestore/Source/Model/FSTFieldValue.h"
+#import "Firestore/Source/Model/FSTMutation.h"
+#import "Firestore/Source/Model/FSTPath.h"
+#import "Firestore/Source/Remote/FSTRemoteEvent.h"
+#import "Firestore/Source/Remote/FSTWatchChange.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h
index 1170080..88f9346 100644
--- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h
+++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.h
@@ -17,7 +17,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 
-#import "XCTestCase+Await.h"
+#import "Firestore/Example/Tests/Util/XCTestCase+Await.h"
 
 @class FIRCollectionReference;
 @class FIRDocumentSnapshot;
diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
index 4bfdb41..187eb60 100644
--- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
+++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm
@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-#import "FSTIntegrationTestCase.h"
+#import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h"
 
 #import <FirebaseCommunity/FIRLogger.h>
 #import <Firestore/Firestore-umbrella.h>
 #import <GRPCClient/GRPCCall+ChannelArg.h>
 #import <GRPCClient/GRPCCall+Tests.h>
 
-#import "API/FIRFirestore+Internal.h"
-#import "Auth/FSTEmptyCredentialsProvider.h"
-#import "Local/FSTLevelDB.h"
-#import "Model/FSTDatabaseID.h"
-#import "Util/FSTDispatchQueue.h"
-#import "Util/FSTUtil.h"
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
+#import "Firestore/Source/Auth/FSTEmptyCredentialsProvider.h"
+#import "Firestore/Source/Local/FSTLevelDB.h"
+#import "Firestore/Source/Model/FSTDatabaseID.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTUtil.h"
 
-#import "FSTEventAccumulator.h"
-#import "FSTTestDispatchQueue.h"
+#import "Firestore/Example/Tests/Util/FSTEventAccumulator.h"
+#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h
index 4f4e13e..7ecbbaf 100644
--- a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h
+++ b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.h
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Util/FSTDispatchQueue.h"
+#import "Firestore/Source/Util/FSTDispatchQueue.h"
 
 @class XCTestExpectation;
 
diff --git a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m
index 27b62bc..8124cf2 100644
--- a/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m
+++ b/Firestore/Example/Tests/Util/FSTTestDispatchQueue.m
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "FSTTestDispatchQueue.h"
+#import "Firestore/Example/Tests/Util/FSTTestDispatchQueue.h"
 
 #import <XCTest/XCTestExpectation.h>
 
-#import "Util/FSTAssert.h"
+#import "Firestore/Source/Util/FSTAssert.h"
 
 @interface FSTTestDispatchQueue ()
 
diff --git a/Firestore/Example/Tests/Util/FSTUtilTests.m b/Firestore/Example/Tests/Util/FSTUtilTests.m
index 998832d..d59ed7a 100644
--- a/Firestore/Example/Tests/Util/FSTUtilTests.m
+++ b/Firestore/Example/Tests/Util/FSTUtilTests.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Util/FSTUtil.h"
+#import "Firestore/Source/Util/FSTUtil.h"
 
 #import <XCTest/XCTest.h>
 
diff --git a/Firestore/Example/Tests/Util/XCTestCase+Await.m b/Firestore/Example/Tests/Util/XCTestCase+Await.m
index e200c8c..15c67ca 100644
--- a/Firestore/Example/Tests/Util/XCTestCase+Await.m
+++ b/Firestore/Example/Tests/Util/XCTestCase+Await.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "XCTestCase+Await.h"
+#import "Firestore/Example/Tests/Util/XCTestCase+Await.h"
 
 #import <Foundation/Foundation.h>