Crashlytics - Repo-relative imports and SwiftPM (#5931)

Crashlytics/Crashlytics/Components/FIRCLSApplication.m

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
 
-#import "FIRCLSHost.h"
-#import "FIRCLSUtility.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSHost.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 #if CLS_TARGET_OS_OSX
 #import <AppKit/AppKit.h>

Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h

@@ -17,9 +17,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "FIRCLSFeatures.h"
-#include "FIRCLSFile.h"
-#include "FIRCLSMachO.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#include "Crashlytics/Shared/FIRCLSMachO/FIRCLSMachO.h"
 
 __BEGIN_DECLS
 

Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSBinaryImage.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h"
 
 #include <libkern/OSAtomic.h>
 #include <mach-o/dyld.h>
@@ -21,13 +21,13 @@
 
 #include <stdatomic.h>
 
-#include "FIRCLSByteUtility.h"
-#include "FIRCLSFeatures.h"
-#include "FIRCLSFile.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSHost.h"
-#include "FIRCLSMachO.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSHost.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+#include "Crashlytics/Shared/FIRCLSByteUtility.h"
+#include "Crashlytics/Shared/FIRCLSMachO/FIRCLSMachO.h"
 
 #include <dispatch/dispatch.h>
 

Crashlytics/Crashlytics/Components/FIRCLSContext.h

@@ -14,15 +14,15 @@
 
 #pragma once
 
-#include "FIRCLSAllocate.h"
-#include "FIRCLSBinaryImage.h"
-#include "FIRCLSException.h"
-#include "FIRCLSFeatures.h"
-#include "FIRCLSHost.h"
-#include "FIRCLSInternalLogging.h"
-#include "FIRCLSMachException.h"
-#include "FIRCLSSignal.h"
-#include "FIRCLSUserLogging.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSHost.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSException.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSMachException.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSSignal.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSAllocate.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSInternalLogging.h"
 
 #include <dispatch/dispatch.h>
 #include <stdbool.h>

Crashlytics/Crashlytics/Components/FIRCLSContext.m

@@ -12,23 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSContext.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#import "FIRCLSFileManager.h"
-#import "FIRCLSInstallIdentifierModel.h"
-#import "FIRCLSInternalReport.h"
-#import "FIRCLSSettings.h"
-
-#include "FIRCLSApplication.h"
-#include "FIRCLSCrashedMarkerFile.h"
-#include "FIRCLSDefines.h"
-#include "FIRCLSFeatures.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSProcess.h"
-#include "FIRCLSUtility.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
+
+#include "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSProcess.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 // The writable size is our handler stack plus whatever scratch we need.  We have to use this space
 // extremely carefully, however, because thread stacks always needs to be page-aligned.  Only the

Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.c

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSCrashedMarkerFile.h"
-#include "FIRCLSFile.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 const char *FIRCLSCrashedMarkerFileName = "previously-crashed";
 

Crashlytics/Crashlytics/Components/FIRCLSGlobals.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSContext.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
 
 __BEGIN_DECLS
 

Crashlytics/Crashlytics/Components/FIRCLSHost.h

@@ -17,7 +17,7 @@
 #include <mach/vm_types.h>
 #include <sys/cdefs.h>
 
-#include "FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 
 typedef struct {
   const char* documentDirectoryPath;

Crashlytics/Crashlytics/Components/FIRCLSHost.m

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSHost.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSHost.h"
 
 #include <mach/mach.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 
-#import "FIRCLSApplication.h"
-#include "FIRCLSDefines.h"
-#import "FIRCLSFABHost.h"
-#include "FIRCLSFile.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSUtility.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+#import "Crashlytics/Shared/FIRCLSFABHost.h"
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>

Crashlytics/Crashlytics/Components/FIRCLSProcess.c

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSProcess.h"
-#include "FIRCLSDefines.h"
-#include "FIRCLSFeatures.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSProfiling.h"
-#include "FIRCLSThreadState.h"
-#include "FIRCLSUnwind.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSProcess.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSThreadState.h"
+#include "Crashlytics/Crashlytics/Unwind/FIRCLSUnwind.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 #include <dispatch/dispatch.h>
 #include <objc/message.h>

Crashlytics/Crashlytics/Components/FIRCLSProcess.h

@@ -17,7 +17,7 @@
 #include <mach/mach.h>
 #include <stdbool.h>
 
-#include "FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 
 typedef struct {
   // task info

Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 
 __BEGIN_DECLS
 

Crashlytics/Crashlytics/Components/FIRCLSUserLogging.m

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSUserLogging.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h"
 
 #include <sys/time.h>
 
-#include "FIRCLSGlobals.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
-#import "FIRCLSReportManager_Private.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h"
 
 NSString *const FIRCLSStartTimeKey = @"com.crashlytics.kit-start-time";
 NSString *const FIRCLSFirstRunloopTurnTimeKey = @"com.crashlytics.first-run-loop-time";

Crashlytics/Crashlytics/Controllers/FIRCLSNetworkClient.m

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSNetworkClient.h"
-
-#import "FIRCLSApplication.h"
-#import "FIRCLSByteUtility.h"
-#import "FIRCLSDataCollectionToken.h"
-#import "FIRCLSDefines.h"
-#import "FIRCLSFileManager.h"
-#import "FIRCLSNetworkResponseHandler.h"
-#import "FIRCLSURLSession.h"
-#import "FIRCLSURLSessionConfiguration.h"
-
-#import "FIRCLSUtility.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSNetworkClient.h"
+
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionConfiguration.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Shared/FIRCLSByteUtility.h"
+#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSNetworkResponseHandler.h"
+
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 NSString *const FIRCLSNetworkClientErrorDomain = @"FIRCLSNetworkError";
 

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h

@@ -14,9 +14,9 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FIRCLSApplicationIdentifierModel.h"
-#include "FIRCLSProfiling.h"
-#include "FIRCrashlytics.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.h"
+#include "Crashlytics/Crashlytics/Public/FIRCrashlytics.h"
+#include "Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h"
 
 @class FBLPromise<T>;
 

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.m

@@ -38,37 +38,37 @@
 #import "FBLPromises.h"
 #endif
 
-#import "FIRCLSApplication.h"
-#import "FIRCLSDataCollectionArbiter.h"
-#import "FIRCLSDataCollectionToken.h"
-#import "FIRCLSDefines.h"
-#import "FIRCLSFeatures.h"
-#import "FIRCLSFileManager.h"
-#import "FIRCLSInternalReport.h"
-#import "FIRCLSLogger.h"
-#import "FIRCLSNetworkClient.h"
-#import "FIRCLSPackageReportOperation.h"
-#import "FIRCLSProcessReportOperation.h"
-#import "FIRCLSReportUploader.h"
-#import "FIRCLSSettings.h"
-#import "FIRCLSSymbolResolver.h"
-#import "FIRCLSUserLogging.h"
-
-#include "FIRCLSGlobals.h"
-#include "FIRCLSUtility.h"
-
-#import "FIRCLSConstants.h"
-#import "FIRCLSExecutionIdentifierModel.h"
-#import "FIRCLSInstallIdentifierModel.h"
-#import "FIRCLSSettingsOnboardingManager.h"
-
-#import "FIRCLSReportManager_Private.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSNetworkClient.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.h"
+#import "Crashlytics/Crashlytics/Operations/Reports/FIRCLSPackageReportOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Reports/FIRCLSProcessReportOperation.h"
+
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+
+#import "Crashlytics/Crashlytics/Models/FIRCLSExecutionIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.h"
+#import "Crashlytics/Shared/FIRCLSConstants.h"
+
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h"
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInteropListener.h"
 
-#include "FIRAEvent+Internal.h"
-#include "FIRCLSFCRAnalytics.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRAEvent+Internal.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFCRAnalytics.h"
 
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>

Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSReportManager.h"
-#import "FIRCLSReportUploader.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.h"
 
 @class FIRCLSInstallIdentifierModel;
 

Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.h

@@ -14,14 +14,13 @@
 
 #import <Foundation/Foundation.h>
 
-#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
-
 @class FIRCLSDataCollectionToken;
 @class FIRCLSInternalReport;
 @class FIRCLSSettings;
 @class FIRCLSFileManager;
 @class FIRCLSNetworkClient;
 @class FIRCLSReportUploader;
+@class GDTCORTransport;
 
 @protocol FIRCLSReportUploaderDelegate;
 @protocol FIRCLSReportUploaderDataSource;

Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m

@@ -14,27 +14,27 @@
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
-#import "FIRCLSApplication.h"
-#import "FIRCLSDataCollectionArbiter.h"
-#import "FIRCLSDataCollectionToken.h"
-#import "FIRCLSDefines.h"
-#import "FIRCLSFCRAnalytics.h"
-#import "FIRCLSFileManager.h"
-#import "FIRCLSInstallIdentifierModel.h"
-#import "FIRCLSInternalReport.h"
-#import "FIRCLSNetworkClient.h"
-#import "FIRCLSPackageReportOperation.h"
-#import "FIRCLSProcessReportOperation.h"
-#import "FIRCLSReportAdapter.h"
-#import "FIRCLSReportUploader_Private.h"
-#import "FIRCLSSettings.h"
-#import "FIRCLSSymbolResolver.h"
-
-#include "FIRCLSUtility.h"
-
-#import "FIRCLSConstants.h"
-#import "FIRCLSMultipartMimeStreamEncoder.h"
-#import "FIRCLSURLBuilder.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSNetworkClient.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader_Private.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSFCRAnalytics.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.h"
+#import "Crashlytics/Crashlytics/Operations/Reports/FIRCLSPackageReportOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Reports/FIRCLSProcessReportOperation.h"
+
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+
+#import "Crashlytics/Shared/FIRCLSConstants.h"
+#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSMultipartMimeStreamEncoder.h"
+#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSURLBuilder.h"
 
 #import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
 

Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader_Private.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSReportUploader.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.h"
 
 @interface FIRCLSReportUploader (PrivateMethods)
 

Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSDataCollectionArbiter.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.h"
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>
@@ -22,7 +22,7 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCLSUserDefaults.h"
+#import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h"
 
 // The legacy data collection setting allows Fabric customers to turn off auto-
 // initialization, but can be overridden by calling [Fabric with:].

Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSDataCollectionToken.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
 
 @implementation FIRCLSDataCollectionToken
 

Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.h

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 
-#import "FIRCLSURLSessionConfiguration.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionConfiguration.h"
 
 #import <Foundation/Foundation.h>
 

Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.m

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
-#import "FIRCLSURLSession.h"
-
-#import "FIRCLSURLSessionDataTask.h"
-#import "FIRCLSURLSessionDataTask_PrivateMethods.h"
-#import "FIRCLSURLSessionDownloadTask.h"
-#import "FIRCLSURLSessionDownloadTask_PrivateMethods.h"
-#import "FIRCLSURLSessionTask_PrivateMethods.h"
-#import "FIRCLSURLSessionUploadTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.h"
+
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionTask_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionUploadTask.h"
 
 #define DELEGATE ((id<NSURLSessionDataDelegate, NSURLSessionDownloadDelegate>)self->_delegate)
 

Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionConfiguration.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 

Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionConfiguration.m

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
-#import "FIRCLSURLSession.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.h"
 
 #if FIRCLSURLSESSION_REQUIRED
-#import "FIRCLSURLSessionConfiguration.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionConfiguration.h"
 
 @implementation FIRCLSURLSessionConfiguration
 

Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession_PrivateMethods.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.h

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 
-#import "FIRCLSURLSessionTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionTask.h"
 
 @interface FIRCLSURLSessionDataTask : FIRCLSURLSessionTask {
   void (^_completionHandler)(NSData *data, NSURLResponse *response, NSError *error);

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.m

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
-#import "FIRCLSURLSessionDataTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.h"
 
-#import "FIRCLSURLSessionDataTask_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask_PrivateMethods.h"
 
 #define DELEGATE ((id<FIRCLSURLSessionDataDelegate>)[self delegate])
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask_PrivateMethods.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 
 #import <Foundation/Foundation.h>
 
-#import "FIRCLSURLSessionTask_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionTask_PrivateMethods.h"
 
 @protocol FIRCLSURLSessionDataDelegate;
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask.h

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 
-#import "FIRCLSURLSessionDataTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.h"
 
 @protocol FIRCLSURLSessionDownloadDelegate;
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask.m

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
-#import "FIRCLSURLSessionDownloadTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask.h"
 
-#import "FIRCLSURLSessionDownloadTask_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask_PrivateMethods.h"
 
 #define DELEGATE ((id<FIRCLSURLSessionDownloadDelegate>)[self delegate])
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDownloadTask_PrivateMethods.h

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 
 #import <Foundation/Foundation.h>
 
-#import "FIRCLSURLSessionDataTask_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask_PrivateMethods.h"
 
 @protocol FIRCLSURLSessionDownloadDelegate;
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionTask.m

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
-#import "FIRCLSURLSession.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession.h"
 
-#import "FIRCLSURLSessionTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionTask.h"
 
-#import "FIRCLSURLSessionTask_PrivateMethods.h"
-#import "FIRCLSURLSession_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSession_PrivateMethods.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionTask_PrivateMethods.h"
 
 @implementation FIRCLSURLSessionTask
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionTask_PrivateMethods.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionUploadTask.h

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
 
-#import "FIRCLSURLSessionDataTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionDataTask.h"
 
 @interface FIRCLSURLSessionUploadTask : FIRCLSURLSessionDataTask
 

Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionUploadTask.m

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSURLSessionAvailability.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/FIRCLSURLSessionAvailability.h"
 
 #if FIRCLSURLSESSION_REQUIRED
-#import "FIRCLSURLSessionUploadTask.h"
+#import "Crashlytics/Crashlytics/FIRCLSURLSession/Tasks/FIRCLSURLSessionUploadTask.h"
 
 @implementation FIRCLSURLSessionUploadTask
 

Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.m

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSUserDefaults.h"
+#import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h"
 
-#import "FIRCLSApplication.h"
-#import "FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
 
 #define CLS_USER_DEFAULTS_SERIAL_DISPATCH_QUEUE "com.crashlytics.CLSUserDefaults.access"
 #define CLS_USER_DEFAULTS_SYNC_QUEUE "com.crashlytics.CLSUserDefaults.io"

Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults_private.h

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import "FIRCLSUserDefaults.h"
+#import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h"
 
 @interface FIRCLSUserDefaults (Private)
 - (BOOL)synchronizeWroteToDisk;

Crashlytics/Crashlytics/FIRCrashlytics.m

@@ -20,26 +20,26 @@
 #import "FBLPromises.h"
 #endif
 
-#import "FIRCLSApplicationIdentifierModel.h"
-#include "FIRCLSCrashedMarkerFile.h"
-#import "FIRCLSDataCollectionArbiter.h"
-#import "FIRCLSDefines.h"
-#include "FIRCLSException.h"
-#import "FIRCLSFileManager.h"
-#include "FIRCLSGlobals.h"
-#import "FIRCLSHost.h"
-#include "FIRCLSProfiling.h"
-#import "FIRCLSReport_Private.h"
-#import "FIRCLSSettings.h"
-#import "FIRCLSUserDefaults.h"
-#include "FIRCLSUserLogging.h"
-#include "FIRCLSUtility.h"
-
-#import "FIRCLSByteUtility.h"
-#import "FIRCLSFABHost.h"
-#import "FIRCLSLogger.h"
-
-#import "FIRCLSReportManager.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSHost.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h"
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.h"
+#import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSException.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSReport_Private.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
+#import "Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h"
+
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Shared/FIRCLSByteUtility.h"
+#import "Crashlytics/Shared/FIRCLSFABHost.h"
+
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"

Crashlytics/Crashlytics/FIRExceptionModel.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRExceptionModel.h"
+#import "Crashlytics/Crashlytics/Public/FIRExceptionModel.h"
 
 @interface FIRExceptionModel ()
 

Crashlytics/Crashlytics/FIRStackFrame.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRStackFrame_Private.h"
+#import "Crashlytics/Crashlytics/Private/FIRStackFrame_Private.h"
 
 @interface FIRStackFrame ()
 

Crashlytics/Crashlytics/Handlers/FIRCLSException.mm

@@ -14,22 +14,22 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FIRCLSException.h"
-
-#import "FIRExceptionModel_Private.h"
-#import "FIRStackFrame_Private.h"
-
-#include "FIRCLSApplication.h"
-#include "FIRCLSFile.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSHandler.h"
-#import "FIRCLSLogger.h"
-#include "FIRCLSProcess.h"
-#import "FIRCLSUserLogging.h"
-#import "FIRCLSUtility.h"
-
-#include "FIRCLSDemangleOperation.h"
-#import "FIRCLSReportManager_Private.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSException.h"
+
+#import "Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h"
+#import "Crashlytics/Crashlytics/Private/FIRStackFrame_Private.h"
+
+#include "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSProcess.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h"
+#include "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSDemangleOperation.h"
 
 // C++/Objective-C exception handling
 #include <cxxabi.h>

Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h

@@ -16,7 +16,7 @@
 
 #include <mach/mach.h>
 
-#include "FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 
 __BEGIN_DECLS
 

Crashlytics/Crashlytics/Handlers/FIRCLSHandler.m

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSHandler.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h"
 
-#include "FIRCLSCrashedMarkerFile.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSHost.h"
-#include "FIRCLSProcess.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSCrashedMarkerFile.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSHost.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSProcess.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
-#import "FIRCLSReportManager_Private.h"
+#import "Crashlytics/Crashlytics/Controllers/FIRCLSReportManager_Private.h"
 
 void FIRCLSHandler(FIRCLSFile* file, thread_t crashedThread, void* uapVoid) {
   FIRCLSProcess process;

Crashlytics/Crashlytics/Handlers/FIRCLSMachException.c

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSDefines.h"
-#include "FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
 
 #if CLS_MACH_EXCEPTION_SUPPORTED
 
-#include "FIRCLSGlobals.h"
-#include "FIRCLSHandler.h"
-#include "FIRCLSMachException.h"
-#include "FIRCLSProcess.h"
-#include "FIRCLSSignal.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSMachException.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSProcess.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSSignal.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 #include <errno.h>
 #include <mach/mach.h>

Crashlytics/Crashlytics/Handlers/FIRCLSMachException.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
 
 #pragma once
 

Crashlytics/Crashlytics/Handlers/FIRCLSSignal.c

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSSignal.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSHandler.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSSignal.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Handlers/FIRCLSHandler.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 #include <dlfcn.h>
 #include <stdlib.h>

Crashlytics/Crashlytics/Handlers/FIRCLSSignal.h

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "FIRCLSFeatures.h"
-#include "FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 
 #include <signal.h>
 #include <stdbool.h>

Crashlytics/Crashlytics/Helpers/FIRAEvent+Internal.h

@@ -15,8 +15,8 @@
 #ifndef FIRAEvent_Internal_h
 #define FIRAEvent_Internal_h
 
-#import "FIRAEvent.h"
-#import "FIRAValue.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRAEvent.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRAValue.h"
 
 NSString* FIRCLSFIRAEventDictionaryToJSON(NSDictionary* eventAsDictionary);
 

Crashlytics/Crashlytics/Helpers/FIRAEvent+Internal.m

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRAEvent+Internal.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRAEvent+Internal.h"
 
-#import "FIRCLSUtility.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 NSString* FIRCLSFIRAEventDictionaryToJSON(NSDictionary* eventAsDictionary) {
   NSError* error = nil;

Crashlytics/Crashlytics/Helpers/FIRCLSAllocate.c

@@ -14,9 +14,9 @@
 
 #include <stdatomic.h>
 
-#include "FIRCLSAllocate.h"
-#include "FIRCLSHost.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSAllocate.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSHost.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 #include <errno.h>
 #include <libkern/OSAtomic.h>

Crashlytics/Crashlytics/Helpers/FIRCLSAllocate.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
 
 #pragma once
 

Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "TargetConditionals.h"
+#include <TargetConditionals.h>
 
 // macro trickiness
 #define STR_HELPER(x) #x

Crashlytics/Crashlytics/Helpers/FIRCLSFCRAnalytics.m

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSFCRAnalytics.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSFCRAnalytics.h"
 
-#import "FIRCLSInternalLogging.h"
-#import "FIRCLSSettings.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSInternalLogging.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 

Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "FIRCLSDefines.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
 
 #define CLS_MEMORY_PROTECTION_ENABLED 1
 #define CLS_COMPACT_UNWINDED_ENABLED 1

Crashlytics/Crashlytics/Helpers/FIRCLSFile.m

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSFile.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 
-#include "FIRCLSByteUtility.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
+#include "Crashlytics/Shared/FIRCLSByteUtility.h"
 
 #if TARGET_OS_MAC
 #include <Foundation/Foundation.h>

Crashlytics/Crashlytics/Helpers/FIRCLSInternalLogging.c

@@ -14,10 +14,10 @@
 
 #include <dispatch/dispatch.h>
 
-#include "FIRCLSInternalLogging.h"
-#include "FIRCLSContext.h"
-#include "FIRCLSGlobals.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSInternalLogging.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 void FIRCLSSDKFileLog(FIRCLSInternalLogLevel level, const char* format, ...) {
   if (!_firclsContext.readonly || !_firclsContext.writable) {

Crashlytics/Crashlytics/Helpers/FIRCLSInternalLogging.h

@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 #if __OBJC__
-#import "FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
 #define FIRCLSDeveloperLog(label, __FORMAT__, ...) \
   FIRCLSDebugLog(@"[" label "] " __FORMAT__, ##__VA_ARGS__);
 #endif

Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 

Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.c

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSProfiling.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSProfiling.h"
 
 #include <mach/mach_time.h>
 #include <stdio.h>

Crashlytics/Crashlytics/Helpers/FIRCLSThreadState.c

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSThreadState.h"
-#include "FIRCLSDefines.h"
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSThreadState.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 #if defined(__arm__) || defined(__arm64__)
 #include <mach/arm/thread_status.h>

Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h

@@ -17,7 +17,7 @@
 #include <mach/vm_types.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include "FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
 
 #define FIRCLSIsValidPointer(x) ((uintptr_t)x >= 4096)
 #define FIRCLSInvalidCharNybble (255)

Crashlytics/Crashlytics/Helpers/FIRCLSUtility.m

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSUtility.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
 #include <mach/mach.h>
 
 #include <dlfcn.h>
 
-#include "FIRCLSFeatures.h"
-#include "FIRCLSFile.h"
-#include "FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
 
-#import "FIRCLSByteUtility.h"
-#import "FIRCLSUUID.h"
+#import "Crashlytics/Shared/FIRCLSByteUtility.h"
+#import "Crashlytics/Shared/FIRCLSUUID.h"
 
 #import <CommonCrypto/CommonHMAC.h>
 

Crashlytics/Crashlytics/Models/FIRCLSExecutionIdentifierModel.m

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSExecutionIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSExecutionIdentifierModel.h"
 
-#import "FIRCLSUUID.h"
+#import "Crashlytics/Shared/FIRCLSUUID.h"
 
 @implementation FIRCLSExecutionIdentifierModel
 

Crashlytics/Crashlytics/Models/FIRCLSFileManager.m

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
 
-#import "FIRCLSApplication.h"
-#import "FIRCLSInternalReport.h"
-#import "FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
 
 NSString *const FIRCLSCacheDirectoryName = @"com.crashlytics.data";
 NSString *const FIRCLSCacheVersion = @"v5";

Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.m

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSInstallIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.h"
 
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 
-#import "FIRCLSByteUtility.h"
-#import "FIRCLSLogger.h"
-#import "FIRCLSUUID.h"
-#import "FIRCLSUserDefaults.h"
+#import "Crashlytics/Crashlytics/FIRCLSUserDefaults/FIRCLSUserDefaults.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Shared/FIRCLSByteUtility.h"
+#import "Crashlytics/Shared/FIRCLSUUID.h"
 
 static NSString *const FIRCLSInstallationUUIDKey = @"com.crashlytics.iuuid";
 static NSString *const FIRCLSInstallationIIDHashKey = @"com.crashlytics.install.iid";

Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h

@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "FIRCLSFeatures.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFeatures.h"
 
 extern NSString *const FIRCLSReportBinaryImageFile;
 extern NSString *const FIRCLSReportExceptionFile;

Crashlytics/Crashlytics/Models/FIRCLSInternalReport.m

@@ -15,11 +15,11 @@
 // TODO: Remove this class after the uploading of reports via GoogleDataTransport is no longer an
 // experiment
 
-#import "FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
 
-#import "FIRCLSFile.h"
-#import "FIRCLSFileManager.h"
-#import "FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
 
 NSString *const FIRCLSReportBinaryImageFile = @"binary_images.clsrecord";
 NSString *const FIRCLSReportExceptionFile = @"exception.clsrecord";

Crashlytics/Crashlytics/Models/FIRCLSReport.m

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSContext.h"
-#import "FIRCLSFile.h"
-#import "FIRCLSGlobals.h"
-#import "FIRCLSInternalReport.h"
-#import "FIRCLSReport_Private.h"
-#import "FIRCLSUserLogging.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSContext.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSGlobals.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSReport_Private.h"
 
 @interface FIRCLSReport () {
   FIRCLSInternalReport *_internalReport;

Crashlytics/Crashlytics/Models/FIRCLSReport_Private.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSReport.h"
 
 @class FIRCLSInternalReport;
 

Crashlytics/Crashlytics/Models/FIRCLSSettings.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSSettings.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
 
 #if __has_include(<FBLPromises/FBLPromises.h>)
 #import <FBLPromises/FBLPromises.h>
@@ -20,11 +20,11 @@
 #import "FBLPromises.h"
 #endif
 
-#import "FIRCLSApplicationIdentifierModel.h"
-#import "FIRCLSConstants.h"
-#import "FIRCLSFileManager.h"
-#import "FIRCLSLogger.h"
-#import "FIRCLSURLBuilder.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h"
+#import "Crashlytics/Shared/FIRCLSConstants.h"
+#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSURLBuilder.h"
 
 NSString *const CreatedAtKey = @"created_at";
 NSString *const GoogleAppIDKey = @"google_app_id";

Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.m

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSSymbolResolver.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.h"
 
 #include <dlfcn.h>
 
-#include "FIRCLSBinaryImage.h"
-#include "FIRCLSFile.h"
-#import "FIRCLSLogger.h"
-#import "FIRStackFrame_Private.h"
+#include "Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.h"
+#include "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Private/FIRStackFrame_Private.h"
 
 @interface FIRCLSSymbolResolver () {
   NSMutableArray* _binaryImages;

Crashlytics/Crashlytics/Models/Record/FIRCLSRecordApplication.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCLSRecordBase.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordBase.h"
 
 @interface FIRCLSRecordApplication : FIRCLSRecordBase
 

Crashlytics/Crashlytics/Models/Record/FIRCLSRecordApplication.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCLSRecordApplication.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordApplication.h"
 
 @implementation FIRCLSRecordApplication
 

Crashlytics/Crashlytics/Models/Record/FIRCLSRecordBase.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCLSRecordBase.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordBase.h"
 
 @implementation FIRCLSRecordBase
 

Crashlytics/Crashlytics/Models/Record/FIRCLSRecordHost.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCLSRecordBase.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordBase.h"
 
 @interface FIRCLSRecordHost : FIRCLSRecordBase
 

Crashlytics/Crashlytics/Models/Record/FIRCLSRecordHost.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCLSRecordHost.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordHost.h"
 
 @implementation FIRCLSRecordHost
 

Crashlytics/Crashlytics/Models/Record/FIRCLSRecordIdentity.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCLSRecordBase.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordBase.h"
 
 @interface FIRCLSRecordIdentity : FIRCLSRecordBase
 

Crashlytics/Crashlytics/Models/Record/FIRCLSRecordIdentity.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRCLSRecordIdentity.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordIdentity.h"
 
 @implementation FIRCLSRecordIdentity
 

Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "crashlytics.nanopb.h"
+#include "Crashlytics/Protogen/nanopb/crashlytics.nanopb.h"
 
 #import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
 

Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.m

@@ -14,17 +14,21 @@
  * limitations under the License.
  */
 
-#import "FIRCLSReportAdapter.h"
-#import "FIRCLSReportAdapter_Private.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter_Private.h"
 
-#import "FIRCLSInternalReport.h"
-#import "FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
 
-#import "FIRCLSUserLogging.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSUserLogging.h"
 
+#if SWIFT_PACKAGE
+@import nanopb;
+#else
 #import <nanopb/pb.h>
 #import <nanopb/pb_decode.h>
 #import <nanopb/pb_encode.h>
+#endif
 
 @implementation FIRCLSReportAdapter
 

Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter_Private.h

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "FIRCLSReportAdapter.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.h"
 
-#import "FIRCLSRecordApplication.h"
-#import "FIRCLSRecordHost.h"
-#import "FIRCLSRecordIdentity.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordApplication.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordHost.h"
+#import "Crashlytics/Crashlytics/Models/Record/FIRCLSRecordIdentity.h"
 
 pb_bytes_array_t *FIRCLSEncodeString(NSString *string);
 pb_bytes_array_t *FIRCLSEncodeData(NSData *data);

Crashlytics/Crashlytics/Operations/FIRCLSAsyncOperation.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSAsyncOperation.h"
+#import "Crashlytics/Crashlytics/Operations/FIRCLSAsyncOperation.h"
 
 @interface FIRCLSAsyncOperation () {
   BOOL _internalExecuting;

Crashlytics/Crashlytics/Operations/FIRCLSAsyncOperation_Private.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSAsyncOperation.h"
+#import "Crashlytics/Crashlytics/Operations/FIRCLSAsyncOperation.h"
 
 @interface FIRCLSAsyncOperation (Private)
 

Crashlytics/Crashlytics/Operations/Reports/FIRCLSPackageReportOperation.m

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSPackageReportOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Reports/FIRCLSPackageReportOperation.h"
 
 #include <errno.h>
 #include <zlib.h>
 
-#import "FIRCLSFileManager.h"
-#import "FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
 
-#import "FIRCLSUtility.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSUtility.h"
 
-#import "FIRCLSByteUtility.h"
-#import "FIRCLSMultipartMimeStreamEncoder.h"
+#import "Crashlytics/Shared/FIRCLSByteUtility.h"
+#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSMultipartMimeStreamEncoder.h"
 
-#import "FIRCLSSettings.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
 
 @interface FIRCLSPackageReportOperation ()
 

Crashlytics/Crashlytics/Operations/Reports/FIRCLSProcessReportOperation.m

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSProcessReportOperation.h"
-
-#import "FIRCLSDemangleOperation.h"
-#import "FIRCLSFile.h"
-#import "FIRCLSInternalReport.h"
-#import "FIRCLSSerializeSymbolicatedFramesOperation.h"
-#import "FIRCLSSymbolResolver.h"
-#import "FIRCLSSymbolicationOperation.h"
-#import "FIRStackFrame_Private.h"
+#import "Crashlytics/Crashlytics/Operations/Reports/FIRCLSProcessReportOperation.h"
+
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInternalReport.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSDemangleOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSerializeSymbolicatedFramesOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSymbolicationOperation.h"
+#import "Crashlytics/Crashlytics/Private/FIRStackFrame_Private.h"
 
 @implementation FIRCLSProcessReportOperation
 

Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSDemangleOperation.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSThreadArrayOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSThreadArrayOperation.h"
 
 @interface FIRCLSDemangleOperation : FIRCLSThreadArrayOperation
 

Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSDemangleOperation.mm

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "FIRCLSDemangleOperation.h"
-#include "FIRStackFrame_Private.h"
+#include "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSDemangleOperation.h"
+#include "Crashlytics/Crashlytics/Private/FIRStackFrame_Private.h"
 
 #import <cxxabi.h>
 

Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSerializeSymbolicatedFramesOperation.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSThreadArrayOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSThreadArrayOperation.h"
 
 @interface FIRCLSSerializeSymbolicatedFramesOperation : FIRCLSThreadArrayOperation
 

Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSerializeSymbolicatedFramesOperation.m

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSSerializeSymbolicatedFramesOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSerializeSymbolicatedFramesOperation.h"
 
-#import "FIRCLSFile.h"
-#import "FIRCLSLogger.h"
-#import "FIRStackFrame_Private.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Private/FIRStackFrame_Private.h"
 
 @implementation FIRCLSSerializeSymbolicatedFramesOperation
 

Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSymbolicationOperation.h

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSThreadArrayOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSThreadArrayOperation.h"
 
 @class FIRCLSSymbolResolver;
 

Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSymbolicationOperation.m

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSSymbolicationOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSSymbolicationOperation.h"
 
-#import "FIRCLSSymbolResolver.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.h"
 
 @implementation FIRCLSSymbolicationOperation
 

Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSThreadArrayOperation.m

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSThreadArrayOperation.h"
+#import "Crashlytics/Crashlytics/Operations/Symbolication/FIRCLSThreadArrayOperation.h"
 
 @implementation FIRCLSThreadArrayOperation
 

Crashlytics/Crashlytics/Private/FIRExceptionModel_Private.h

@@ -17,7 +17,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRExceptionModel.h"
+#import "Crashlytics/Crashlytics/Public/FIRExceptionModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Crashlytics/Crashlytics/Private/FIRStackFrame_Private.h

@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRStackFrame.h"
+#import "Crashlytics/Crashlytics/Public/FIRStackFrame.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.m

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSSettingsOnboardingManager.h"
-
-#import "FIRCLSApplicationIdentifierModel.h"
-#import "FIRCLSConstants.h"
-#import "FIRCLSDataCollectionToken.h"
-#import "FIRCLSDefines.h"
-#import "FIRCLSDownloadAndSaveSettingsOperation.h"
-#import "FIRCLSFABNetworkClient.h"
-#import "FIRCLSFileManager.h"
-#import "FIRCLSInstallIdentifierModel.h"
-#import "FIRCLSLogger.h"
-#import "FIRCLSOnboardingOperation.h"
-#import "FIRCLSSettings.h"
-#import "FIRCLSURLBuilder.h"
+#import "Crashlytics/Crashlytics/Settings/FIRCLSSettingsOnboardingManager.h"
+
+#import "Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionToken.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSLogger.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSFileManager.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSInstallIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Models/FIRCLSSettings.h"
+#import "Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.h"
+#import "Crashlytics/Crashlytics/Settings/Operations/FIRCLSOnboardingOperation.h"
+#import "Crashlytics/Shared/FIRCLSConstants.h"
+#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSFABNetworkClient.h"
+#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSURLBuilder.h"
 
 @interface FIRCLSSettingsOnboardingManager () <FIRCLSDownloadAndSaveSettingsOperationDelegate,
                                                FIRCLSOnboardingOperationDelegate>

Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h

@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.m

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "FIRCLSApplicationIdentifierModel.h"
+#import "Crashlytics/Crashlytics/Settings/Models/FIRCLSApplicationIdentifierModel.h"
 
-#import "FIRCLSApplication.h"
-#import "FIRCLSByteUtility.h"
-#import "FIRCLSDefines.h"
-#import "FIRCLSMachO.h"
-#import "FIRCLSUUID.h"
+#import "Crashlytics/Crashlytics/Components/FIRCLSApplication.h"
+#import "Crashlytics/Crashlytics/Helpers/FIRCLSDefines.h"
+#import "Crashlytics/Shared/FIRCLSByteUtility.h"
+#import "Crashlytics/Shared/FIRCLSMachO/FIRCLSMachO.h"
+#import "Crashlytics/Shared/FIRCLSUUID.h"
 
 @interface FIRCLSApplicationIdentifierModel ()
 

Crashlytics/Crashlytics/Settings/Operations/FIRCLSDownloadAndSaveSettingsOperation.h

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #import <Foundation/Foundation.h>
-#import "FIRCLSNetworkOperation.h"
+#import "Crashlytics/Crashlytics/Settings/Operations/FIRCLSNetworkOperation.h"
 
 @class FIRCLSDownloadAndSaveSettingsOperation;
 @class FIRCLSFABNetworkClient;