Remove Auth/Source/Private - restoring headers to original location (#113)

60 files changed, 79 insertions, 79 deletions

diff --git a/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h b/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h
index 004716c..d50bf17 100644
--- a/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h
+++ b/Firebase/Auth/Source/AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "../../Private/FIRAuthCredential_Internal.h"
+#import "FIRAuthCredential_Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthCredential.h b/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthCredential.h
index 1c03573..47ab18a 100644
--- a/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthCredential.h
+++ b/Firebase/Auth/Source/AuthProviders/Facebook/FIRFacebookAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "../../Private/FIRAuthCredential_Internal.h"
+#import "FIRAuthCredential_Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthCredential.h b/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthCredential.h
index c43fb52..bfb5479 100644
--- a/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthCredential.h
+++ b/Firebase/Auth/Source/AuthProviders/GitHub/FIRGitHubAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "../../Private/FIRAuthCredential_Internal.h"
+#import "FIRAuthCredential_Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthCredential.h b/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthCredential.h
index ae98fbc..bacab63 100644
--- a/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthCredential.h
+++ b/Firebase/Auth/Source/AuthProviders/Google/FIRGoogleAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "../../Private/FIRAuthCredential_Internal.h"
+#import "FIRAuthCredential_Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthCredential.h b/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthCredential.h
index 744df33..7e2d829 100644
--- a/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthCredential.h
+++ b/Firebase/Auth/Source/AuthProviders/OAuth/FIROAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "../../Private/FIRAuthCredential_Internal.h"
+#import "FIRAuthCredential_Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m b/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m
index 823403c..f950b72 100644
--- a/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m
+++ b/Firebase/Auth/Source/AuthProviders/Phone/FIRPhoneAuthProvider.m
@@ -19,14 +19,14 @@
 #import "FIRLogger.h"
 #import "FIRPhoneAuthCredential_Internal.h"
 #import "NSString+FIRAuth.h"
-#import "../../Private/FIRAuthAPNSToken.h"
-#import "../../Private/FIRAuthAPNSTokenManager.h"
-#import "../../Private/FIRAuthAppCredential.h"
-#import "../../Private/FIRAuthAppCredentialManager.h"
-#import "../../Private/FIRAuthGlobalWorkQueue.h"
-#import "../../Private/FIRAuth_Internal.h"
-#import "../../Private/FIRAuthNotificationManager.h"
-#import "../../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthAPNSToken.h"
+#import "FIRAuthAPNSTokenManager.h"
+#import "FIRAuthAppCredential.h"
+#import "FIRAuthAppCredentialManager.h"
+#import "FIRAuthGlobalWorkQueue.h"
+#import "FIRAuth_Internal.h"
+#import "FIRAuthNotificationManager.h"
+#import "FIRAuthErrorUtils.h"
 #import "FIRAuthBackend.h"
 #import "FIRSendVerificationCodeRequest.h"
 #import "FIRSendVerificationCodeResponse.h"
diff --git a/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthCredential.h b/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthCredential.h
index 5fab4e2..0ff44fa 100644
--- a/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthCredential.h
+++ b/Firebase/Auth/Source/AuthProviders/Twitter/FIRTwitterAuthCredential.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "../../Private/FIRAuthCredential_Internal.h"
+#import "FIRAuthCredential_Internal.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/FIRAdditionalUserInfo.m b/Firebase/Auth/Source/FIRAdditionalUserInfo.m
index e00347d..3fee504 100644
--- a/Firebase/Auth/Source/FIRAdditionalUserInfo.m
+++ b/Firebase/Auth/Source/FIRAdditionalUserInfo.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAdditionalUserInfo_Internal.h"
+#import "FIRAdditionalUserInfo_Internal.h"
 
 #import "FIRVerifyAssertionResponse.h"
 
diff --git a/Firebase/Auth/Source/Private/FIRAdditionalUserInfo_Internal.h b/Firebase/Auth/Source/FIRAdditionalUserInfo_Internal.h
index a813566..a813566 100644
--- a/Firebase/Auth/Source/Private/FIRAdditionalUserInfo_Internal.h
+++ b/Firebase/Auth/Source/FIRAdditionalUserInfo_Internal.h
diff --git a/Firebase/Auth/Source/FIRAuth.m b/Firebase/Auth/Source/FIRAuth.m
index 4297642..9363069 100644
--- a/Firebase/Auth/Source/FIRAuth.m
+++ b/Firebase/Auth/Source/FIRAuth.m
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Private/FIRAuth_Internal.h"
+#import "FIRAuth_Internal.h"
 
 #import "FIRAppAssociationRegistration.h"
 #import "FIRAppInternal.h"
@@ -24,15 +24,15 @@
 #import "FIRLogger.h"
 #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h"
 #import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h"
-#import "Private/FIRAdditionalUserInfo_Internal.h"
-#import "Private/FIRAuthCredential_Internal.h"
-#import "Private/FIRAuthDataResult_Internal.h"
-#import "Private/FIRAuthDispatcher.h"
-#import "Private/FIRAuthErrorUtils.h"
+#import "FIRAdditionalUserInfo_Internal.h"
+#import "FIRAuthCredential_Internal.h"
+#import "FIRAuthDataResult_Internal.h"
+#import "FIRAuthDispatcher.h"
+#import "FIRAuthErrorUtils.h"
 #import "FIRAuthExceptionUtils.h"
-#import "Private/FIRAuthGlobalWorkQueue.h"
-#import "Private/FIRAuthKeychain.h"
-#import "Private/FIRUser_Internal.h"
+#import "FIRAuthGlobalWorkQueue.h"
+#import "FIRAuthKeychain.h"
+#import "FIRUser_Internal.h"
 #import "FirebaseAuth.h"
 #import "FIRAuthBackend.h"
 #import "FIRCreateAuthURIRequest.h"
@@ -58,11 +58,11 @@
 
 #if TARGET_OS_IOS
 #import <UIKit/UIKit.h>
-#import "Private/FIRAuthAPNSToken.h"
-#import "Private/FIRAuthAPNSTokenManager.h"
-#import "Private/FIRAuthAppCredentialManager.h"
-#import "Private/FIRAuthAppDelegateProxy.h"
-#import "Private/FIRAuthNotificationManager.h"
+#import "FIRAuthAPNSToken.h"
+#import "FIRAuthAPNSTokenManager.h"
+#import "FIRAuthAppCredentialManager.h"
+#import "FIRAuthAppDelegateProxy.h"
+#import "FIRAuthNotificationManager.h"
 #endif
 
 #pragma mark - Constants
diff --git a/Firebase/Auth/Source/Private/FIRAuthAPNSToken.h b/Firebase/Auth/Source/FIRAuthAPNSToken.h
index 8efd4e1..8efd4e1 100644
--- a/Firebase/Auth/Source/Private/FIRAuthAPNSToken.h
+++ b/Firebase/Auth/Source/FIRAuthAPNSToken.h
diff --git a/Firebase/Auth/Source/FIRAuthAPNSToken.m b/Firebase/Auth/Source/FIRAuthAPNSToken.m
index fc5ee2d..b11057d 100644
--- a/Firebase/Auth/Source/FIRAuthAPNSToken.m
+++ b/Firebase/Auth/Source/FIRAuthAPNSToken.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthAPNSToken.h"
+#import "FIRAuthAPNSToken.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/Private/FIRAuthAPNSTokenManager.h b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.h
index a2d6f4c..a2d6f4c 100644
--- a/Firebase/Auth/Source/Private/FIRAuthAPNSTokenManager.h
+++ b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.h
diff --git a/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m
index 575bee9..300b7e3 100644
--- a/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m
+++ b/Firebase/Auth/Source/FIRAuthAPNSTokenManager.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthAPNSTokenManager.h"
+#import "FIRAuthAPNSTokenManager.h"
 
 #import "FIRLogger.h"
-#import "Private/FIRAuthAPNSToken.h"
+#import "FIRAuthAPNSToken.h"
 #import "FIRAuthGlobalWorkQueue.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Firebase/Auth/Source/Private/FIRAuthAppCredential.h b/Firebase/Auth/Source/FIRAuthAppCredential.h
index 57fa83a..57fa83a 100644
--- a/Firebase/Auth/Source/Private/FIRAuthAppCredential.h
+++ b/Firebase/Auth/Source/FIRAuthAppCredential.h
diff --git a/Firebase/Auth/Source/FIRAuthAppCredential.m b/Firebase/Auth/Source/FIRAuthAppCredential.m
index ad12741..27d4ad2 100644
--- a/Firebase/Auth/Source/FIRAuthAppCredential.m
+++ b/Firebase/Auth/Source/FIRAuthAppCredential.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthAppCredential.h"
+#import "FIRAuthAppCredential.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/Private/FIRAuthAppCredentialManager.h b/Firebase/Auth/Source/FIRAuthAppCredentialManager.h
index 21c1545..21c1545 100644
--- a/Firebase/Auth/Source/Private/FIRAuthAppCredentialManager.h
+++ b/Firebase/Auth/Source/FIRAuthAppCredentialManager.h
diff --git a/Firebase/Auth/Source/FIRAuthAppCredentialManager.m b/Firebase/Auth/Source/FIRAuthAppCredentialManager.m
index 2a0d1c7..0e251a7 100644
--- a/Firebase/Auth/Source/FIRAuthAppCredentialManager.m
+++ b/Firebase/Auth/Source/FIRAuthAppCredentialManager.m
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthAppCredentialManager.h"
+#import "FIRAuthAppCredentialManager.h"
 
-#import "Private/FIRAuthAppCredential.h"
+#import "FIRAuthAppCredential.h"
 #import "FIRAuthGlobalWorkQueue.h"
 #import "FIRAuthKeychain.h"
 
diff --git a/Firebase/Auth/Source/Private/FIRAuthAppDelegateProxy.h b/Firebase/Auth/Source/FIRAuthAppDelegateProxy.h
index 656e4f2..656e4f2 100644
--- a/Firebase/Auth/Source/Private/FIRAuthAppDelegateProxy.h
+++ b/Firebase/Auth/Source/FIRAuthAppDelegateProxy.h
diff --git a/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m b/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m
index ca88a4c..f24765a 100644
--- a/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m
+++ b/Firebase/Auth/Source/FIRAuthAppDelegateProxy.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthAppDelegateProxy.h"
+#import "FIRAuthAppDelegateProxy.h"
 
 #import <objc/runtime.h>
 
diff --git a/Firebase/Auth/Source/FIRAuthCredential.m b/Firebase/Auth/Source/FIRAuthCredential.m
index d476d6d..54cb15c 100644
--- a/Firebase/Auth/Source/FIRAuthCredential.m
+++ b/Firebase/Auth/Source/FIRAuthCredential.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthCredential_Internal.h"
+#import "FIRAuthCredential_Internal.h"
 
 @implementation FIRAuthCredential
 
diff --git a/Firebase/Auth/Source/Private/FIRAuthCredential_Internal.h b/Firebase/Auth/Source/FIRAuthCredential_Internal.h
index e060cda..e060cda 100644
--- a/Firebase/Auth/Source/Private/FIRAuthCredential_Internal.h
+++ b/Firebase/Auth/Source/FIRAuthCredential_Internal.h
diff --git a/Firebase/Auth/Source/FIRAuthDataResult.m b/Firebase/Auth/Source/FIRAuthDataResult.m
index fd2daa7..cd04b92 100644
--- a/Firebase/Auth/Source/FIRAuthDataResult.m
+++ b/Firebase/Auth/Source/FIRAuthDataResult.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthDataResult_Internal.h"
+#import "FIRAuthDataResult_Internal.h"
 
 #import "FIRAdditionalUserInfo.h"
 #import "FIRUser.h"
diff --git a/Firebase/Auth/Source/Private/FIRAuthDataResult_Internal.h b/Firebase/Auth/Source/FIRAuthDataResult_Internal.h
index b95edc2..b95edc2 100644
--- a/Firebase/Auth/Source/Private/FIRAuthDataResult_Internal.h
+++ b/Firebase/Auth/Source/FIRAuthDataResult_Internal.h
diff --git a/Firebase/Auth/Source/Private/FIRAuthDispatcher.h b/Firebase/Auth/Source/FIRAuthDispatcher.h
index f8ddca5..f8ddca5 100644
--- a/Firebase/Auth/Source/Private/FIRAuthDispatcher.h
+++ b/Firebase/Auth/Source/FIRAuthDispatcher.h
diff --git a/Firebase/Auth/Source/FIRAuthDispatcher.m b/Firebase/Auth/Source/FIRAuthDispatcher.m
index 98eb50a..78ed2e3 100644
--- a/Firebase/Auth/Source/FIRAuthDispatcher.m
+++ b/Firebase/Auth/Source/FIRAuthDispatcher.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthDispatcher.h"
+#import "FIRAuthDispatcher.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/Private/FIRAuthErrorUtils.h b/Firebase/Auth/Source/FIRAuthErrorUtils.h
index e8eb1f5..e8eb1f5 100644
--- a/Firebase/Auth/Source/Private/FIRAuthErrorUtils.h
+++ b/Firebase/Auth/Source/FIRAuthErrorUtils.h
diff --git a/Firebase/Auth/Source/FIRAuthErrorUtils.m b/Firebase/Auth/Source/FIRAuthErrorUtils.m
index 92cc78a..671eac6 100644
--- a/Firebase/Auth/Source/FIRAuthErrorUtils.m
+++ b/Firebase/Auth/Source/FIRAuthErrorUtils.m
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 #import "FIRAuthCredential.h"
-#import "Private/FIRAuthInternalErrors.h"
+#import "FIRAuthInternalErrors.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/Private/FIRAuthExceptionUtils.h b/Firebase/Auth/Source/FIRAuthExceptionUtils.h
index 3ae9159..3ae9159 100644
--- a/Firebase/Auth/Source/Private/FIRAuthExceptionUtils.h
+++ b/Firebase/Auth/Source/FIRAuthExceptionUtils.h
diff --git a/Firebase/Auth/Source/Private/FIRAuthGlobalWorkQueue.h b/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.h
index 0950ff4..0950ff4 100644
--- a/Firebase/Auth/Source/Private/FIRAuthGlobalWorkQueue.h
+++ b/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.h
diff --git a/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.m b/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.m
index 8780959..accac89 100644
--- a/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.m
+++ b/Firebase/Auth/Source/FIRAuthGlobalWorkQueue.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthGlobalWorkQueue.h"
+#import "FIRAuthGlobalWorkQueue.h"
 
 dispatch_queue_t FIRAuthGlobalWorkQueue() {
   static dispatch_once_t once;
diff --git a/Firebase/Auth/Source/Private/FIRAuthInternalErrors.h b/Firebase/Auth/Source/FIRAuthInternalErrors.h
index c0fc912..c0fc912 100644
--- a/Firebase/Auth/Source/Private/FIRAuthInternalErrors.h
+++ b/Firebase/Auth/Source/FIRAuthInternalErrors.h
diff --git a/Firebase/Auth/Source/Private/FIRAuthKeychain.h b/Firebase/Auth/Source/FIRAuthKeychain.h
index c52e26a..c52e26a 100644
--- a/Firebase/Auth/Source/Private/FIRAuthKeychain.h
+++ b/Firebase/Auth/Source/FIRAuthKeychain.h
diff --git a/Firebase/Auth/Source/FIRAuthKeychain.m b/Firebase/Auth/Source/FIRAuthKeychain.m
index 68cf2f2..199dea2 100644
--- a/Firebase/Auth/Source/FIRAuthKeychain.m
+++ b/Firebase/Auth/Source/FIRAuthKeychain.m
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthKeychain.h"
+#import "FIRAuthKeychain.h"
 
 #import <Security/Security.h>
 
-#import "Private/FIRAuthErrorUtils.h"
-#import "Private/FIRAuthUserDefaultsStorage.h"
+#import "FIRAuthErrorUtils.h"
+#import "FIRAuthUserDefaultsStorage.h"
 
 #if FIRAUTH_USER_DEFAULTS_STORAGE_AVAILABLE
 #import <UIKit/UIKit.h>
diff --git a/Firebase/Auth/Source/Private/FIRAuthNotificationManager.h b/Firebase/Auth/Source/FIRAuthNotificationManager.h
index 42e5db8..42e5db8 100644
--- a/Firebase/Auth/Source/Private/FIRAuthNotificationManager.h
+++ b/Firebase/Auth/Source/FIRAuthNotificationManager.h
diff --git a/Firebase/Auth/Source/FIRAuthNotificationManager.m b/Firebase/Auth/Source/FIRAuthNotificationManager.m
index c8c52e9..4536b5e 100644
--- a/Firebase/Auth/Source/FIRAuthNotificationManager.m
+++ b/Firebase/Auth/Source/FIRAuthNotificationManager.m
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthNotificationManager.h"
+#import "FIRAuthNotificationManager.h"
 
 #import "FIRLogger.h"
-#import "Private/FIRAuthAppCredential.h"
-#import "Private/FIRAuthAppCredentialManager.h"
+#import "FIRAuthAppCredential.h"
+#import "FIRAuthAppCredentialManager.h"
 #import "FIRAuthGlobalWorkQueue.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Firebase/Auth/Source/Private/FIRAuthSerialTaskQueue.h b/Firebase/Auth/Source/FIRAuthSerialTaskQueue.h
index cdae046..cdae046 100644
--- a/Firebase/Auth/Source/Private/FIRAuthSerialTaskQueue.h
+++ b/Firebase/Auth/Source/FIRAuthSerialTaskQueue.h
diff --git a/Firebase/Auth/Source/FIRAuthSerialTaskQueue.m b/Firebase/Auth/Source/FIRAuthSerialTaskQueue.m
index 47e6cd5..3be0f54 100644
--- a/Firebase/Auth/Source/FIRAuthSerialTaskQueue.m
+++ b/Firebase/Auth/Source/FIRAuthSerialTaskQueue.m
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthSerialTaskQueue.h"
+#import "FIRAuthSerialTaskQueue.h"
 
-#import "Private/FIRAuthGlobalWorkQueue.h"
+#import "FIRAuthGlobalWorkQueue.h"
 
 @implementation FIRAuthSerialTaskQueue {
   /** @var _dispatchQueue
diff --git a/Firebase/Auth/Source/Private/FIRAuthUserDefaultsStorage.h b/Firebase/Auth/Source/FIRAuthUserDefaultsStorage.h
index 13774ab..13774ab 100644
--- a/Firebase/Auth/Source/Private/FIRAuthUserDefaultsStorage.h
+++ b/Firebase/Auth/Source/FIRAuthUserDefaultsStorage.h
diff --git a/Firebase/Auth/Source/FIRAuthUserDefaultsStorage.m b/Firebase/Auth/Source/FIRAuthUserDefaultsStorage.m
index ad23f41..d9f012a 100644
--- a/Firebase/Auth/Source/FIRAuthUserDefaultsStorage.m
+++ b/Firebase/Auth/Source/FIRAuthUserDefaultsStorage.m
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "Private/FIRAuthUserDefaultsStorage.h"
+#import "FIRAuthUserDefaultsStorage.h"
 
 #if FIRAUTH_USER_DEFAULTS_STORAGE_AVAILABLE
 
diff --git a/Firebase/Auth/Source/Private/FIRAuth_Internal.h b/Firebase/Auth/Source/FIRAuth_Internal.h
index 94363a1..94363a1 100644
--- a/Firebase/Auth/Source/Private/FIRAuth_Internal.h
+++ b/Firebase/Auth/Source/FIRAuth_Internal.h
diff --git a/Firebase/Auth/Source/FIRSecureTokenService.m b/Firebase/Auth/Source/FIRSecureTokenService.m
index e88b41c..0e5af42 100644
--- a/Firebase/Auth/Source/FIRSecureTokenService.m
+++ b/Firebase/Auth/Source/FIRSecureTokenService.m
@@ -17,8 +17,8 @@
 #import "FIRSecureTokenService.h"
 
 #import "FIRAuth.h"
-#import "Private/FIRAuthKeychain.h"
-#import "Private/FIRAuthSerialTaskQueue.h"
+#import "FIRAuthKeychain.h"
+#import "FIRAuthSerialTaskQueue.h"
 #import "FIRAuthBackend.h"
 #import "FIRSecureTokenRequest.h"
 #import "FIRSecureTokenResponse.h"
diff --git a/Firebase/Auth/Source/FIRUser.m b/Firebase/Auth/Source/FIRUser.m
index de9745d..112b870 100644
--- a/Firebase/Auth/Source/FIRUser.m
+++ b/Firebase/Auth/Source/FIRUser.m
@@ -16,19 +16,19 @@
 
 #import <Foundation/Foundation.h>
 
-#import "Private/FIRUser_Internal.h"
+#import "FIRUser_Internal.h"
 
 #import "AuthProviders/EmailPassword/FIREmailPasswordAuthCredential.h"
 #import "FIREmailAuthProvider.h"
 #import "AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h"
-#import "Private/FIRAdditionalUserInfo_Internal.h"
+#import "FIRAdditionalUserInfo_Internal.h"
 #import "FIRAuth.h"
-#import "Private/FIRAuthCredential_Internal.h"
-#import "Private/FIRAuthDataResult_Internal.h"
-#import "Private/FIRAuthErrorUtils.h"
-#import "Private/FIRAuthGlobalWorkQueue.h"
-#import "Private/FIRAuthSerialTaskQueue.h"
-#import "Private/FIRAuth_Internal.h"
+#import "FIRAuthCredential_Internal.h"
+#import "FIRAuthDataResult_Internal.h"
+#import "FIRAuthErrorUtils.h"
+#import "FIRAuthGlobalWorkQueue.h"
+#import "FIRAuthSerialTaskQueue.h"
+#import "FIRAuth_Internal.h"
 #import "FIRSecureTokenService.h"
 #import "FIRUserInfoImpl.h"
 #import "FIRAuthBackend.h"
diff --git a/Firebase/Auth/Source/Private/FIRUserInfoImpl.h b/Firebase/Auth/Source/FIRUserInfoImpl.h
index 0022a68..0022a68 100644
--- a/Firebase/Auth/Source/Private/FIRUserInfoImpl.h
+++ b/Firebase/Auth/Source/FIRUserInfoImpl.h
diff --git a/Firebase/Auth/Source/Private/FIRUser_Internal.h b/Firebase/Auth/Source/FIRUser_Internal.h
index 1447607..1447607 100644
--- a/Firebase/Auth/Source/Private/FIRUser_Internal.h
+++ b/Firebase/Auth/Source/FIRUser_Internal.h
diff --git a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
index 26ce790..3e3765b 100644
--- a/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
+++ b/Firebase/Auth/Source/RPCs/FIRAuthBackend.m
@@ -19,8 +19,8 @@
 #import "FIRAuthBackend.h"
 
 #import "../AuthProviders/Phone/FIRPhoneAuthCredential_Internal.h"
-#import "../Private/FIRAuthErrorUtils.h"
-#import "../Private/FIRAuthGlobalWorkQueue.h"
+#import "FIRAuthErrorUtils.h"
+#import "FIRAuthGlobalWorkQueue.h"
 #import "FirebaseAuth.h"
 #import "FIRAuthRPCRequest.h"
 #import "FIRAuthRPCResponse.h"
diff --git a/Firebase/Auth/Source/RPCs/FIRCreateAuthURIResponse.m b/Firebase/Auth/Source/RPCs/FIRCreateAuthURIResponse.m
index 7a38cca..c6b9d03 100644
--- a/Firebase/Auth/Source/RPCs/FIRCreateAuthURIResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRCreateAuthURIResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRCreateAuthURIResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRCreateAuthURIResponse
 
diff --git a/Firebase/Auth/Source/RPCs/FIRDeleteAccountResponse.m b/Firebase/Auth/Source/RPCs/FIRDeleteAccountResponse.m
index 01eb0a5..671a41f 100644
--- a/Firebase/Auth/Source/RPCs/FIRDeleteAccountResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRDeleteAccountResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRDeleteAccountResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRDeleteAccountResponse
 
diff --git a/Firebase/Auth/Source/RPCs/FIRGetAccountInfoResponse.m b/Firebase/Auth/Source/RPCs/FIRGetAccountInfoResponse.m
index ba10746..6a16593 100644
--- a/Firebase/Auth/Source/RPCs/FIRGetAccountInfoResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRGetAccountInfoResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRGetAccountInfoResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 /** @var kErrorKey
     @brief The key for the "error" value in JSON responses from the server.
diff --git a/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeRequest.m b/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeRequest.m
index b0523e4..cf0dda5 100644
--- a/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeRequest.m
+++ b/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeRequest.m
@@ -16,8 +16,8 @@
 
 #import "FIRGetOOBConfirmationCodeRequest.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
-#import "../Private/FIRAuth_Internal.h"
+#import "FIRAuthErrorUtils.h"
+#import "FIRAuth_Internal.h"
 
 /** @var kEndpoint
     @brief The getOobConfirmationCode endpoint name.
diff --git a/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeResponse.m b/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeResponse.m
index d5fc1dd..bd028f1 100644
--- a/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRGetOOBConfirmationCodeResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRGetOOBConfirmationCodeResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/RPCs/FIRResetPasswordResponse.m b/Firebase/Auth/Source/RPCs/FIRResetPasswordResponse.m
index d306f6c..9a1556b 100644
--- a/Firebase/Auth/Source/RPCs/FIRResetPasswordResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRResetPasswordResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRResetPasswordResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRResetPasswordResponse
 
diff --git a/Firebase/Auth/Source/RPCs/FIRSecureTokenResponse.m b/Firebase/Auth/Source/RPCs/FIRSecureTokenResponse.m
index 8ff3dde..b97fda5 100644
--- a/Firebase/Auth/Source/RPCs/FIRSecureTokenResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRSecureTokenResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRSecureTokenResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 /** @var kExpiresInKey
     @brief The key for the number of seconds till the access token expires.
diff --git a/Firebase/Auth/Source/RPCs/FIRSendVerificationCodeRequest.m b/Firebase/Auth/Source/RPCs/FIRSendVerificationCodeRequest.m
index f2212ad..d97c90a 100644
--- a/Firebase/Auth/Source/RPCs/FIRSendVerificationCodeRequest.m
+++ b/Firebase/Auth/Source/RPCs/FIRSendVerificationCodeRequest.m
@@ -16,7 +16,7 @@
 
 #import "FIRSendVerificationCodeRequest.h"
 
-#import "../Private/FIRAuthAppCredential.h"
+#import "FIRAuthAppCredential.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Firebase/Auth/Source/RPCs/FIRSetAccountInfoRequest.m b/Firebase/Auth/Source/RPCs/FIRSetAccountInfoRequest.m
index b18d0dd..5b202a4 100644
--- a/Firebase/Auth/Source/RPCs/FIRSetAccountInfoRequest.m
+++ b/Firebase/Auth/Source/RPCs/FIRSetAccountInfoRequest.m
@@ -16,8 +16,8 @@
 
 #import "FIRSetAccountInfoRequest.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
-#import "../Private/FIRAuth_Internal.h"
+#import "FIRAuthErrorUtils.h"
+#import "FIRAuth_Internal.h"
 #import "FIRGetAccountInfoResponse.h"
 
 NSString *const FIRSetAccountInfoUserAttributeEmail = @"EMAIL";
diff --git a/Firebase/Auth/Source/RPCs/FIRSetAccountInfoResponse.m b/Firebase/Auth/Source/RPCs/FIRSetAccountInfoResponse.m
index 140ba25..6e228eb 100644
--- a/Firebase/Auth/Source/RPCs/FIRSetAccountInfoResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRSetAccountInfoResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRSetAccountInfoResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRSetAccountInfoResponseProviderUserInfo
 
diff --git a/Firebase/Auth/Source/RPCs/FIRSignUpNewUserResponse.m b/Firebase/Auth/Source/RPCs/FIRSignUpNewUserResponse.m
index 4196d21..7e58c5d 100644
--- a/Firebase/Auth/Source/RPCs/FIRSignUpNewUserResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRSignUpNewUserResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRSignUpNewUserResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRSignUpNewUserResponse
 
diff --git a/Firebase/Auth/Source/RPCs/FIRVerifyAssertionResponse.m b/Firebase/Auth/Source/RPCs/FIRVerifyAssertionResponse.m
index 6ae33c6..8c970c8 100644
--- a/Firebase/Auth/Source/RPCs/FIRVerifyAssertionResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRVerifyAssertionResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRVerifyAssertionResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRVerifyAssertionResponse
 
diff --git a/Firebase/Auth/Source/RPCs/FIRVerifyCustomTokenResponse.m b/Firebase/Auth/Source/RPCs/FIRVerifyCustomTokenResponse.m
index f86d94b..12dc203 100644
--- a/Firebase/Auth/Source/RPCs/FIRVerifyCustomTokenResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRVerifyCustomTokenResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRVerifyCustomTokenResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRVerifyCustomTokenResponse
 
diff --git a/Firebase/Auth/Source/RPCs/FIRVerifyPasswordResponse.m b/Firebase/Auth/Source/RPCs/FIRVerifyPasswordResponse.m
index 4d0ca10..d2c4a7c 100644
--- a/Firebase/Auth/Source/RPCs/FIRVerifyPasswordResponse.m
+++ b/Firebase/Auth/Source/RPCs/FIRVerifyPasswordResponse.m
@@ -16,7 +16,7 @@
 
 #import "FIRVerifyPasswordResponse.h"
 
-#import "../Private/FIRAuthErrorUtils.h"
+#import "FIRAuthErrorUtils.h"
 
 @implementation FIRVerifyPasswordResponse