diff --git a/eDistantObject.podspec b/eDistantObject.podspec
index ad1c234..d6fbbc1 100644
--- a/eDistantObject.podspec
+++ b/eDistantObject.podspec
@@ -1,62 +1,34 @@
 Pod::Spec.new do |s|
-
   s.name = "eDistantObject"
   s.version = "0.9.0"
   s.summary = "ObjC and Swift remote invocation framework"
   s.homepage = "https://github.com/google/eDistantObject"
-  s.author = "Google Inc."
-  s.summary = "eDistantObject provides users an easy way to make remote method invocations between processes in Objective-C and Swift without explicitly constructing RPC structures."
+  s.author = "Google LLC."
+  s.description = <<-DESC
+            eDistantObject provides users an easy way to make remote method invocations between
+            processes in Objective-C and Swift without explicitly constructing RPC structures.
+            DESC
   s.license = { :type => "Apache 2.0", :file => "LICENSE" }
   s.source = { :git => "https://github.com/google/eDistantObject.git", :tag => "0.9.0" }
 
-  # Subspec each folder so folders exist when pod is installed.
-
-  # Can't have the public headers exist in the private headers as you won't be able to import them. Made these arrays because of this.
-  service_public = %w[Service/Sources/EDOClientService.h
-                     Service/Sources/EDOClientService+Device.h
-                     Service/Sources/EDOClientServiceStatsCollector.h
-                     Service/Sources/EDOHostNamingService.h
-                     Service/Sources/EDOHostService.h
-                     Service/Sources/EDOHostService+Device.h
-                     Service/Sources/EDORemoteVariable.h
-                     Service/Sources/EDOServiceError.h
-                     Service/Sources/EDOServiceException.h
-                     Service/Sources/EDOServicePort.h
-                     Service/Sources/NSObject+EDOValueObject.h]
-
-  service_private = (Dir.glob("Service/Sources/*.h")) - service_public
-
-  s.subspec 'Service' do |service|
-    service.source_files = "Service/Sources/*.{m,h}"
-    service.public_header_files = service_public
-    service.private_header_files = service_private
-    service.header_dir = "Service/Sources"
-  end
-
-  s.subspec 'Channel' do |channel|
-    channel.source_files = "Channel/Sources/*.{m,h}"
-    channel.private_header_files = Dir.glob("Channel/Sources/*.h")
-    channel.header_dir = "Channel/Sources"
-  end
-
-  s.subspec 'Measure' do |measure|
-    measure.source_files = "Measure/Sources/*.{m,h}"
-    measure.private_header_files = Dir.glob("Measure/Sources/*.h")
-    measure.header_dir = "Measure/Sources"
-  end
-
-  device_public = %w[Device/Sources/EDODeviceConnector.h
-                     Device/Sources/EDODeviceDetector.h]
-  device_private = (Dir.glob("Device/Sources/*.h")) - device_public
-
-  s.subspec 'Device' do |device|
-    device.source_files = "Device/Sources/*.{m,h}"
-    device.public_header_files = device_public
-    device.private_header_files = device_private
-    device.header_dir = "Device/Sources"
-  end
+  s.public_header_files = %w[Service/Sources/EDOClientService.h
+                             Service/Sources/EDOClientService+Device.h
+                             Service/Sources/EDOClientServiceStatsCollector.h
+                             Service/Sources/EDOHostNamingService.h
+                             Service/Sources/EDOHostService.h
+                             Service/Sources/EDOHostService+Device.h
+                             Service/Sources/EDORemoteVariable.h
+                             Service/Sources/EDOServiceError.h
+                             Service/Sources/EDOServiceException.h
+                             Service/Sources/EDOServicePort.h
+                             Service/Sources/NSObject+EDOValueObject.h
+                             Device/Sources/EDODeviceConnector.h
+                             Device/Sources/EDODeviceDetector.h]
+
+  s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/eDistantObject" }
+  s.source_files = "Channel/Sources/*.{m,h}", "Device/Sources/*.{m,h}", "Measure/Sources/*.{m,h}",
+                   "Service/Sources/*.{m,h}"
 
   s.ios.deployment_target = "10.0"
   s.osx.deployment_target = "10.10"
-
-end
\ No newline at end of file
+end