gistfile1.txt

diff --git a/FirebaseEncoderSwift.podspec b/FirebaseEncoderSwift.podspec
new file mode 100644
index 000000000..0f0e01ec7
--- /dev/null
+++ b/FirebaseEncoderSwift.podspec
@@ -0,0 +1,36 @@
+#
+# Be sure to run `pod lib lint FirebaseEncoderSwift.podspec' to ensure this is a
+# valid spec before submitting.
+#
+
+Pod::Spec.new do |s|
+  s.name                    = 'FirebaseEncoderSwift'
+  s.version                 = '0.0.1-beta'
+  s.summary                 = 'Swift Extensions that provides Codable support for the Firebase SDKs'
+
+  s.description      = <<-DESC
+FirebaseEncoderSwift is used to serialize custom objects in the Realtime Database, Cloud Firestore and Cloud Functions SDKs.
+                       DESC
+
+  s.homepage                = 'https://developers.google.com/'
+  s.license                 = { :type => 'Apache', :file => 'LICENSE' }
+  s.authors                 = 'Google, Inc.'
+
+  s.source                  = {
+    :git => 'https://github.com/Firebase/firebase-ios-sdk.git',
+    :tag => 'CocoaPods-' + s.version.to_s
+  }
+
+  s.swift_version           = '5.3'
+  s.ios.deployment_target   = '11.0'
+  s.osx.deployment_target   = '10.12'
+  s.tvos.deployment_target  = '11.0'
+
+  s.cocoapods_version       = '>= 1.4.0'
+  s.prefix_header_file      = false
+
+  s.requires_arc            = true
+  s.source_files = [
+    'FirebaseSharedSwift/Sources/third_party/StructureEncoder/*.swift',
+  ]
+end
diff --git a/FirebaseFirestoreSwift.podspec b/FirebaseFirestoreSwift.podspec
index 25a39517c..2cb0f1206 100644
--- a/FirebaseFirestoreSwift.podspec
+++ b/FirebaseFirestoreSwift.podspec
@@ -32,8 +32,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   s.requires_arc            = true
   s.source_files = [
     'Firestore/Swift/Source/**/*.swift',
-    'Firestore/third_party/FirestoreEncoder/*.swift',
   ]
 
   s.dependency 'FirebaseFirestore', '~> 8.0'
+  s.dependency 'FirebaseEncoderSwift', '~> 0.0'
 end
diff --git a/Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift b/Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift
index 1d2d81186..d8aad632d 100644
--- a/Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift
+++ b/Firestore/Swift/Source/Codable/CodablePassThroughTypes.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 import FirebaseFirestore
-import FirebaseSharedSwift
+import FirebaseEncoderSwift
 
 extension GeoPoint: StructureCodingPassthroughType {}
 extension Timestamp: StructureCodingPassthroughType {}
diff --git a/Firestore/Swift/Source/Codable/DocumentID.swift b/Firestore/Swift/Source/Codable/DocumentID.swift
index ea11809cf..d6842fb5a 100644
--- a/Firestore/Swift/Source/Codable/DocumentID.swift
+++ b/Firestore/Swift/Source/Codable/DocumentID.swift
@@ -15,7 +15,7 @@
  */
 
 import FirebaseFirestore
-import FirebaseSharedSwift
+import FirebaseEncoderSwift
 
 let documentRefUserInfoKey =
   CodingUserInfoKey(rawValue: "DocumentRefUserInfoKey")!
diff --git a/Firestore/Swift/Source/Codable/DocumentSnapshot+ReadDecodable.swift b/Firestore/Swift/Source/Codable/DocumentSnapshot+ReadDecodable.swift
index cad6cd21b..71dadf27d 100644
--- a/Firestore/Swift/Source/Codable/DocumentSnapshot+ReadDecodable.swift
+++ b/Firestore/Swift/Source/Codable/DocumentSnapshot+ReadDecodable.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 import FirebaseFirestore
-import FirebaseSharedSwift
+import FirebaseEncoderSwift
 
 extension DocumentSnapshot {
   /// Retrieves all fields in a document and converts them to an instance of
diff --git a/Firestore/Swift/Source/Codable/EncoderDecoder.swift b/Firestore/Swift/Source/Codable/EncoderDecoder.swift
index 187e9a76a..fffa38b53 100644
--- a/Firestore/Swift/Source/Codable/EncoderDecoder.swift
+++ b/Firestore/Swift/Source/Codable/EncoderDecoder.swift
@@ -15,7 +15,7 @@
  */
 
 import FirebaseFirestore
-import FirebaseSharedSwift
+import FirebaseEncoderSwift
 import Foundation
 
 extension Firestore {
diff --git a/Firestore/Swift/Source/Codable/TimestampDecodingStrategy.swift b/Firestore/Swift/Source/Codable/TimestampDecodingStrategy.swift
index 95829df05..853d6fab1 100644
--- a/Firestore/Swift/Source/Codable/TimestampDecodingStrategy.swift
+++ b/Firestore/Swift/Source/Codable/TimestampDecodingStrategy.swift
@@ -16,7 +16,7 @@
 
 import Foundation
 import FirebaseFirestore
-import FirebaseSharedSwift
+import FirebaseEncoderSwift
 
 @available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
 private var _iso8601Formatter: ISO8601DateFormatter = {