diff --git a/iOS/SonarKit.podspec b/SonarKit.podspec
similarity index 94%
rename from iOS/SonarKit.podspec
rename to SonarKit.podspec
index d4f9c9858..238aecde2 100644
--- a/iOS/SonarKit.podspec
+++ b/SonarKit.podspec
@@ -10,15 +10,14 @@ Pod::Spec.new do |spec|
   spec.summary = 'Sonar iOS podspec'
   spec.authors = 'Facebook'
   spec.static_framework = true
-  # spec.prepare_command = 'mv src double-conversion'
   spec.source = { :git => 'https://github.com/facebook/Sonar.git',
                   :branch=> "master" }
   spec.module_name = 'SonarKit'
   spec.dependency 'Folly'
   spec.dependency 'Sonar'
   spec.dependency 'CocoaAsyncSocket', '~> 7.6'
-  # spec.dependency 'PeerTalk', '~> 0.0'
-  spec.dependency 'OpenSSL-Universal', '~> 1.0'
+  spec.dependency 'PeerTalk'
+  spec.dependency 'OpenSSL-Static', '1.0.2.c1'
   spec.source_files = 'iOS/FBDefines/*.{h,cpp,m,mm}', 'iOS/SonarKit/**/*.{h,cpp,m,mm}', 'iOS/SonarKit/FBCxxUtils/*.{h, mm}',
   spec.public_header_files = 'iOS/SonarKit/CppBridge/*.{h}',
                              'iOS/SonarKit/FBCxxUtils/*.{h}',
@@ -31,7 +30,7 @@ Pod::Spec.new do |spec|
 
   spec.compiler_flags = '-DFB_SONARKIT_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0'
   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\"  \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/ComponentKit\"/**" }
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/PeerTalkSonar\" \"$(PODS_ROOT)/ComponentKit\"/**" }
   spec.platforms = { :ios => "8.0" }
 
   spec.subspec "SonarKitLayoutPlugin" do |ss|
diff --git a/iOS/Podfile b/iOS/Podfile
index 07c87f716..63a63d759 100644
--- a/iOS/Podfile
+++ b/iOS/Podfile
@@ -9,14 +9,11 @@ target 'SonarKit' do
 
   # Pods for SonarKit
 
-  # Third party deps podspec link
-    #pod 'EasyWSClient', :podspec => 'third-party-podspecs/EasyWSClient.podspec'
+    pod 'PeerTalk', :podspec => 'third-party-podspecs/PeerTalk.podspec'
     pod 'RSocket', :podspec => 'third-party-podspecs/RSocket.podspec'
-    pod 'LibEvent', :podspec => 'third-party-podspecs/LibEvent.podspec'
     pod 'DoubleConversion', :podspec => 'third-party-podspecs/DoubleConversion.podspec'
     pod 'glog', :podspec => 'third-party-podspecs/glog.podspec'
     pod 'Folly', :podspec => 'third-party-podspecs/Folly.podspec'
-    pod 'Sonar', :podspec => '../xplat/Sonar/SonarKitCPP.podspec'
+    pod 'Sonar', :podspec => '../xplat/Sonar/Sonar.podspec'
     pod 'CocoaAsyncSocket'
-    pod 'PeerTalk', :git => 'https://github.com/rsms/peertalk'
 end
diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock
new file mode 100644
index 000000000..1cf648505
--- /dev/null
+++ b/iOS/Podfile.lock
@@ -0,0 +1,76 @@
+PODS:
+  - boost-for-react-native (1.63.0)
+  - CocoaAsyncSocket (7.6.3)
+  - CocoaLibEvent (1.0.0)
+  - DoubleConversion (3.0.0)
+  - Folly (2018.05.28.00):
+    - boost-for-react-native
+    - CocoaLibEvent (~> 1.0)
+    - DoubleConversion
+    - glog
+    - OpenSSL-Static (= 1.0.2.c1)
+  - glog (0.3.5)
+  - OpenSSL-Static (1.0.2.c1)
+  - PeerTalk (1.0.0)
+  - RSocket (0.10.0):
+    - Folly
+  - Sonar (0.0.1):
+    - Folly
+    - RSocket
+
+DEPENDENCIES:
+  - CocoaAsyncSocket
+  - DoubleConversion (from `third-party-podspecs/DoubleConversion.podspec`)
+  - Folly (from `third-party-podspecs/Folly.podspec`)
+  - glog (from `third-party-podspecs/glog.podspec`)
+  - PeerTalk (from `third-party-podspecs/PeerTalk.podspec`)
+  - RSocket (from `third-party-podspecs/RSocket.podspec`)
+  - Sonar (from `../xplat/Sonar/Sonar.podspec`)
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - boost-for-react-native
+    - CocoaAsyncSocket
+    - CocoaLibEvent
+    - OpenSSL-Static
+
+EXTERNAL SOURCES:
+  DoubleConversion:
+    :podspec: third-party-podspecs/DoubleConversion.podspec
+  Folly:
+    :podspec: third-party-podspecs/Folly.podspec
+  glog:
+    :podspec: third-party-podspecs/glog.podspec
+  PeerTalk:
+    :podspec: third-party-podspecs/PeerTalk.podspec
+  RSocket:
+    :podspec: third-party-podspecs/RSocket.podspec
+  Sonar:
+    :podspec: "../xplat/Sonar/Sonar.podspec"
+
+CHECKOUT OPTIONS:
+  PeerTalk:
+    :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e
+    :git: https://github.com/rsms/PeerTalk.git
+  RSocket:
+    :commit: 11491fb22aaaf29b2702a1723561db51b314dd0f
+    :git: https://github.com/rsocket/rsocket-cpp.git
+  Sonar:
+    :commit: e6f1e3f018cb4eb8d1d1bfd09851a780f08656fd
+    :git: https://github.com/facebook/Sonar.git
+
+SPEC CHECKSUMS:
+  boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
+  CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987
+  CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
+  DoubleConversion: 9bd61b1134a393694e95e0950c5bf3f99534817f
+  Folly: 551752534f77d816ebf69195405d9d0fbd3efcc0
+  glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119
+  OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
+  PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504
+  RSocket: e9ee232080f995ba8f403ccf4cb61238a5646cb6
+  Sonar: 29d8fb9b010e56fa1358be996d68d4b436dd8c21
+
+PODFILE CHECKSUM: c3be9232e8e3190250398e3f9b310c5585d7d26b
+
+COCOAPODS: 1.5.2
diff --git a/iOS/Sample/Podfile b/iOS/Sample/Podfile
index 86f9d3e33..2e86e349a 100644
--- a/iOS/Sample/Podfile
+++ b/iOS/Sample/Podfile
@@ -7,19 +7,16 @@ swift_version = "4.1"
 target 'Sample' do
 
   pod 'RSocket', :podspec => '../third-party-podspecs/RSocket.podspec'
-  pod 'EasyWSClient', :podspec => '../third-party-podspecs/EasyWSClient.podspec'
   pod 'DoubleConversion', :podspec => '../third-party-podspecs/DoubleConversion.podspec'
   pod 'glog', :podspec => '../third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../third-party-podspecs/Folly.podspec'
-  # pod 'PeerTalk', :git => 'https://github.com/rsms/peertalk'
+  pod 'PeerTalk', :podspec => '../third-party-podspecs/PeerTalk.podspec'
   pod 'ComponentKit', :podspec => '../third-party-podspecs/ComponentKit.podspec'
   pod 'Yoga','~>1.8.1', :modular_headers => true
-  pod 'Sonar', :podspec => '../../xplat/Sonar/SonarKitCPP.podspec'
-  pod 'SonarKit', :podspec => '../SonarKit.podspec'
-  pod 'SonarKit/SonarKitLayoutComponentKitSupport', :podspec => '../SonarKit.podspec'
-  pod 'SonarKit/SKIOSNetworkPlugin', :podspec => '../SonarKit.podspec'
-  pod 'OpenSSL-Universal', '~> 1.0'
-  pod 'CocoaLibEvent', '~> 1.0'
+  pod 'Sonar', :podspec => '../../xplat/Sonar/Sonar.podspec'
+  pod 'SonarKit', :podspec => '../../SonarKit.podspec'
+  pod 'SonarKit/SonarKitLayoutComponentKitSupport', :podspec => '../../SonarKit.podspec'
+  pod 'SonarKit/SKIOSNetworkPlugin', :podspec => '../../SonarKit.podspec'
   post_install do |installer|
         installer.pods_project.targets.each do |target|
             if ['YogaKit'].include? target.name
diff --git a/iOS/Sample/Podfile.lock b/iOS/Sample/Podfile.lock
index 39f99c6ed..906438daa 100644
--- a/iOS/Sample/Podfile.lock
+++ b/iOS/Sample/Podfile.lock
@@ -5,58 +5,59 @@ PODS:
   - ComponentKit (0.21):
     - Yoga
   - DoubleConversion (3.0.0)
-  - EasyWSClient (1.0.0)
   - Folly (2018.05.28.00):
     - boost-for-react-native
+    - CocoaLibEvent (~> 1.0)
     - DoubleConversion
     - glog
+    - OpenSSL-Static (= 1.0.2.c1)
   - glog (0.3.5)
-  - OpenSSL-Universal (1.0.2.13)
-  - PeerTalk (0.0.2)
+  - OpenSSL-Static (1.0.2.c1)
+  - PeerTalk (1.0.0)
   - RSocket (0.10.0):
     - Folly
-  - Sonar (1.0.0):
+  - Sonar (0.0.1):
     - Folly
     - RSocket
-  - SonarKit (1.0.0):
+  - SonarKit (0.0.1):
     - CocoaAsyncSocket (~> 7.6)
     - Folly
-    - OpenSSL-Universal (~> 1.0)
+    - OpenSSL-Static (= 1.0.2.c1)
     - PeerTalk
     - Sonar
-    - SonarKit/SKIOSNetworkPlugin (= 1.0.0)
-    - SonarKit/SonarKitLayoutComponentKitSupport (= 1.0.0)
-    - SonarKit/SonarKitLayoutPlugin (= 1.0.0)
-    - SonarKit/SonarKitNetworkPlugin (= 1.0.0)
-    - SonarKit/SonarKitNetworkPlugin (= 1.0.0)
-  - SonarKit/SKIOSNetworkPlugin (1.0.0):
+    - SonarKit/SKIOSNetworkPlugin (= 0.0.1)
+    - SonarKit/SonarKitLayoutComponentKitSupport (= 0.0.1)
+    - SonarKit/SonarKitLayoutPlugin (= 0.0.1)
+    - SonarKit/SonarKitNetworkPlugin (= 0.0.1)
+    - SonarKit/SonarKitNetworkPlugin (= 0.0.1)
+  - SonarKit/SKIOSNetworkPlugin (0.0.1):
     - CocoaAsyncSocket (~> 7.6)
     - Folly
-    - OpenSSL-Universal (~> 1.0)
+    - OpenSSL-Static (= 1.0.2.c1)
     - PeerTalk
     - Sonar
     - SonarKit/SonarKitNetworkPlugin
-  - SonarKit/SonarKitLayoutComponentKitSupport (1.0.0):
+  - SonarKit/SonarKitLayoutComponentKitSupport (0.0.1):
     - CocoaAsyncSocket (~> 7.6)
     - ComponentKit
     - Folly
-    - OpenSSL-Universal (~> 1.0)
+    - OpenSSL-Static (= 1.0.2.c1)
     - PeerTalk
     - Sonar
     - SonarKit/SonarKitLayoutPlugin
-    - Yoga (= 1.8.1)
-  - SonarKit/SonarKitLayoutPlugin (1.0.0):
+    - Yoga (~> 1.8)
+  - SonarKit/SonarKitLayoutPlugin (0.0.1):
     - CocoaAsyncSocket (~> 7.6)
     - Folly
-    - OpenSSL-Universal (~> 1.0)
+    - OpenSSL-Static (= 1.0.2.c1)
     - PeerTalk
     - Sonar
-    - Yoga (= 1.8.1)
+    - Yoga (~> 1.8)
     - YogaKit (= 1.8.1)
-  - SonarKit/SonarKitNetworkPlugin (1.0.0):
+  - SonarKit/SonarKitNetworkPlugin (0.0.1):
     - CocoaAsyncSocket (~> 7.6)
     - Folly
-    - OpenSSL-Universal (~> 1.0)
+    - OpenSSL-Static (= 1.0.2.c1)
     - PeerTalk
     - Sonar
   - Yoga (1.8.1)
@@ -64,19 +65,16 @@ PODS:
     - Yoga (~> 1.8.1)
 
 DEPENDENCIES:
-  - CocoaLibEvent (~> 1.0)
   - ComponentKit (from `../third-party-podspecs/ComponentKit.podspec`)
   - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`)
-  - EasyWSClient (from `../third-party-podspecs/EasyWSClient.podspec`)
   - Folly (from `../third-party-podspecs/Folly.podspec`)
   - glog (from `../third-party-podspecs/glog.podspec`)
-  - OpenSSL-Universal (~> 1.0)
-  - PeerTalk (from `https://github.com/rsms/peertalk`)
+  - PeerTalk (from `../third-party-podspecs/PeerTalk.podspec`)
   - RSocket (from `../third-party-podspecs/RSocket.podspec`)
-  - Sonar (from `../../xplat/Sonar/SonarKitCPP.podspec`)
-  - SonarKit (from `../SonarKit.podspec`)
-  - SonarKit/SKIOSNetworkPlugin (from `../SonarKit.podspec`)
-  - SonarKit/SonarKitLayoutComponentKitSupport (from `../SonarKit.podspec`)
+  - Sonar (from `../../xplat/Sonar/Sonar.podspec`)
+  - SonarKit (from `../../SonarKit.podspec`)
+  - SonarKit/SKIOSNetworkPlugin (from `../../SonarKit.podspec`)
+  - SonarKit/SonarKitLayoutComponentKitSupport (from `../../SonarKit.podspec`)
   - Yoga (~> 1.8.1)
 
 SPEC REPOS:
@@ -84,7 +82,7 @@ SPEC REPOS:
     - boost-for-react-native
     - CocoaAsyncSocket
     - CocoaLibEvent
-    - OpenSSL-Universal
+    - OpenSSL-Static
     - Yoga
     - YogaKit
 
@@ -93,39 +91,34 @@ EXTERNAL SOURCES:
     :podspec: "../third-party-podspecs/ComponentKit.podspec"
   DoubleConversion:
     :podspec: "../third-party-podspecs/DoubleConversion.podspec"
-  EasyWSClient:
-    :podspec: "../third-party-podspecs/EasyWSClient.podspec"
   Folly:
     :podspec: "../third-party-podspecs/Folly.podspec"
   glog:
     :podspec: "../third-party-podspecs/glog.podspec"
   PeerTalk:
-    :git: https://github.com/rsms/peertalk
+    :podspec: "../third-party-podspecs/PeerTalk.podspec"
   RSocket:
     :podspec: "../third-party-podspecs/RSocket.podspec"
   Sonar:
-    :podspec: "../../xplat/Sonar/SonarKitCPP.podspec"
+    :podspec: "../../xplat/Sonar/Sonar.podspec"
   SonarKit:
-    :podspec: "../SonarKit.podspec"
+    :podspec: "../../SonarKit.podspec"
 
 CHECKOUT OPTIONS:
   ComponentKit:
-    :commit: 663f97614c4b398b029bbc0f6b31330e426c6aa7
+    :commit: 73acd7995610ad6b009a9a74b8290a54dab7c716
     :git: https://github.com/facebook/ComponentKit.git
-  EasyWSClient:
-    :commit: 9b87dc488048900a8cd684f51ddc98143682dbc3
-    :git: https://github.com/dhbaird/easywsclient.git
   PeerTalk:
     :commit: 588303b43efa5082d654b6f75d1b84a6ba4b5b9e
-    :git: https://github.com/rsms/peertalk
+    :git: https://github.com/rsms/PeerTalk.git
   RSocket:
-    :commit: 804eabc02afdec8756a16517e4513ec9301a3315
+    :commit: 89b368ce04d9b319593815c6a69ad0a681596146
     :git: https://github.com/rsocket/rsocket-cpp.git
   Sonar:
-    :commit: 9a6f612923b435846c62a96b9ef33f9128b7e9ae
+    :commit: 03ffb3640a7ee21620fc62f9dcccb13b2f5af03c
     :git: https://github.com/facebook/Sonar.git
   SonarKit:
-    :commit: 9a6f612923b435846c62a96b9ef33f9128b7e9ae
+    :commit: 03ffb3640a7ee21620fc62f9dcccb13b2f5af03c
     :git: https://github.com/facebook/Sonar.git
 
 SPEC CHECKSUMS:
@@ -133,18 +126,17 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   ComponentKit: 7bd0ad508946aeb68dd52ed8739ced9846ff3671
-  DoubleConversion: 310ccd7cdf00175c32883664f84fe026025604df
-  EasyWSClient: 7ec8effe7d86f6061a47d19a55355769c9edfd2f
-  Folly: 6a1cc25ddcc61d794309b9eb69e1e7c5343f4a98
-  glog: f175af2df1f453be65bd355b287a07c842927a99
-  OpenSSL-Universal: 401888162f11c33ebbd46f782d9229da35c61327
-  PeerTalk: f5389c286e4d477e59b73dfbf25c5c70a2464761
-  RSocket: 0b49004a22945bbf00a5760d9fd9e7e57be5478d
-  Sonar: 059d1cf14e9cfa67a7103c666f875e62e8c285d7
-  SonarKit: eb72de3f8ec9fa7a2610b6ef1f6a480b99317fdc
+  DoubleConversion: 9bd61b1134a393694e95e0950c5bf3f99534817f
+  Folly: 551752534f77d816ebf69195405d9d0fbd3efcc0
+  glog: fdb5d40eb83acd6a4d5d61d95ecc583f5970a119
+  OpenSSL-Static: bd17e34564a8591ad76b740318683a6caa19a13e
+  PeerTalk: aadc42bc7d7f19e89f817b59ef8196305a711504
+  RSocket: e9ee232080f995ba8f403ccf4cb61238a5646cb6
+  Sonar: a7d8648c0536858abf352d481d57957adf01859b
+  SonarKit: 926549191a4b239da9274539d8ff28b761b4b1f3
   Yoga: e6f1fed82138c17da5332e15e5770abf0e9cc386
   YogaKit: bb90d11e297e06abef7e0cfb20e035a6bd00cdc4
 
-PODFILE CHECKSUM: 1904a24f0191377e3743dc726e5d7e52455b7ff4
+PODFILE CHECKSUM: 7c2600fc131a2b041c967e8d6ffc2bd1a0383733
 
 COCOAPODS: 1.5.2
diff --git a/iOS/Sample/Sample.xcodeproj/project.pbxproj b/iOS/Sample/Sample.xcodeproj/project.pbxproj
index 20abb82a8..d1b532e26 100644
--- a/iOS/Sample/Sample.xcodeproj/project.pbxproj
+++ b/iOS/Sample/Sample.xcodeproj/project.pbxproj
@@ -333,7 +333,6 @@
 					"\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"",
 					"\"${PODS_ROOT}/Headers/Public/ComponentKit\"",
 					"\"${PODS_ROOT}/Headers/Public/DoubleConversion\"",
-					"\"${PODS_ROOT}/Headers/Public/EasyWSClient\"",
 					"\"${PODS_ROOT}/Headers/Public/Folly\"",
 					"\"${PODS_ROOT}/Headers/Public/PeerTalk\"",
 					"\"${PODS_ROOT}/Headers/Public/Sonar\"/**",
@@ -342,7 +341,6 @@
 					"\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"",
 					"\"${PODS_ROOT}/Headers/Public/glog\"/**",
 					"\"${PODS_ROOT}/SonarKit\"/**",
-					"/usr/local/include\\ /usr/local/Cellar/openssl/1.0.2o_1/include",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.3;
@@ -362,7 +360,6 @@
 					"-l\"CocoaAsyncSocket\"",
 					"-l\"ComponentKit\"",
 					"-l\"DoubleConversion\"",
-					"-l\"EasyWSClient\"",
 					"-l\"Folly\"",
 					"-l\"PeerTalk\"",
 					"-l\"Sonar\"",
@@ -401,7 +398,6 @@
 					"\"${PODS_ROOT}/Headers/Public/CocoaAsyncSocket\"",
 					"\"${PODS_ROOT}/Headers/Public/ComponentKit\"",
 					"\"${PODS_ROOT}/Headers/Public/DoubleConversion\"",
-					"\"${PODS_ROOT}/Headers/Public/EasyWSClient\"",
 					"\"${PODS_ROOT}/Headers/Public/Folly\"",
 					"\"${PODS_ROOT}/Headers/Public/PeerTalk\"",
 					"\"${PODS_ROOT}/Headers/Public/Sonar\"/**",
@@ -410,7 +406,6 @@
 					"\"${PODS_ROOT}/Headers/Public/boost-for-react-native\"",
 					"\"${PODS_ROOT}/Headers/Public/glog\"/**",
 					"\"${PODS_ROOT}/SonarKit\"/**",
-					"/usr/local/include\\ /usr/local/Cellar/openssl/1.0.2o_1/include",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.3;
@@ -430,7 +425,6 @@
 					"-l\"CocoaAsyncSocket\"",
 					"-l\"ComponentKit\"",
 					"-l\"DoubleConversion\"",
-					"-l\"EasyWSClient\"",
 					"-l\"Folly\"",
 					"-l\"PeerTalk\"",
 					"-l\"Sonar\"",
diff --git a/iOS/SonarKit.xcodeproj/project.pbxproj b/iOS/SonarKit.xcodeproj/project.pbxproj
index dfc559de8..cd0b7e5c7 100644
--- a/iOS/SonarKit.xcodeproj/project.pbxproj
+++ b/iOS/SonarKit.xcodeproj/project.pbxproj
@@ -12,7 +12,8 @@
 		53D19A2F20A4BABA00A371E3 /* SKPortForwardingServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 53D19A1D20A4BABA00A371E3 /* SKPortForwardingServer.m */; };
 		53D19A3020A4BABA00A371E3 /* SonarCppBridgingConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D19A1F20A4BABA00A371E3 /* SonarCppBridgingConnection.mm */; };
 		53D19A3320A4BABA00A371E3 /* SonarCppBridgingResponder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D19A2220A4BABA00A371E3 /* SonarCppBridgingResponder.mm */; };
-		53D4C4FC20A5B20000613A96 /* SKUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D4C4FA20A5B20000613A96 /* SKUtils.mm */; };
+		53D3BBD820C629230022EB45 /* FBCxxFollyDynamicConvert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53D3BBD620C629230022EB45 /* FBCxxFollyDynamicConvert.mm */; };
+		53D3BBD920C629230022EB45 /* FBCxxFollyDynamicConvert.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D3BBD720C629230022EB45 /* FBCxxFollyDynamicConvert.h */; };
 		53D4C50620A5B72800613A96 /* SonarCppWrapperPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A2020A4BABA00A371E3 /* SonarCppWrapperPlugin.h */; };
 		53D4C50720A5B72800613A96 /* SonarCppBridgingConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A2120A4BABA00A371E3 /* SonarCppBridgingConnection.h */; };
 		53D4C50820A5B72800613A96 /* SonarCppBridgingResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 53D19A2320A4BABA00A371E3 /* SonarCppBridgingResponder.h */; };
@@ -47,6 +48,8 @@
 		53D19A2120A4BABA00A371E3 /* SonarCppBridgingConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonarCppBridgingConnection.h; sourceTree = "<group>"; };
 		53D19A2220A4BABA00A371E3 /* SonarCppBridgingResponder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SonarCppBridgingResponder.mm; sourceTree = "<group>"; };
 		53D19A2320A4BABA00A371E3 /* SonarCppBridgingResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SonarCppBridgingResponder.h; sourceTree = "<group>"; };
+		53D3BBD620C629230022EB45 /* FBCxxFollyDynamicConvert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = FBCxxFollyDynamicConvert.mm; sourceTree = "<group>"; };
+		53D3BBD720C629230022EB45 /* FBCxxFollyDynamicConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBCxxFollyDynamicConvert.h; sourceTree = "<group>"; };
 		53D4C4F920A5B20000613A96 /* SKUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SKUtils.h; path = SonarKit/SKUtils.h; sourceTree = SOURCE_ROOT; };
 		53D4C4FA20A5B20000613A96 /* SKUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SKUtils.mm; path = SonarKit/SKUtils.mm; sourceTree = SOURCE_ROOT; };
 		53D4C51120A5B89900613A96 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -97,6 +100,7 @@
 		53D19A0720A4BA3600A371E3 /* SonarKit */ = {
 			isa = PBXGroup;
 			children = (
+				53D3BBD520C629230022EB45 /* FBCxxUtils */,
 				53D19A1E20A4BABA00A371E3 /* CppBridge */,
 				53D19A1020A4BAB900A371E3 /* SKMacros.h */,
 				53D19A1120A4BAB900A371E3 /* SonarClient.h */,
@@ -143,6 +147,15 @@
 			path = CppBridge;
 			sourceTree = "<group>";
 		};
+		53D3BBD520C629230022EB45 /* FBCxxUtils */ = {
+			isa = PBXGroup;
+			children = (
+				53D3BBD620C629230022EB45 /* FBCxxFollyDynamicConvert.mm */,
+				53D3BBD720C629230022EB45 /* FBCxxFollyDynamicConvert.h */,
+			);
+			path = FBCxxUtils;
+			sourceTree = "<group>";
+		};
 		716CE00064F59AEDC5DB6AA8 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -166,6 +179,7 @@
 				53D4C50820A5B72800613A96 /* SonarCppBridgingResponder.h in Headers */,
 				53D4C50920A5B72800613A96 /* SKMacros.h in Headers */,
 				53D4C50A20A5B72800613A96 /* SonarClient.h in Headers */,
+				53D3BBD920C629230022EB45 /* FBCxxFollyDynamicConvert.h in Headers */,
 				53D4C50C20A5B72800613A96 /* SonarPlugin.h in Headers */,
 				53D4C50E20A5B72800613A96 /* SKUtils.h in Headers */,
 				53D4C50F20A5B72800613A96 /* SKPortForwardingServer.h in Headers */,
@@ -263,8 +277,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				53D3BBD820C629230022EB45 /* FBCxxFollyDynamicConvert.mm in Sources */,
 				53D19A3320A4BABA00A371E3 /* SonarCppBridgingResponder.mm in Sources */,
-				53D4C4FC20A5B20000613A96 /* SKUtils.mm in Sources */,
 				53D19A2F20A4BABA00A371E3 /* SKPortForwardingServer.m in Sources */,
 				53D19A3020A4BABA00A371E3 /* SonarCppBridgingConnection.mm in Sources */,
 				53D19A2620A4BABA00A371E3 /* SonarClient.mm in Sources */,
diff --git a/iOS/scripts/ios-configure-glog.sh b/iOS/scripts/ios-configure-glog.sh
deleted file mode 100644
index e6a15febb..000000000
--- a/iOS/scripts/ios-configure-glog.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-set -e
-
-PLATFORM_NAME="${PLATFORM_NAME:-iphoneos}"
-CURRENT_ARCH="${CURRENT_ARCH:-armv7}"
-
-export CC="$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)"
-export CXX="$CC"
-
-# Remove automake symlink if it exists
-if [ -h "test-driver" ]; then
-    rm test-driver
-fi
-
-./configure --host arm-apple-darwin
-
-# Fix build for tvOS
-cat << EOF >> src/config.h
-
-/* Add in so we have Apple Target Conditionals */
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#include <Availability.h>
-#endif
-
-/* Special configuration for AppleTVOS */
-#if TARGET_OS_TV
-#undef HAVE_SYSCALL_H
-#undef HAVE_SYS_SYSCALL_H
-#undef OS_MACOSX
-#endif
-
-/* Special configuration for ucontext */
-#undef HAVE_UCONTEXT_H
-#undef PC_FROM_UCONTEXT
-#if defined(__x86_64__)
-#define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip
-#elif defined(__i386__)
-#define PC_FROM_UCONTEXT uc_mcontext->__ss.__eip
-#endif
-EOF
diff --git a/iOS/third-party-podspecs/EasyWSClient.podspec b/iOS/third-party-podspecs/EasyWSClient.podspec
deleted file mode 100644
index 90cfe2fc8..000000000
--- a/iOS/third-party-podspecs/EasyWSClient.podspec
+++ /dev/null
@@ -1,17 +0,0 @@
-Pod::Spec.new do |spec|
-  spec.name = 'EasyWSClient'
-  spec.version = '1.0.0'
-  spec.license = { :type => 'MIT' }
-  spec.homepage = 'https://github.com/google/double-conversion'
-  spec.summary = 'Easywsclient is an easy and powerful WebSocket client to get your C++ code connected to a web stack right away.'
-  spec.authors = 'David Baird'
-  # spec.prepare_command = 'mv src double-conversion'
-  spec.source = { :git => 'https://github.com/dhbaird/easywsclient.git', :branch => 'master'}
-  spec.module_name = 'EasyWSClient'
-  spec.source_files = '*.{hpp,cpp}'
-  spec.libraries = "stdc++"
-  spec.compiler_flags = '-std=c++1y'
-  # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "8.0"}
-
-end
diff --git a/iOS/third-party-podspecs/Folly.podspec b/iOS/third-party-podspecs/Folly.podspec
index caa8578ea..1623e2bfd 100755
--- a/iOS/third-party-podspecs/Folly.podspec
+++ b/iOS/third-party-podspecs/Folly.podspec
@@ -11,6 +11,8 @@ Pod::Spec.new do |spec|
   spec.dependency 'boost-for-react-native'
   spec.dependency 'DoubleConversion'
   spec.dependency 'glog'
+  spec.dependency 'OpenSSL-Static', '1.0.2.c1'
+  spec.dependency 'CocoaLibEvent', '~> 1.0'
   spec.compiler_flags = '-DFOLLY_HAVE_PTHREAD=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_LIBGFLAGS=0 -DFOLLY_HAVE_LIBJEMALLOC=0 -DFOLLY_HAVE_PREADV=0 -DFOLLY_HAVE_PWRITEV=0 -DFOLLY_HAVE_TFO=0 -DFOLLY_USE_SYMBOLIZER=0  -frtti
     -fexceptions
     -std=c++14
@@ -109,7 +111,7 @@ Pod::Spec.new do |spec|
 
   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++11",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" }
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\"" }
 
   # Pinning to the same version as React.podspec.
   spec.platforms = { :ios => "8.0"}
diff --git a/iOS/third-party-podspecs/PeerTalk.podspec b/iOS/third-party-podspecs/PeerTalk.podspec
new file mode 100644
index 000000000..eeac92540
--- /dev/null
+++ b/iOS/third-party-podspecs/PeerTalk.podspec
@@ -0,0 +1,19 @@
+Pod::Spec.new do |spec|
+    spec.name     = 'PeerTalk'
+    spec.version  = '1.0.0'
+    spec.license  = { :type => 'MIT' }
+    spec.homepage = 'http://rsms.me/peertalk/'
+    spec.authors  = { 'Rasmus Andersson' => 'rasmus@notion.se' }
+    spec.summary  = 'iOS and OS X Cocoa library for communicating over USB and TCP.'
+
+    spec.source   = { :git => "https://github.com/rsms/PeerTalk.git", :branch => 'master' }
+    spec.source_files = 'peertalk/*.{h,m}'
+    spec.requires_arc = true
+    spec.ios.deployment_target = '8.4'
+    spec.osx.deployment_target = '10.10'
+
+   spec.description = "                    PeerTalk is a iOS and OS X Cocoa library for communicating over USB and TCP.\n\n                    Highlights:\n\n                    * Provides you with USB device attach/detach events and attached device's info\n                    * Can connect to TCP services on supported attached devices (e.g. an iPhone), bridging the communication over USB transport\n                    * Offers a higher-level API (PTChannel and PTProtocol) for convenient implementations.\n                    * Tested and designed for libdispatch (aka Grand Central Dispatch).\n"
+   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
+                                "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/**" }
+
+end
diff --git a/iOS/third-party-podspecs/RSocket.podspec b/iOS/third-party-podspecs/RSocket.podspec
index 8cb8502fa..ac127e1aa 100644
--- a/iOS/third-party-podspecs/RSocket.podspec
+++ b/iOS/third-party-podspecs/RSocket.podspec
@@ -43,11 +43,11 @@ Pod::Spec.new do |spec|
                         'yarpl/utils/*.h',
                         'yarpl/*.h',
                         '**/*.h'
-  spec.header_mappings_dir = './*'
-  spec.header_dir = './*'
+  spec.header_mappings_dir = 'rsocket'
+  spec.header_dir = 'rsocket'
   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/**  \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/DoubleConversion\"/**" }
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\"/** \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/DoubleConversion\"/**" }
   spec.platforms = { :ios => "8.0" }
 
 end
diff --git a/iOS/third-party-podspecs/glog.podspec b/iOS/third-party-podspecs/glog.podspec
index e0dbd2f2d..3524ba47e 100755
--- a/iOS/third-party-podspecs/glog.podspec
+++ b/iOS/third-party-podspecs/glog.podspec
@@ -5,7 +5,7 @@ Pod::Spec.new do |spec|
   spec.homepage = 'https://github.com/google/glog'
   spec.summary = 'Google logging module'
   spec.authors = 'Google'
-  spec.prepare_command = File.read("../scripts/ios-configure-glog.sh")
+  spec.prepare_command = "#!/bin/bash\nset -e\n\nPLATFORM_NAME=\"${PLATFORM_NAME:-iphoneos}\"\nCURRENT_ARCH=\"${CURRENT_ARCH:-armv7}\"\n\nexport CC=\"$(xcrun -find -sdk $PLATFORM_NAME cc) -arch $CURRENT_ARCH -isysroot $(xcrun -sdk $PLATFORM_NAME --show-sdk-path)\"\nexport CXX=\"$CC\"\n\n# Remove automake symlink if it exists\nif [ -h \"test-driver\" ]; then\n    rm test-driver\nfi\n\n./configure --host arm-apple-darwin\n\n# Fix build for tvOS\ncat << EOF >> src/config.h\n\n/* Add in so we have Apple Target Conditionals */\n#ifdef __APPLE__\n#include <TargetConditionals.h>\n#include <Availability.h>\n#endif\n\n/* Special configuration for AppleTVOS */\n#if TARGET_OS_TV\n#undef HAVE_SYSCALL_H\n#undef HAVE_SYS_SYSCALL_H\n#undef OS_MACOSX\n#endif\n\n/* Special configuration for ucontext */\n#undef HAVE_UCONTEXT_H\n#undef PC_FROM_UCONTEXT\n#if defined(__x86_64__)\n#define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip\n#elif defined(__i386__)\n#define PC_FROM_UCONTEXT uc_mcontext->__ss.__eip\n#endif\nEOF"
   spec.source = { :git => 'https://github.com/google/glog.git',
                   :tag => "v#{spec.version}" }
   spec.module_name = 'glog'
diff --git a/xplat/Sonar/SonarKitCPP.podspec b/xplat/Sonar/Sonar.podspec
similarity index 81%
rename from xplat/Sonar/SonarKitCPP.podspec
rename to xplat/Sonar/Sonar.podspec
index 9c9fc67d3..e32744c57 100644
--- a/xplat/Sonar/SonarKitCPP.podspec
+++ b/xplat/Sonar/Sonar.podspec
@@ -5,7 +5,6 @@ Pod::Spec.new do |spec|
   spec.homepage = 'https://github.com/facebook/sonar'
   spec.summary = 'SonarKit core cpp code with network implementation'
   spec.authors = 'Facebook'
-  # spec.prepare_command = 'mv src double-conversion'
   spec.source = { :git => 'https://github.com/facebook/Sonar.git',
                   :branch => 'master' }
   spec.module_name = 'Sonar'
@@ -20,5 +19,5 @@ Pod::Spec.new do |spec|
   spec.platforms = { :ios => "8.0" }
   spec.pod_target_xcconfig = { "USE_HEADERMAP" => "NO",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"/usr/local/include\" \"/usr/local/Cellar/openssl/1.0.2o_1/include\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" }
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/RSocket\" \"$(PODS_ROOT)/DoubleConversion\"" }
 end