Repo-relative headers

FirebaseInAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.c

@@ -17,7 +17,7 @@
 /* Automatically generated nanopb constant definitions */
 /* Generated by nanopb-0.3.9.5 */
 
-#include "fiam.nanopb.h"
+#include "FirebaseInAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30

FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMAnalyticsEventLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMAnalyticsEventLogger.h"
 
 @class FIRIAMClearcutLogger;
 @protocol FIRIAMTimeFetcher;

FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.m

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "FIRIAMAnalyticsEventLoggerImpl.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClearcutLogger.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.m

@@ -16,11 +16,11 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClearcutHttpRequestSender.h"
-#import "FIRIAMClearcutLogStorage.h"
-#import "FIRIAMClientInfoFetcher.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClientInfoFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @interface FIRIAMClearcutHttpRequestSender ()
 @property(readonly, copy, nonatomic) NSString *serverHostName;

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.m

@@ -18,9 +18,9 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClearcutLogStorage.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @implementation FIRIAMClearcutLogRecord
 static NSString *const kEventTimestampKey = @"event_ts_seconds";

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogger.m

@@ -16,10 +16,10 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClearcutLogStorage.h"
-#import "FIRIAMClearcutLogger.h"
-#import "FIRIAMClearcutUploader.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h"
 
 @interface FIRIAMClearcutLogger ()
 

FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutUploader.m

@@ -17,12 +17,12 @@
 #import <UIKit/UIKit.h>
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClearcutUploader.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
-#import "FIRIAMClearcutHttpRequestSender.h"
-#import "FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
 
 // a macro for turning a millisecond value into seconds
 #define MILLS_TO_SECONDS(x) (((long)x) / 1000)

FirebaseInAppMessaging/Sources/Analytics/Protogen/nanopb/fiam.nanopb.c

@@ -17,7 +17,7 @@
 /* Automatically generated nanopb constant definitions */
 /* Generated by nanopb-0.3.9.3 */
 
-#include "fiam.nanopb.h"
+#include "FirebaseInAppMessaging/Analytics/Protogen/nanopb/fiam.nanopb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30

FirebaseInAppMessaging/Sources/Data/FIRIAMFetchResponseParser.m

@@ -16,14 +16,14 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMDisplayTriggerDefinition.h"
-#import "FIRIAMFetchResponseParser.h"
-#import "FIRIAMMessageContentData.h"
-#import "FIRIAMMessageContentDataWithImageURL.h"
-#import "FIRIAMMessageDefinition.h"
-#import "FIRIAMTimeFetcher.h"
-#import "UIColor+FIRIAMHexString.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentData.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.h"
 
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 

FirebaseInAppMessaging/Sources/Data/FIRIAMMessageContentDataWithImageURL.m

@@ -16,10 +16,10 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMMessageContentData.h"
-#import "FIRIAMMessageContentDataWithImageURL.h"
-#import "FIRIAMSDKRuntimeErrorCodes.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentData.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h"
+#import "FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKRuntimeErrorCodes.h"
 
 static NSInteger const SuccessHTTPStatusCode = 200;
 

FirebaseInAppMessaging/Sources/Data/FIRIAMMessageDefinition.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
 
 @implementation FIRIAMMessageRenderData
 

FirebaseInAppMessaging/Sources/Data/FIRIAMRenderingEffectSetting.m

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#import "FIRIAMRenderingEffectSetting.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMRenderingEffectSetting.h"
 
 @implementation FIRIAMRenderingEffectSetting
 

FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMBaseRenderingViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingBannerDisplay;
 @class FIRIAMBaseRenderingViewController;

FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.m

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRIAMBannerViewController.h"
-#import "FIRCore+InAppMessagingDisplay.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h"
 
 @interface FIRIAMBannerViewController ()
 

FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewUIWindow.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMBannerViewUIWindow.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewUIWindow.h"
 
 @implementation FIRIAMBannerViewUIWindow
 

FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMBaseRenderingViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingCardDisplay;
 @protocol FIRInAppMessagingDisplayDelegate;

FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.m

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRIAMCardViewController.h"
-#import "FIRCore+InAppMessagingDisplay.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h"
 
 @interface FIRIAMCardViewController ()
 

FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.m

@@ -15,7 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRCore+InAppMessagingDisplay.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h"
 
 NSString *const kFirebaseInAppMessagingDisplayErrorDomain = @"com.firebase.inappmessaging.display";
 FIRLoggerService kFIRLoggerInAppMessagingDisplay = @"[Firebase/InAppMessagingDisplay]";

FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h

@@ -16,8 +16,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessagingRendering.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @protocol FIRInAppMessagingDisplayDelegate;
 

FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.m

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#import "FIRIAMBaseRenderingViewController.h"
-#import "FIRCore+InAppMessagingDisplay.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @interface FIRIAMBaseRenderingViewController ()
 // For fiam messages, it's required to be kMinValidImpressionTime to

FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessagingRendering.h"
 
 NS_ASSUME_NONNULL_BEGIN
 NS_SWIFT_NAME(InAppMessagingDefaultDisplayImpl)

FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.m

@@ -18,16 +18,16 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import <FirebaseInAppMessaging/FIRInAppMessaging.h>
-#import <FirebaseInAppMessaging/FIRInAppMessagingRendering.h>
-#import "FIRCore+InAppMessagingDisplay.h"
-#import "FIRIAMBannerViewController.h"
-#import "FIRIAMCardViewController.h"
-#import "FIRIAMDefaultDisplayImpl.h"
-#import "FIRIAMImageOnlyViewController.h"
-#import "FIRIAMModalViewController.h"
-#import "FIRIAMRenderingWindowHelper.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessagingRendering.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Card/FIRIAMCardViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @implementation FIRIAMDefaultDisplayImpl
 

FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.m

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRIAMRenderingWindowHelper.h"
-#import "FIRIAMBannerViewUIWindow.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMRenderingWindowHelper.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Banner/FIRIAMBannerViewUIWindow.h"
 
 @implementation FIRIAMRenderingWindowHelper
 

FirebaseInAppMessaging/Sources/DefaultUI/FirebaseInAppMessagingDisplay.h

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#import "FIRIAMDefaultDisplayImpl.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMDefaultDisplayImpl.h"

FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMBaseRenderingViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingImageOnlyDisplay;
 @protocol FIRIAMTimeFetcher;

FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.m

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRIAMImageOnlyViewController.h"
-#import "FIRCore+InAppMessagingDisplay.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/ImageOnly/FIRIAMImageOnlyViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h"
 
 @interface FIRIAMImageOnlyViewController ()
 

FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMBaseRenderingViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRIAMBaseRenderingViewController.h"
 
 @class FIRInAppMessagingModalDisplay;
 @protocol FIRInAppMessagingDisplayDelegate;

FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.m

@@ -16,8 +16,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import "FIRCore+InAppMessagingDisplay.h"
-#import "FIRIAMModalViewController.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/FIRCore+InAppMessagingDisplay.h"
+#import "FirebaseInAppMessaging/Sources/DefaultUI/Modal/FIRIAMModalViewController.h"
 
 @interface FIRIAMModalViewController ()
 

FirebaseInAppMessaging/Sources/DisplayTrigger/FIRIAMDisplayTriggerDefinition.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
 
 @implementation FIRIAMDisplayTriggerDefinition
 

FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.m

@@ -15,7 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
 
 NSString *const kFirebaseInAppMessagingErrorDomain = @"com.firebase.inappmessaging";
 FIRLoggerService kFIRLoggerInAppMessaging = @"[Firebase/InAppMessaging]";

FirebaseInAppMessaging/Sources/FIRInAppMessaging.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
 
 #import <Foundation/Foundation.h>
 
@@ -22,11 +22,11 @@
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMDisplayExecutor.h"
-#import "FIRIAMRuntimeManager.h"
-#import "FIRInAppMessaging+Bootstrap.h"
-#import "FIRInAppMessagingPrivate.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMRuntimeManager.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRInAppMessaging+Bootstrap.h"
+#import "FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h"
 
 static BOOL _autoBootstrapOnFIRAppInit = YES;
 

FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
 @class FIRInstallations;

FirebaseInAppMessaging/Sources/Flows/FIRIAMActivityLogger.m

@@ -18,8 +18,8 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMActivityLogger.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h"
 @implementation FIRIAMActivityRecord
 
 static NSString *const kActiveTypeArchiveKey = @"type";

FirebaseInAppMessaging/Sources/Flows/FIRIAMBookKeeper.m

@@ -16,8 +16,8 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMBookKeeper.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h"
 
 NSString *const FIRIAM_UserDefaultsKeyForImpressions = @"firebase-iam-message-impressions";
 NSString *const FIRIAM_UserDefaultsKeyForLastImpressionTimestamp =

FirebaseInAppMessaging/Sources/Flows/FIRIAMClientInfoFetcher.m

@@ -17,10 +17,10 @@
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClientInfoFetcher.h"
-#import "FIRIAMSDKRuntimeErrorCodes.h"
-#import "FIRInAppMessagingPrivate.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClientInfoFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKRuntimeErrorCodes.h"
+#import "FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h"
 
 @interface FIRIAMClientInfoFetcher ()
 

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.m

@@ -18,10 +18,10 @@
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInteropListener.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
-#import "FIRIAMDisplayExecutor.h"
-#import "FIRInAppMessagingPrivate.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h"
 
 @interface FIRIAMDisplayCheckOnAnalyticEventsFlow () <FIRAnalyticsInteropListener>
 @end

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.m

@@ -16,9 +16,9 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMDisplayCheckOnAppForegroundFlow.h"
-#import "FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
 
 @implementation FIRIAMDisplayCheckOnAppForegroundFlow
 

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMDisplayCheckTriggerFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckTriggerFlow.h"
 
 @interface FIRIAMDisplayCheckOnFetchDoneNotificationFlow : FIRIAMDisplayCheckTriggerFlow
 - (void)start;

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.m

@@ -16,10 +16,10 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
 
-#import "FIRIAMDisplayCheckOnFetchDoneNotificationFlow.h"
-#import "FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
 
 extern NSString *const kFIRIAMFetchIsDoneNotification;
 

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckTriggerFlow.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMDisplayCheckTriggerFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckTriggerFlow.h"
 
 @implementation FIRIAMDisplayCheckTriggerFlow
 - (instancetype)initWithDisplayFlow:(FIRIAMDisplayExecutor *)displayExecutor {

FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayExecutor.m

@@ -17,14 +17,14 @@
 #import <UIKit/UIKit.h>
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMActivityLogger.h"
-#import "FIRIAMDisplayExecutor.h"
-#import "FIRIAMMessageContentData.h"
-#import "FIRIAMMessageDefinition.h"
-#import "FIRIAMSDKRuntimeErrorCodes.h"
-#import "FIRInAppMessaging.h"
-#import "FIRInAppMessagingRenderingPrivate.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentData.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKRuntimeErrorCodes.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingPrivate.h"
 
 #import "FirebaseABTesting/Sources/Private/FirebaseABTestingInternal.h"
 

FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchFlow.m

@@ -16,10 +16,10 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClearcutLogger.h"
-#import "FIRIAMFetchFlow.h"
-#import "FIRIAMRuntimeManager.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMRuntimeManager.h"
 
 @implementation FIRIAMFetchSetting
 @end

FirebaseInAppMessaging/Sources/Flows/FIRIAMFetchOnAppForegroundFlow.m

@@ -16,8 +16,8 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMFetchOnAppForegroundFlow.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMFetchOnAppForegroundFlow.h"
 @implementation FIRIAMFetchOnAppForegroundFlow
 - (void)start {
   FIRLogDebug(kFIRLoggerInAppMessaging, @"I-IAM600002",

FirebaseInAppMessaging/Sources/Flows/FIRIAMMessageClientCache.m

@@ -16,12 +16,12 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
-#import "FIRIAMDisplayTriggerDefinition.h"
-#import "FIRIAMFetchResponseParser.h"
-#import "FIRIAMMessageClientCache.h"
-#import "FIRIAMServerMsgFetchStorage.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMServerMsgFetchStorage.h"
 
 @interface FIRIAMMessageClientCache ()
 

FirebaseInAppMessaging/Sources/Flows/FIRIAMMsgFetcherUsingRestful.m

@@ -16,13 +16,13 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMFetchFlow.h"
-#import "FIRIAMFetchResponseParser.h"
-#import "FIRIAMMessageContentDataWithImageURL.h"
-#import "FIRIAMMessageDefinition.h"
-#import "FIRIAMMsgFetcherUsingRestful.h"
-#import "FIRIAMSDKSettings.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMsgFetcherUsingRestful.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKSettings.h"
 
 static NSInteger const SuccessHTTPStatusCode = 200;
 

FirebaseInAppMessaging/Sources/Flows/FIRIAMServerMsgFetchStorage.m

@@ -16,8 +16,8 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMServerMsgFetchStorage.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMServerMsgFetchStorage.h"
 @implementation FIRIAMServerMsgFetchStorage
 - (NSString *)determineCacheFilePath {
   NSString *cachePath =

FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h

@@ -15,9 +15,9 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRIAMAnalyticsEventLogger.h"
-#import "FIRIAMClientInfoFetcher.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMAnalyticsEventLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClientInfoFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @class FIRIAMClearcutUploader;
 

FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMMessageContentData.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentData.h"
 
 NS_ASSUME_NONNULL_BEGIN
 /**

FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h

@@ -15,8 +15,8 @@
  */
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMDisplayTriggerDefinition.h"
-#import "FIRIAMMessageRenderData.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageRenderData.h"
 
 @class FIRIAMDisplayTriggerDefinition;
 

FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageRenderData.h

@@ -15,7 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRIAMRenderingEffectSetting.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMRenderingEffectSetting.h"
 
 @protocol FIRIAMMessageContentData;
 NS_ASSUME_NONNULL_BEGIN

FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMAnalyticsEventLogger.h

@@ -15,8 +15,8 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRIAMClientInfoFetcher.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClientInfoFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMDisplayCheckTriggerFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckTriggerFlow.h"
 
 // An implementation of FIRIAMDisplayCheckTriggerFlow by triggering the display check when
 // a Firebase Analytics event is fired.

FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMDisplayCheckTriggerFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckTriggerFlow.h"
 
 // an implementation of FIRIAMDisplayExecutor by triggering the display when app is foregrounded
 @interface FIRIAMDisplayCheckOnAppForegroundFlow : FIRIAMDisplayCheckTriggerFlow

FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h

@@ -16,14 +16,14 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMActionURLFollower.h"
-#import "FIRIAMActivityLogger.h"
-#import "FIRIAMBookKeeper.h"
-#import "FIRIAMClearcutLogger.h"
-#import "FIRIAMMessageClientCache.h"
-#import "FIRIAMTimeFetcher.h"
-#import "FIRInAppMessaging.h"
-#import "FIRInAppMessagingRendering.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMActionURLFollower.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessagingRendering.h"
 
 NS_ASSUME_NONNULL_BEGIN
 @interface FIRIAMDisplaySetting : NSObject

FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMFetchOnAppForegroundFlow.h

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#import "FIRIAMFetchFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h"
 
 // an implementation of FIRIAMDisplayExecutor by triggering the display when app is foregrounded
 @interface FIRIAMFetchOnAppForegroundFlow : FIRIAMFetchFlow

FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h

@@ -15,9 +15,9 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRIAMBookKeeper.h"
-#import "FIRIAMFetchResponseParser.h"
-#import "FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMsgFetcherUsingRestful.h

@@ -15,11 +15,11 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRIAMClientInfoFetcher.h"
-#import "FIRIAMFetchFlow.h"
-#import "FIRIAMFetchResponseParser.h"
-#import "FIRIAMSDKSettings.h"
-#import "FIRIAMServerMsgFetchStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClientInfoFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKSettings.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMServerMsgFetchStorage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h

@@ -16,12 +16,12 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMActivityLogger.h"
-#import "FIRIAMBookKeeper.h"
-#import "FIRIAMDisplayExecutor.h"
-#import "FIRIAMMessageClientCache.h"
-#import "FIRIAMSDKModeManager.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @protocol FIRIAMAnalyticsEventLogger;
 

FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMRuntimeManager.h

@@ -16,12 +16,12 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRIAMActivityLogger.h"
-#import "FIRIAMBookKeeper.h"
-#import "FIRIAMDisplayExecutor.h"
-#import "FIRIAMMessageClientCache.h"
-#import "FIRIAMSDKSettings.h"
-#import "FIRIAMServerMsgFetchStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKSettings.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMServerMsgFetchStorage.h"
 
 NS_ASSUME_NONNULL_BEGIN
 // A class for managing the objects/dependencies for supporting different fiam flows at runtime

FirebaseInAppMessaging/Sources/Private/Runtime/FIRInAppMessaging+Bootstrap.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRIAMSDKSettings.h"
-#import "FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKSettings.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
 
 /**
  *  This category extends FIRInAppMessaging with the configurations from FIRApp

FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingDataClasses.m

@@ -16,8 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "FIRInAppMessagingRendering.h"
-#import "FIRInAppMessagingRenderingPrivate.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessagingRendering.h"
+#import "FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingPrivate.h"
 
 @implementation FIRInAppMessagingDisplayMessage
 

FirebaseInAppMessaging/Sources/Runtime/FIRIAMActionURLFollower.m

@@ -17,8 +17,8 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMActionURLFollower.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMActionURLFollower.h"
 
 @interface FIRIAMActionURLFollower ()
 @property(nonatomic, readonly, nonnull, copy) NSSet<NSString *> *appCustomURLSchemesSet;

FirebaseInAppMessaging/Sources/Runtime/FIRIAMRuntimeManager.m

@@ -16,27 +16,27 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMActivityLogger.h"
-#import "FIRIAMAnalyticsEventLoggerImpl.h"
-#import "FIRIAMBookKeeper.h"
-#import "FIRIAMClearcutHttpRequestSender.h"
-#import "FIRIAMClearcutLogStorage.h"
-#import "FIRIAMClearcutLogger.h"
-#import "FIRIAMClearcutUploader.h"
-#import "FIRIAMClientInfoFetcher.h"
-#import "FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
-#import "FIRIAMDisplayCheckOnAppForegroundFlow.h"
-#import "FIRIAMDisplayCheckOnFetchDoneNotificationFlow.h"
-#import "FIRIAMDisplayExecutor.h"
-#import "FIRIAMFetchOnAppForegroundFlow.h"
-#import "FIRIAMFetchResponseParser.h"
-#import "FIRIAMMessageClientCache.h"
-#import "FIRIAMMsgFetcherUsingRestful.h"
-#import "FIRIAMRuntimeManager.h"
-#import "FIRIAMSDKModeManager.h"
-#import "FIRInAppMessaging.h"
-#import "FIRInAppMessagingPrivate.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClientInfoFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAppForegroundFlow.h"
+#import "FirebaseInAppMessaging/Sources/Flows/FIRIAMDisplayCheckOnFetchDoneNotificationFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMFetchOnAppForegroundFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMsgFetcherUsingRestful.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMRuntimeManager.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/FIRInAppMessagingPrivate.h"
 
 // A enum indicating 3 different possiblities of a setting about auto data collection.
 typedef NS_ENUM(NSInteger, FIRIAMAutoDataCollectionSetting) {

FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKModeManager.m

@@ -16,8 +16,8 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMSDKModeManager.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h"
 
 NSString *FIRIAMDescriptonStringForSDKMode(FIRIAMSDKMode mode) {
   switch (mode) {

FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKSettings.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMSDKSettings.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKSettings.h"
 
 @implementation FIRIAMSDKSettings
 

FirebaseInAppMessaging/Sources/Runtime/FIRInAppMessaging+Bootstrap.m

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#import "FIRInAppMessaging+Bootstrap.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRInAppMessaging+Bootstrap.h"
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h"
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 
-#import "FIRCore+InAppMessaging.h"
-#import "FIRIAMClearcutUploader.h"
-#import "FIRIAMRuntimeManager.h"
-#import "FIRIAMSDKSettings.h"
-#import "NSString+FIRInterlaceStrings.h"
+#import "FirebaseInAppMessaging/Sources/FIRCore+InAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMRuntimeManager.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKSettings.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/NSString+FIRInterlaceStrings.h"
 
 @implementation FIRInAppMessaging (Bootstrap)
 

FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.h

@@ -15,7 +15,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 NS_ASSUME_NONNULL_BEGIN
 // A class via which we can track elapsed time with the capability to pause and resume

FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMElapsedTimeTracker.h"
+#import "FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.h"
 @interface FIRIAMElapsedTimeTracker ()
 @property(nonatomic) NSTimeInterval totalTrackedTimeSoFar;
 @property(nonatomic) NSTimeInterval lastTrackingStartPoint;

FirebaseInAppMessaging/Sources/Util/FIRIAMTimeFetcher.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @implementation FIRIAMTimerWithNSDate
 - (NSTimeInterval)currentTimestampInSeconds {

FirebaseInAppMessaging/Sources/Util/NSString+FIRInterlaceStrings.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "NSString+FIRInterlaceStrings.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/NSString+FIRInterlaceStrings.h"
 
 @implementation NSString (InterlaceStrings)
 

FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "UIColor+FIRIAMHexString.h"
+#import "FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.h"
 
 @implementation UIColor (HexString)
 + (UIColor *)firiam_colorWithHexString:(nullable NSString *)hexString {

FirebaseInAppMessaging/Tests/Unit/FIRIAMActionUrlFollowerTests.m

@@ -17,7 +17,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMActionURLFollower.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMActionURLFollower.h"
 
 // since OCMock does support mocking respondsToSelector on mock object, we have to define
 // different delegate classes with different coverages of certain delegate methods:

FirebaseInAppMessaging/Tests/Unit/FIRIAMActivityLoggerTests.m

@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMActivityLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMActivityLogger.h"
 @interface FIRIAMActivityLogger ()
 - (void)loadFromCachePath:(NSString *)cacheFilePath;
 - (BOOL)saveIntoCacheWithPath:(NSString *)cacheFilePath;

FirebaseInAppMessaging/Tests/Unit/FIRIAMAnalyticsEventLoggerImplTests.m

@@ -17,8 +17,8 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMAnalyticsEventLoggerImpl.h"
-#import "FIRIAMClearcutLogger.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMAnalyticsEventLoggerImpl.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h"
 
 #import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
 #import "Interop/Analytics/Public/FIRInteropEventNames.h"

FirebaseInAppMessaging/Tests/Unit/FIRIAMBookKeeperViaUserDefaultsTests.m

@@ -17,7 +17,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMBookKeeper.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMBookKeeper.h"
 
 @interface FIRIAMBookKeeperViaUserDefaultsTests : XCTestCase
 @property(nonatomic) NSUserDefaults *userDefaultsForTesting;

FirebaseInAppMessaging/Tests/Unit/FIRIAMClearcutLoggerTests.m

@@ -17,10 +17,10 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMClearcutHttpRequestSender.h"
-#import "FIRIAMClearcutLogStorage.h"
-#import "FIRIAMClearcutLogger.h"
-#import "FIRIAMClearcutUploader.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h"
 
 @interface FIRIAMClearcutLoggerTests : XCTestCase
 @property(nonatomic) FIRIAMClientInfoFetcher *mockClientInfoFetcher;

FirebaseInAppMessaging/Tests/Unit/FIRIAMClearcutRetryLocalStorageTests.m

@@ -17,8 +17,8 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMClearcutLogStorage.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @interface FIRIAMClearcutLogStorage (UnitTestAccess)
 @property(nonatomic) NSMutableArray<FIRIAMClearcutLogRecord *> *records;

FirebaseInAppMessaging/Tests/Unit/FIRIAMClearcutUploaderTests.m

@@ -17,10 +17,10 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMClearcutHttpRequestSender.h"
-#import "FIRIAMClearcutLogStorage.h"
-#import "FIRIAMClearcutUploader.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutHttpRequestSender.h"
+#import "FirebaseInAppMessaging/Sources/Analytics/FIRIAMClearcutLogStorage.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClearcutUploader.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @interface FIRIAMClearcutUploaderTests : XCTestCase
 @property(nonatomic) id<FIRIAMTimeFetcher> mockTimeFetcher;

FirebaseInAppMessaging/Tests/Unit/FIRIAMClientInfoFetcherTests.m

@@ -17,8 +17,8 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMClientInfoFetcher.h"
-#import "FIRIAMSDKRuntimeErrorCodes.h"
+#import "FirebaseInAppMessaging/Sources/Private/Analytics/FIRIAMClientInfoFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Runtime/FIRIAMSDKRuntimeErrorCodes.h"
 
 #import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
 

FirebaseInAppMessaging/Tests/Unit/FIRIAMDisplayExecutorTests.m

@@ -17,12 +17,12 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMActionURLFollower.h"
-#import "FIRIAMDisplayExecutor.h"
-#import "FIRIAMDisplayTriggerDefinition.h"
-#import "FIRIAMMessageContentData.h"
-#import "FIRInAppMessaging.h"
-#import "FIRInAppMessagingRenderingPrivate.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMActionURLFollower.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayExecutor.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentData.h"
+#import "FirebaseInAppMessaging/Sources/Public/FIRInAppMessaging.h"
+#import "FirebaseInAppMessaging/Sources/RenderingObjects/FIRInAppMessagingRenderingPrivate.h"
 
 #import "FirebaseABTesting/Sources/Private/ABTExperimentPayload.h"
 

FirebaseInAppMessaging/Tests/Unit/FIRIAMElapsedTimeTrackerTests.m

@@ -17,7 +17,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMElapsedTimeTracker.h"
+#import "FirebaseInAppMessaging/Sources/Util/FIRIAMElapsedTimeTracker.h"
 
 @interface FIRIAMElapsedTimeTrackerTests : XCTestCase
 @property id<FIRIAMTimeFetcher> mockTimeFetcher;

FirebaseInAppMessaging/Tests/Unit/FIRIAMFetchFlowTests.m

@@ -18,11 +18,11 @@
 
 #import <OCMock/OCMock.h>
 
-#import "FIRIAMAnalyticsEventLogger.h"
-#import "FIRIAMDisplayTriggerDefinition.h"
-#import "FIRIAMFetchFlow.h"
-#import "FIRIAMMessageContentDataWithImageURL.h"
-#import "FIRIAMSDKModeManager.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMAnalyticsEventLogger.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h"
 
 @interface FIRIAMFetchFlow (Testing)
 // Expose to verify that this gets called on initial app launch fetch.

FirebaseInAppMessaging/Tests/Unit/FIRIAMFetchResponseParserTests.m

@@ -16,12 +16,12 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMDisplayTriggerDefinition.h"
-#import "FIRIAMFetchResponseParser.h"
-#import "FIRIAMMessageContentDataWithImageURL.h"
-#import "FIRIAMMessageDefinition.h"
-#import "FIRIAMTimeFetcher.h"
-#import "UIColor+FIRIAMHexString.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMFetchResponseParser.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.h"
 
 @interface FIRIAMFetchResponseParserTests : XCTestCase
 @property(nonatomic, copy) NSString *jsonResponse;

FirebaseInAppMessaging/Tests/Unit/FIRIAMMessageClientCacheTests.m

@@ -17,12 +17,12 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
-#import "FIRIAMDisplayTriggerDefinition.h"
-#import "FIRIAMMessageClientCache.h"
-#import "FIRIAMMessageContentDataWithImageURL.h"
-#import "FIRIAMMessageDefinition.h"
-#import "FIRIAMTimeFetcher.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMDisplayCheckOnAnalyticEventsFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/DisplayTrigger/FIRIAMDisplayTriggerDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMessageClientCache.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/FIRIAMTimeFetcher.h"
 
 @interface FIRIAMMessageClientCacheTests : XCTestCase
 @property id<FIRIAMBookKeeper> mockBookkeeper;

FirebaseInAppMessaging/Tests/Unit/FIRIAMMessageContentDataWithImageURLTests.m

@@ -16,7 +16,7 @@
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "FIRIAMMessageContentDataWithImageURL.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageContentDataWithImageURL.h"
 
 static NSString *defaultTitle = @"Message Title";
 static NSString *defaultBody = @"Message Body";

FirebaseInAppMessaging/Tests/Unit/FIRIAMMsgFetcherUsingRestfulTests.m

@@ -16,9 +16,9 @@
 
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
-#import "FIRIAMFetchFlow.h"
-#import "FIRIAMMessageDefinition.h"
-#import "FIRIAMMsgFetcherUsingRestful.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMFetchFlow.h"
+#import "FirebaseInAppMessaging/Sources/Private/Data/FIRIAMMessageDefinition.h"
+#import "FirebaseInAppMessaging/Sources/Private/Flows/FIRIAMMsgFetcherUsingRestful.h"
 
 static NSString *serverHost = @"myhost";
 static NSString *projectNumber = @"My-project-number";

FirebaseInAppMessaging/Tests/Unit/FIRIAMSDKModeManagerTests.m

@@ -17,7 +17,7 @@
 #import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
-#import "FIRIAMSDKModeManager.h"
+#import "FirebaseInAppMessaging/Sources/Private/Runtime/FIRIAMSDKModeManager.h"
 
 @interface FIRIAMSDKModeManagerTests : XCTestCase
 @property(nonatomic) NSUserDefaults *mockUserDefaults;

FirebaseInAppMessaging/Tests/Unit/NSString+InterlaceStringsTests.m

@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "NSString+FIRInterlaceStrings.h"
+#import "FirebaseInAppMessaging/Sources/Private/Util/NSString+FIRInterlaceStrings.h"
 
 @interface NSString_InterlaceStringsTests : XCTestCase
 

FirebaseInAppMessaging/Tests/Unit/UIColor+FIRIAMHexStringTests.m

@@ -16,7 +16,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "UIColor+FIRIAMHexString.h"
+#import "FirebaseInAppMessaging/Sources/Util/UIColor+FIRIAMHexString.h"
 
 @interface UIColor_FIRIAMHexStringTests : XCTestCase
 

scripts/change_headers.swift

@@ -20,7 +20,7 @@
 import Foundation
 
 // Update with directories in which to find headers.
-let findHeaders = ["FirebaseRemoteConfig"]
+let findHeaders = ["FirebaseInAppMessaging"]
 
 // Update with directories in which to change imports.
 let changeImports = ["GoogleUtilities", "FirebaseAuth", "FirebaseCore", "Firebase",

scripts/check_imports.swift

@@ -41,7 +41,6 @@ let skipDirPatterns = ["/Sample/", "/Pods/", "FirebaseStorage/Tests/Integration"
     "Firebase/CoreDiagnostics",
     "FirebaseDatabase/Sources/third_party/Wrap-leveldb", // Pending SwiftPM for leveldb.
     "Example",
-    "FirebaseInAppMessaging",
     "FirebaseInstallations/Source/Tests/Unit/",
     "Firebase/InstanceID",
     "FirebaseMessaging",