diff --git a/Package.swift b/Package.swift
index c7f6e8ee..2acf2a42 100644
--- a/Package.swift
+++ b/Package.swift
@@ -372,7 +372,6 @@ let package = Package(
         "connections/clients/windows",
         "docs",
         "internal/platform/implementation/g3",
-        "internal/platform/implementation/ios/Example",
         "internal/platform/implementation/ios/Tests",
         "internal/platform/implementation/windows",
         "third_party",
@@ -381,6 +380,7 @@ let package = Package(
         "README.md",
         "WORKSPACE",
         // build files
+        "connections/clients/ios/BUILD",
         "connections/implementation/proto/BUILD",
         "connections/implementation/proto/CMakeLists.txt",
         "connections/implementation/mediums/ble_v2/BUILD",
@@ -391,9 +391,7 @@ let package = Package(
         "connections/BUILD",
         "internal/proto/analytics/BUILD",
         "internal/platform/implementation/shared/BUILD",
-        "internal/platform/implementation/ios/Source/Platform/BUILD",
-        "internal/platform/implementation/ios/Source/Shared/BUILD",
-        "internal/platform/implementation/ios/Source/Mediums/BUILD",
+        "internal/platform/implementation/ios/Mediums/BUILD",
         "internal/platform/implementation/ios/Tests/BUILD",
         "internal/platform/implementation/ios/BUILD",
         "internal/platform/implementation/BUILD",
@@ -468,12 +466,12 @@ let package = Package(
         "internal/platform/ble_test.cc",
         "internal/platform/ble_v2_test.cc",
         "internal/platform/prng_test.cc",
+        "internal/platform/implementation/ios/count_down_latch_test.cc",
+        "internal/platform/implementation/ios/condition_variable_test.cc",
+        "internal/platform/implementation/ios/mutex_test.cc",
+        "internal/platform/implementation/ios/atomic_boolean_test.cc",
+        "internal/platform/implementation/ios/atomic_uint32_test.cc",
         "internal/platform/implementation/shared/file_test.cc",
-        "internal/platform/implementation/ios/Source/Platform/count_down_latch_test.cc",
-        "internal/platform/implementation/ios/Source/Platform/condition_variable_test.cc",
-        "internal/platform/implementation/ios/Source/Platform/mutex_test.cc",
-        "internal/platform/implementation/ios/Source/Platform/atomic_boolean_test.cc",
-        "internal/platform/implementation/ios/Source/Platform/atomic_uint32_test.cc",
         "internal/platform/atomic_boolean_test.cc",
         "internal/platform/exception_test.cc",
         "internal/platform/error_code_recorder_test.cc",
@@ -512,7 +510,7 @@ let package = Package(
         "internal",
         "proto",
       ],
-      publicHeadersPath: "internal/platform/implementation/ios/Source/Public",
+      publicHeadersPath: "connections/clients/ios/Public",
       cSettings: [
         .headerSearchPath("./"),
         .headerSearchPath("compiled_proto/"),
diff --git a/connections/clients/ios/BUILD b/connections/clients/ios/BUILD
new file mode 100644
index 00000000..5fa39aaf
--- /dev/null
+++ b/connections/clients/ios/BUILD
@@ -0,0 +1,70 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+load("//tools/build_defs/apple:ios.bzl", "ios_static_framework")
+
+licenses(["notice"])
+
+package(default_visibility = ["//visibility:public"])
+
+objc_library(
+    name = "Connections",
+    srcs = [
+        "Internal/GNCAdvertiser.mm",
+        "Internal/GNCCore.mm",
+        "Internal/GNCCoreConnection.mm",
+        "Internal/GNCDiscoverer.mm",
+        "Internal/GNCPayload.mm",
+        "Internal/GNCPayloadListener.mm",
+        "Internal/GNCUtils.mm",
+    ],
+    hdrs = [
+        "Internal/GNCCore.h",
+        "Internal/GNCCoreConnection.h",
+        "Internal/GNCPayload+Internal.h",
+        "Internal/GNCPayloadListener.h",
+        "Internal/GNCUtils.h",
+        "Public/NearbyConnections/GNCAdvertiser.h",
+        "Public/NearbyConnections/GNCConnection.h",
+        "Public/NearbyConnections/GNCConnections.h",
+        "Public/NearbyConnections/GNCDiscoverer.h",
+        "Public/NearbyConnections/GNCPayload.h",
+    ],
+    features = ["-layering_check"],
+    deps = [
+        "//connections:core",
+        "//connections:core_types",
+        "//internal/platform/implementation/ios:Platform",
+        "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger",
+        "@com_google_absl//absl/functional:bind_front",
+    ],
+)
+
+MIN_IOS_VERSION = "12.0"
+
+HDRS_POD = [
+    "GNCAdvertiser.h",
+    "GNCConnection.h",
+    "GNCDiscoverer.h",
+    "GNCPayload.h",
+]
+
+ios_static_framework(
+    name = "NearbyConnections_framework",
+    hdrs = HDRS_POD,
+    bundle_name = "NearbyConnections",
+    minimum_os_version = MIN_IOS_VERSION,
+    deps = [
+        ":Connections",
+    ],
+)
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCAdvertiser.mm b/connections/clients/ios/Internal/GNCAdvertiser.mm
similarity index 95%
rename from internal/platform/implementation/ios/Source/Internal/GNCAdvertiser.mm
rename to connections/clients/ios/Internal/GNCAdvertiser.mm
index 38b220ca..34b20b06 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCAdvertiser.mm
+++ b/connections/clients/ios/Internal/GNCAdvertiser.mm
@@ -12,23 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCAdvertiser.h"
 
 #include <string>
 
 #include "absl/functional/bind_front.h"
 #include "connections/advertising_options.h"
+#import "connections/clients/ios/Internal/GNCCore.h"
+#import "connections/clients/ios/Internal/GNCCoreConnection.h"
+#import "connections/clients/ios/Internal/GNCPayloadListener.h"
+#import "connections/clients/ios/Internal/GNCUtils.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
 #include "connections/core.h"
 #include "connections/listeners.h"
 #include "connections/params.h"
 #include "connections/status.h"
 #include "internal/platform/byte_array.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCCore.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCUtils.h"
-#import "internal/platform/implementation/ios/Source/Platform/utils.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
+#import "internal/platform/implementation/ios/utils.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCCore.h b/connections/clients/ios/Internal/GNCCore.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Internal/GNCCore.h
rename to connections/clients/ios/Internal/GNCCore.h
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCCore.mm b/connections/clients/ios/Internal/GNCCore.mm
similarity index 96%
rename from internal/platform/implementation/ios/Source/Internal/GNCCore.mm
rename to connections/clients/ios/Internal/GNCCore.mm
index ea7d50a7..5494da91 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCCore.mm
+++ b/connections/clients/ios/Internal/GNCCore.mm
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Internal/GNCCore.h"
+#import "connections/clients/ios/Internal/GNCCore.h"
 
 #include <utility>
 
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h b/connections/clients/ios/Internal/GNCCoreConnection.h
similarity index 90%
rename from internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h
rename to connections/clients/ios/Internal/GNCCoreConnection.h
index aa58f762..465287ca 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h
+++ b/connections/clients/ios/Internal/GNCCoreConnection.h
@@ -14,8 +14,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import "internal/platform/implementation/ios/Source/Internal/GNCCore.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
+#import "connections/clients/ios/Internal/GNCCore.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.mm b/connections/clients/ios/Internal/GNCCoreConnection.mm
similarity index 95%
rename from internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.mm
rename to connections/clients/ios/Internal/GNCCoreConnection.mm
index eb138152..1e638784 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.mm
+++ b/connections/clients/ios/Internal/GNCCoreConnection.mm
@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import "connections/clients/ios/Internal/GNCCoreConnection.h"
+
 #include <utility>
 
-#import "internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h"
-
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCPayload.h"
 #include "connections/core.h"
 #include "connections/payload.h"
 #include "internal/platform/exception.h"
 #include "internal/platform/file.h"
 #include "internal/platform/implementation/input_file.h"
-#import "internal/platform/implementation/ios/Source/Platform/utils.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h"
+#import "internal/platform/implementation/ios/utils.h"
 #include "internal/platform/input_stream.h"
 #include "internal/platform/payload_id.h"
 
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCDiscoverer.mm b/connections/clients/ios/Internal/GNCDiscoverer.mm
similarity index 96%
rename from internal/platform/implementation/ios/Source/Internal/GNCDiscoverer.mm
rename to connections/clients/ios/Internal/GNCDiscoverer.mm
index 0312d968..a19963de 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCDiscoverer.mm
+++ b/connections/clients/ios/Internal/GNCDiscoverer.mm
@@ -12,24 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCDiscoverer.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCDiscoverer.h"
 
 #include <string>
 #include <utility>
 
 #include "absl/functional/bind_front.h"
+#import "connections/clients/ios/Internal/GNCCore.h"
+#import "connections/clients/ios/Internal/GNCCoreConnection.h"
+#import "connections/clients/ios/Internal/GNCPayloadListener.h"
+#import "connections/clients/ios/Internal/GNCUtils.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
 #include "connections/connection_options.h"
 #include "connections/core.h"
 #include "connections/discovery_options.h"
 #include "connections/listeners.h"
 #include "connections/status.h"
 #include "internal/platform/byte_array.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCCore.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCUtils.h"
-#import "internal/platform/implementation/ios/Source/Platform/utils.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
+#import "internal/platform/implementation/ios/utils.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h b/connections/clients/ios/Internal/GNCPayload+Internal.h
similarity index 92%
rename from internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h
rename to connections/clients/ios/Internal/GNCPayload+Internal.h
index 87b9ce57..e7882697 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h
+++ b/connections/clients/ios/Internal/GNCPayload+Internal.h
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCPayload.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -21,13 +21,11 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)payloadWithBytes:(NSData *)bytes identifier:(int64_t)identifier;
 @end
 
-
 /** This category adds the ability to specify a payload ID. */
 @interface GNCStreamPayload (Internal)
 + (instancetype)payloadWithStream:(NSInputStream *)stream identifier:(int64_t)identifier;
 @end
 
-
 /** This category adds the ability to specify a payload ID. */
 @interface GNCFilePayload (Internal)
 + (instancetype)payloadWithFileURL:(NSURL *)fileURL identifier:(int64_t)identifier;
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayload.mm b/connections/clients/ios/Internal/GNCPayload.mm
similarity index 96%
rename from internal/platform/implementation/ios/Source/Internal/GNCPayload.mm
rename to connections/clients/ios/Internal/GNCPayload.mm
index 47ee7228..3dd79528 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCPayload.mm
+++ b/connections/clients/ios/Internal/GNCPayload.mm
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCPayload.h"
 
 #include "connections/payload.h"
 #include "internal/platform/payload_id.h"
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h b/connections/clients/ios/Internal/GNCPayloadListener.h
similarity index 82%
rename from internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h
rename to connections/clients/ios/Internal/GNCPayloadListener.h
index 9545d791..9a6ccfd0 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h
+++ b/connections/clients/ios/Internal/GNCPayloadListener.h
@@ -14,8 +14,10 @@
 
 #import <Foundation/Foundation.h>
 
-#import "internal/platform/implementation/ios/Source/Internal/GNCCore.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
+#include <string>
+
+#import "connections/clients/ios/Internal/GNCCore.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -38,9 +40,8 @@ class GNCPayloadListener : public PayloadListener {
                      GNCPayloadsProvider payloadsProvider)
       : core_(core), handlers_provider_(handlersProvider), payloads_provider_(payloadsProvider) {}
 
-  void OnPayload(const std::string& endpoint_id, Payload payload);
-  void OnPayloadProgress(const std::string& endpoint_id,
-                         const PayloadProgressInfo& info);
+  void OnPayload(const std::string &endpoint_id, Payload payload);
+  void OnPayloadProgress(const std::string &endpoint_id, const PayloadProgressInfo &info);
 
  private:
   GNCCore *core_;
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.mm b/connections/clients/ios/Internal/GNCPayloadListener.mm
similarity index 93%
rename from internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.mm
rename to connections/clients/ios/Internal/GNCPayloadListener.mm
index a9a88a6f..128375b4 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.mm
+++ b/connections/clients/ios/Internal/GNCPayloadListener.mm
@@ -12,22 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Internal/GNCPayloadListener.h"
+#import "connections/clients/ios/Internal/GNCPayloadListener.h"
 
 #include <string>
 
+#import "connections/clients/ios/Internal/GNCCore.h"
+#import "connections/clients/ios/Internal/GNCCoreConnection.h"
+#import "connections/clients/ios/Internal/GNCPayload+Internal.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCPayload.h"
 #include "connections/core.h"
 #include "connections/listeners.h"
 #include "connections/payload.h"
 #include "internal/platform/byte_array.h"
 #include "internal/platform/exception.h"
 #include "internal/platform/file.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCCore.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCCoreConnection.h"
-#import "internal/platform/implementation/ios/Source/Internal/GNCPayload+Internal.h"
-#include "internal/platform/implementation/ios/Source/Platform/utils.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h"
+#include "internal/platform/implementation/ios/utils.h"
 #include "internal/platform/input_stream.h"
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCUtils.h b/connections/clients/ios/Internal/GNCUtils.h
similarity index 86%
rename from internal/platform/implementation/ios/Source/Internal/GNCUtils.h
rename to connections/clients/ios/Internal/GNCUtils.h
index af05207f..c76fea0d 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCUtils.h
+++ b/connections/clients/ios/Internal/GNCUtils.h
@@ -16,9 +16,9 @@
 
 #include <string>
 
+#import "connections/clients/ios/Public/NearbyConnections/GNCAdvertiser.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
 #include "connections/listeners.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/internal/platform/implementation/ios/Source/Internal/GNCUtils.mm b/connections/clients/ios/Internal/GNCUtils.mm
similarity index 88%
rename from internal/platform/implementation/ios/Source/Internal/GNCUtils.mm
rename to connections/clients/ios/Internal/GNCUtils.mm
index 3d24d402..15f39724 100644
--- a/internal/platform/implementation/ios/Source/Internal/GNCUtils.mm
+++ b/connections/clients/ios/Internal/GNCUtils.mm
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Internal/GNCUtils.h"
+#import "connections/clients/ios/Internal/GNCUtils.h"
 
+#import "connections/clients/ios/Public/NearbyConnections/GNCAdvertiser.h"
+#import "connections/clients/ios/Public/NearbyConnections/GNCConnection.h"
 #include "connections/strategy.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h"
-#import "internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h b/connections/clients/ios/Public/NearbyConnections/GNCAdvertiser.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCAdvertiser.h
rename to connections/clients/ios/Public/NearbyConnections/GNCAdvertiser.h
diff --git a/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h b/connections/clients/ios/Public/NearbyConnections/GNCConnection.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnection.h
rename to connections/clients/ios/Public/NearbyConnections/GNCConnection.h
diff --git a/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnections.h b/connections/clients/ios/Public/NearbyConnections/GNCConnections.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCConnections.h
rename to connections/clients/ios/Public/NearbyConnections/GNCConnections.h
diff --git a/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCDiscoverer.h b/connections/clients/ios/Public/NearbyConnections/GNCDiscoverer.h
similarity index 97%
rename from internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCDiscoverer.h
rename to connections/clients/ios/Public/NearbyConnections/GNCDiscoverer.h
index f9afe835..f76bbbff 100644
--- a/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCDiscoverer.h
+++ b/connections/clients/ios/Public/NearbyConnections/GNCDiscoverer.h
@@ -46,7 +46,8 @@ typedef GNCConnectionHandler _Nonnull (^GNCDiscovererConnectionInitializationHan
  * @param failureHandler This handler is called if there was an error making the connection.
  */
 typedef void (^GNCConnectionRequester)(
-    NSData *endpointInfo, GNCDiscovererConnectionInitializationHandler connectionAuthorizationHandler,
+    NSData *endpointInfo,
+    GNCDiscovererConnectionInitializationHandler connectionAuthorizationHandler,
     GNCConnectionFailureHandler failureHandler);
 
 /** Information about an endpoint when it's discovered. */
diff --git a/internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h b/connections/clients/ios/Public/NearbyConnections/GNCPayload.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Public/NearbyConnections/GNCPayload.h
rename to connections/clients/ios/Public/NearbyConnections/GNCPayload.h
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample.png b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample.png
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample.png
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample.png
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample.xcodeproj/project.pbxproj b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample.xcodeproj/project.pbxproj
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample.xcodeproj/project.pbxproj
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample.xcodeproj/project.pbxproj
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.h b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.h
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.h
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.h
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.m b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.m
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.m
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/AppDelegate.m
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/AppIcon.appiconset/Contents.json b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/Contents.json b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/Contents.json
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/Contents.json
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Assets.xcassets/Contents.json
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/LaunchScreen.storyboard b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/LaunchScreen.storyboard
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/LaunchScreen.storyboard
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/Main.storyboard b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/Main.storyboard
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/Main.storyboard
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Base.lproj/Main.storyboard
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Info.plist b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Info.plist
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/Info.plist
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/Info.plist
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.h b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.h
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.h
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.h
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.m b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.m
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.m
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/ViewController.m
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/main.m b/connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/main.m
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/NearbyConnectionsExample/main.m
rename to connections/samples/ios/NearbyConnectionsExample/NearbyConnectionsExample/main.m
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/README.md b/connections/samples/ios/NearbyConnectionsExample/README.md
similarity index 99%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/README.md
rename to connections/samples/ios/NearbyConnectionsExample/README.md
index bf98df60..4aa1fb20 100755
--- a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/README.md
+++ b/connections/samples/ios/NearbyConnectionsExample/README.md
@@ -195,4 +195,4 @@ If you meet the following error in the debug panel of Xcode, you likely need to
 }
 ```
 ---
-NOTE: The iOS simulator is unstable when advertising. We recommend using an real iOS device.
+NOTE: The iOS simulator is unstable when advertising. We recommend using a real iOS device.
diff --git a/internal/platform/implementation/ios/Example/NearbyConnectionsExample/XcodeSetup.png b/connections/samples/ios/NearbyConnectionsExample/XcodeSetup.png
similarity index 100%
rename from internal/platform/implementation/ios/Example/NearbyConnectionsExample/XcodeSetup.png
rename to connections/samples/ios/NearbyConnectionsExample/XcodeSetup.png
diff --git a/internal/platform/implementation/ios/BUILD b/internal/platform/implementation/ios/BUILD
index 2a26d33d..a64b1011 100644
--- a/internal/platform/implementation/ios/BUILD
+++ b/internal/platform/implementation/ios/BUILD
@@ -11,62 +11,101 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-load("//tools/build_defs/apple:ios.bzl", "ios_static_framework")
-
 licenses(["notice"])
 
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = [
+    "//connections/clients/ios:__subpackages__",
+    "//internal/platform/implementation/ios:__subpackages__",
+])
 
 objc_library(
-    name = "Connections",
+    name = "Platform",
     srcs = [
-        "Source/Internal/GNCAdvertiser.mm",
-        "Source/Internal/GNCCore.mm",
-        "Source/Internal/GNCCoreConnection.mm",
-        "Source/Internal/GNCDiscoverer.mm",
-        "Source/Internal/GNCPayload.mm",
-        "Source/Internal/GNCPayloadListener.mm",
-        "Source/Internal/GNCUtils.mm",
+        "crypto.mm",
+        "log_message.mm",
+        "multi_thread_executor.mm",
+        "platform.mm",
+        "scheduled_executor.mm",
+        "utils.mm",
+        "wifi_lan.mm",
     ],
     hdrs = [
-        "Source/Internal/GNCCore.h",
-        "Source/Internal/GNCCoreConnection.h",
-        "Source/Internal/GNCPayload+Internal.h",
-        "Source/Internal/GNCPayloadListener.h",
-        "Source/Internal/GNCUtils.h",
-        "Source/Public/NearbyConnections/GNCAdvertiser.h",
-        "Source/Public/NearbyConnections/GNCConnection.h",
-        "Source/Public/NearbyConnections/GNCConnections.h",
-        "Source/Public/NearbyConnections/GNCDiscoverer.h",
-        "Source/Public/NearbyConnections/GNCPayload.h",
+        "log_message.h",
+        "multi_thread_executor.h",
+        "scheduled_executor.h",
+        "single_thread_executor.h",
+        "utils.h",
+        "wifi_lan.h",
     ],
     features = ["-layering_check"],
+    sdk_frameworks = [
+        "CoreBluetooth",
+        "CoreFoundation",
+    ],
     deps = [
-        "//connections:core",
-        "//connections:core_types",
-        "//internal/platform/implementation/ios/Source/Mediums",
-        "//internal/platform/implementation/ios/Source/Platform",
-        "//internal/platform/implementation/ios/Source/Shared",
+        ":Platform_cc",
+        ":Shared",
+        "//internal/platform/implementation:platform",
+        "//internal/platform/implementation:types",
+        "//internal/platform/implementation/ios/Mediums",
+        "//internal/platform/implementation/shared:file",
         "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger",
-        "@com_google_absl//absl/functional:bind_front",
     ],
 )
 
-MIN_IOS_VERSION = "12.0"
-
-HDRS_POD = [
-    "Source/Public/NearbyConnections/GNCAdvertiser.h",
-    "Source/Public/NearbyConnections/GNCConnection.h",
-    "Source/Public/NearbyConnections/GNCDiscoverer.h",
-    "Source/Public/NearbyConnections/GNCPayload.h",
-]
-
-ios_static_framework(
-    name = "NearbyConnections_framework",
-    hdrs = HDRS_POD,
-    bundle_name = "NearbyConnections",
-    minimum_os_version = MIN_IOS_VERSION,
+objc_library(
+    name = "Shared",
+    srcs = [
+        "GNCUtils.m",
+    ],
+    hdrs = [
+        "GNCUtils.h",
+    ],
     deps = [
-        ":Connections",
+        "//third_party/objective_c/google_toolbox_for_mac:GTM_StringEncoding",
+        "@aappleby_smhasher//:libmurmur3",
+    ],
+)
+
+cc_library(
+    name = "Platform_cc",
+    srcs = [
+        "condition_variable.cc",
+        "count_down_latch.cc",
+        "system_clock.cc",
+    ],
+    hdrs = [
+        "atomic_boolean.h",
+        "atomic_uint32.h",
+        "condition_variable.h",
+        "count_down_latch.h",
+        "mutex.h",
+    ],
+    deps = [
+        "//internal/platform/implementation:platform",
+        "//internal/platform/implementation:types",
+        "@com_google_absl//absl/strings:str_format",
+        "@com_google_absl//absl/synchronization",
+        "@com_google_absl//absl/time",
+    ],
+)
+
+cc_test(
+    name = "Platform_cc_test",
+    srcs = [
+        "atomic_boolean_test.cc",
+        "atomic_uint32_test.cc",
+        "condition_variable_test.cc",
+        "count_down_latch_test.cc",
+        "mutex_test.cc",
+    ],
+    shard_count = 16,
+    deps = [
+        ":Platform_cc",
+        "@com_github_protobuf_matchers//protobuf-matchers",
+        "@com_google_absl//absl/synchronization",
+        "@com_google_absl//absl/time",
+        "@com_google_googletest//:gtest_main",
+        "@com_google_nisaba//nisaba/port:thread_pool/fiber",
     ],
 )
diff --git a/internal/platform/implementation/ios/Source/Shared/GNCUtils.h b/internal/platform/implementation/ios/GNCUtils.h
similarity index 98%
rename from internal/platform/implementation/ios/Source/Shared/GNCUtils.h
rename to internal/platform/implementation/ios/GNCUtils.h
index 60a5f319..c1f2b232 100644
--- a/internal/platform/implementation/ios/Source/Shared/GNCUtils.h
+++ b/internal/platform/implementation/ios/GNCUtils.h
@@ -29,7 +29,6 @@ NSData *_Nullable GNCSha256Data(NSData *data);
 /// Generates a SHA-256 hash (32 bytes) from a string.
 NSData *_Nullable GNCSha256String(NSString *string);
 
-
 /// Generates an MD5 hash (16 bytes) from a data object.
 NSData *_Nullable GNCMd5Data(NSData *data);
 
@@ -37,7 +36,7 @@ NSData *_Nullable GNCMd5Data(NSData *data);
 NSData *_Nullable GNCMd5String(NSString *string);
 
 #ifdef __cplusplus
-} // extern "C"
+}  // extern "C"
 #endif
 
 NS_ASSUME_NONNULL_END
diff --git a/internal/platform/implementation/ios/Source/Shared/GNCUtils.m b/internal/platform/implementation/ios/GNCUtils.m
similarity index 95%
rename from internal/platform/implementation/ios/Source/Shared/GNCUtils.m
rename to internal/platform/implementation/ios/GNCUtils.m
index 2c655a4a..47d05355 100644
--- a/internal/platform/implementation/ios/Source/Shared/GNCUtils.m
+++ b/internal/platform/implementation/ios/GNCUtils.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Shared/GNCUtils.h"
+#import "internal/platform/implementation/ios/GNCUtils.h"
 
 #import <CommonCrypto/CommonDigest.h>
 
diff --git a/internal/platform/implementation/ios/Source/Mediums/BUILD b/internal/platform/implementation/ios/Mediums/BUILD
similarity index 96%
rename from internal/platform/implementation/ios/Source/Mediums/BUILD
rename to internal/platform/implementation/ios/Mediums/BUILD
index 65c81178..bf70582a 100644
--- a/internal/platform/implementation/ios/Source/Mediums/BUILD
+++ b/internal/platform/implementation/ios/Mediums/BUILD
@@ -37,7 +37,7 @@ objc_library(
     ],
     deps = [
         ":ObjCProtos",
-        "//internal/platform/implementation/ios/Source/Shared",
+        "//internal/platform/implementation/ios:Shared",
         "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger",
         "@com_google_absl//absl/numeric:int128",
     ],
diff --git a/internal/platform/implementation/ios/Source/Mediums/GNCLeaks.h b/internal/platform/implementation/ios/Mediums/GNCLeaks.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Mediums/GNCLeaks.h
rename to internal/platform/implementation/ios/Mediums/GNCLeaks.h
diff --git a/internal/platform/implementation/ios/Source/Mediums/GNCLeaks.m b/internal/platform/implementation/ios/Mediums/GNCLeaks.m
similarity index 93%
rename from internal/platform/implementation/ios/Source/Mediums/GNCLeaks.m
rename to internal/platform/implementation/ios/Mediums/GNCLeaks.m
index 220326a9..70510afd 100644
--- a/internal/platform/implementation/ios/Source/Mediums/GNCLeaks.m
+++ b/internal/platform/implementation/ios/Mediums/GNCLeaks.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCLeaks.h"
+#import "internal/platform/implementation/ios/Mediums/GNCLeaks.h"
 
 void GNCVerifyDealloc(id object, NSTimeInterval timeInterval) {
 #if DEBUG
diff --git a/internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h b/internal/platform/implementation/ios/Mediums/GNCMConnection.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h
rename to internal/platform/implementation/ios/Mediums/GNCMConnection.h
diff --git a/internal/platform/implementation/ios/Source/Mediums/GNCMConnection.m b/internal/platform/implementation/ios/Mediums/GNCMConnection.m
similarity index 92%
rename from internal/platform/implementation/ios/Source/Mediums/GNCMConnection.m
rename to internal/platform/implementation/ios/Mediums/GNCMConnection.m
index 27b4c20f..2401218b 100644
--- a/internal/platform/implementation/ios/Source/Mediums/GNCMConnection.m
+++ b/internal/platform/implementation/ios/Mediums/GNCMConnection.m
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h
similarity index 95%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h
index 6f5d338e..aa2513ea 100644
--- a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h
+++ b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.m b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.m
similarity index 94%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.m
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.m
index d88f8a10..1fdf7dce 100644
--- a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.m
+++ b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.m
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h"
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h"
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 typedef NSString *GNCEndpointId;
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h
similarity index 94%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h
index e88ac9ee..1c65f953 100644
--- a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h
+++ b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.m b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.m
similarity index 97%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.m
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.m
index ae318843..62aaf56d 100644
--- a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.m
+++ b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.m
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h"
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 enum { kMaxPacketSize = 32 * 1024 };
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.h b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h
similarity index 96%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.h
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h
index bdb31d26..243a6c38 100644
--- a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.h
+++ b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h
@@ -14,7 +14,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.m b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.m
similarity index 89%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.m
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.m
index aa2176fd..fa154068 100644
--- a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.m
+++ b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.m
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h"
 
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourConnection.h"
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourConnection.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h"
 #import "GoogleToolboxForMac/GTMLogger.h"
 
 @interface GNCMBonjourService () <NSNetServiceDelegate>
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h
diff --git a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.m b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.m
similarity index 87%
rename from internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.m
rename to internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.m
index 6f510155..2fdcb2a8 100644
--- a/internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.m
+++ b/internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.m
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourUtils.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourUtils.h"
 
 NSString *const GNCMBonjourDomain = @"local";
diff --git a/internal/platform/implementation/ios/Source/Platform/BUILD b/internal/platform/implementation/ios/Source/Platform/BUILD
deleted file mode 100644
index e347c568..00000000
--- a/internal/platform/implementation/ios/Source/Platform/BUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-licenses(["notice"])
-
-package(default_visibility = ["//internal/platform/implementation/ios:__subpackages__"])
-
-objc_library(
-    name = "Platform",
-    srcs = [
-        "crypto.mm",
-        "log_message.mm",
-        "multi_thread_executor.mm",
-        "platform.mm",
-        "scheduled_executor.mm",
-        "utils.mm",
-        "wifi_lan.mm",
-    ],
-    hdrs = [
-        "log_message.h",
-        "multi_thread_executor.h",
-        "scheduled_executor.h",
-        "single_thread_executor.h",
-        "utils.h",
-        "wifi_lan.h",
-    ],
-    features = ["-layering_check"],
-    sdk_frameworks = [
-        "CoreBluetooth",
-        "CoreFoundation",
-    ],
-    deps = [
-        ":Platform_cc",
-        "//internal/platform/implementation:platform",
-        "//internal/platform/implementation:types",
-        "//internal/platform/implementation/ios/Source/Mediums",
-        "//internal/platform/implementation/ios/Source/Shared",
-        "//internal/platform/implementation/shared:file",
-        "//third_party/objective_c/google_toolbox_for_mac:GTM_Logger",
-    ],
-)
-
-cc_library(
-    name = "Platform_cc",
-    srcs = [
-        "condition_variable.cc",
-        "count_down_latch.cc",
-        "system_clock.cc",
-    ],
-    hdrs = [
-        "atomic_boolean.h",
-        "atomic_uint32.h",
-        "condition_variable.h",
-        "count_down_latch.h",
-        "mutex.h",
-    ],
-    deps = [
-        "//internal/platform/implementation:platform",
-        "//internal/platform/implementation:types",
-        "@com_google_absl//absl/strings:str_format",
-        "@com_google_absl//absl/synchronization",
-        "@com_google_absl//absl/time",
-    ],
-)
-
-cc_test(
-    name = "Platform_cc_test",
-    srcs = [
-        "atomic_boolean_test.cc",
-        "atomic_uint32_test.cc",
-        "condition_variable_test.cc",
-        "count_down_latch_test.cc",
-        "mutex_test.cc",
-    ],
-    shard_count = 16,
-    deps = [
-        ":Platform_cc",
-        "@com_github_protobuf_matchers//protobuf-matchers",
-        "@com_google_absl//absl/synchronization",
-        "@com_google_absl//absl/time",
-        "@com_google_googletest//:gtest_main",
-        "@com_google_nisaba//nisaba/port:thread_pool/fiber",
-    ],
-)
diff --git a/internal/platform/implementation/ios/Source/Shared/BUILD b/internal/platform/implementation/ios/Source/Shared/BUILD
deleted file mode 100644
index 1ad2cda3..00000000
--- a/internal/platform/implementation/ios/Source/Shared/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2020 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-licenses(["notice"])
-
-package(default_visibility = ["//internal/platform/implementation/ios:__subpackages__"])
-
-objc_library(
-    name = "Shared",
-    srcs = [
-        "GNCUtils.m",
-    ],
-    hdrs = [
-        "GNCUtils.h",
-    ],
-    deps = [
-        "//third_party/objective_c/google_toolbox_for_mac:GTM_StringEncoding",
-        "@aappleby_smhasher//:libmurmur3",
-    ],
-)
diff --git a/internal/platform/implementation/ios/Tests/BUILD b/internal/platform/implementation/ios/Tests/BUILD
index bf4f2b80..4e048bcd 100644
--- a/internal/platform/implementation/ios/Tests/BUILD
+++ b/internal/platform/implementation/ios/Tests/BUILD
@@ -21,14 +21,16 @@ objc_library(
     name = "PlatformTestslib",
     testonly = 1,
     srcs = [
-        "Platform/GNCCryptoTest.mm",
-        "Platform/GNCMultiThreadExecutorTest.mm",
-        "Platform/GNCScheduledExecutorTest.mm",
-        "Platform/GNCSingleThreadExecutorTest.mm",
+        "GNCCryptoTest.mm",
+        "GNCMultiThreadExecutorTest.mm",
+        "GNCScheduledExecutorTest.mm",
+        "GNCSingleThreadExecutorTest.mm",
+        "GNCUtilsTest.mm",
     ],
     features = ["-layering_check"],
     deps = [
-        "//internal/platform/implementation/ios:Connections",
+        "//internal/platform/implementation/ios:Platform",
+        "//internal/platform/implementation/ios:Shared",
     ],
 )
 
@@ -40,25 +42,3 @@ ios_unit_test(
         ":PlatformTestslib",
     ],
 )
-
-objc_library(
-    name = "SharedTestslib",
-    testonly = 1,
-    srcs = [
-        "Shared/GNCUtilsTest.mm",
-    ],
-    features = ["-layering_check"],
-    deps = [
-        "//internal/platform/implementation/ios/Source/Platform",
-        "//internal/platform/implementation/ios/Source/Shared",
-    ],
-)
-
-ios_unit_test(
-    name = "SharedTests",
-    minimum_os_version = "12.0",
-    runner = "//testing/utp/ios:IOS_12",
-    deps = [
-        ":SharedTestslib",
-    ],
-)
diff --git a/internal/platform/implementation/ios/Tests/Platform/GNCCryptoTest.mm b/internal/platform/implementation/ios/Tests/GNCCryptoTest.mm
similarity index 100%
rename from internal/platform/implementation/ios/Tests/Platform/GNCCryptoTest.mm
rename to internal/platform/implementation/ios/Tests/GNCCryptoTest.mm
diff --git a/internal/platform/implementation/ios/Tests/Platform/GNCMultiThreadExecutorTest.mm b/internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm
similarity index 100%
rename from internal/platform/implementation/ios/Tests/Platform/GNCMultiThreadExecutorTest.mm
rename to internal/platform/implementation/ios/Tests/GNCMultiThreadExecutorTest.mm
diff --git a/internal/platform/implementation/ios/Tests/Platform/GNCScheduledExecutorTest.mm b/internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm
similarity index 100%
rename from internal/platform/implementation/ios/Tests/Platform/GNCScheduledExecutorTest.mm
rename to internal/platform/implementation/ios/Tests/GNCScheduledExecutorTest.mm
diff --git a/internal/platform/implementation/ios/Tests/Platform/GNCSingleThreadExecutorTest.mm b/internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm
similarity index 100%
rename from internal/platform/implementation/ios/Tests/Platform/GNCSingleThreadExecutorTest.mm
rename to internal/platform/implementation/ios/Tests/GNCSingleThreadExecutorTest.mm
diff --git a/internal/platform/implementation/ios/Tests/Shared/GNCUtilsTest.mm b/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm
similarity index 95%
rename from internal/platform/implementation/ios/Tests/Shared/GNCUtilsTest.mm
rename to internal/platform/implementation/ios/Tests/GNCUtilsTest.mm
index 6773f10f..fb924ee7 100644
--- a/internal/platform/implementation/ios/Tests/Shared/GNCUtilsTest.mm
+++ b/internal/platform/implementation/ios/Tests/GNCUtilsTest.mm
@@ -15,7 +15,7 @@
 #import <XCTest/XCTest.h>
 
 #include "internal/platform/byte_array.h"
-#include "internal/platform/implementation/ios/Source/Platform/utils.h"
+#include "internal/platform/implementation/ios/utils.h"
 
 using location::nearby::ByteArray;
 using location::nearby::ByteArrayFromNSData;
diff --git a/internal/platform/implementation/ios/Source/Platform/atomic_boolean.h b/internal/platform/implementation/ios/atomic_boolean.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/atomic_boolean.h
rename to internal/platform/implementation/ios/atomic_boolean.h
diff --git a/internal/platform/implementation/ios/Source/Platform/atomic_boolean_test.cc b/internal/platform/implementation/ios/atomic_boolean_test.cc
similarity index 96%
rename from internal/platform/implementation/ios/Source/Platform/atomic_boolean_test.cc
rename to internal/platform/implementation/ios/atomic_boolean_test.cc
index ed4c611d..540ea5a0 100644
--- a/internal/platform/implementation/ios/Source/Platform/atomic_boolean_test.cc
+++ b/internal/platform/implementation/ios/atomic_boolean_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/atomic_boolean.h"
+#include "internal/platform/implementation/ios/atomic_boolean.h"
 
 #include "gtest/gtest.h"
 #include "thread/fiber/fiber.h"
diff --git a/internal/platform/implementation/ios/Source/Platform/atomic_uint32.h b/internal/platform/implementation/ios/atomic_uint32.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/atomic_uint32.h
rename to internal/platform/implementation/ios/atomic_uint32.h
diff --git a/internal/platform/implementation/ios/Source/Platform/atomic_uint32_test.cc b/internal/platform/implementation/ios/atomic_uint32_test.cc
similarity index 95%
rename from internal/platform/implementation/ios/Source/Platform/atomic_uint32_test.cc
rename to internal/platform/implementation/ios/atomic_uint32_test.cc
index 7893f3c2..13b8bdc5 100644
--- a/internal/platform/implementation/ios/Source/Platform/atomic_uint32_test.cc
+++ b/internal/platform/implementation/ios/atomic_uint32_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/atomic_uint32.h"
+#include "internal/platform/implementation/ios/atomic_uint32.h"
 
 #include "gtest/gtest.h"
 #include "thread/fiber/fiber.h"
diff --git a/internal/platform/implementation/ios/Source/Platform/condition_variable.cc b/internal/platform/implementation/ios/condition_variable.cc
similarity index 86%
rename from internal/platform/implementation/ios/Source/Platform/condition_variable.cc
rename to internal/platform/implementation/ios/condition_variable.cc
index 8ad8752e..4cbec76a 100644
--- a/internal/platform/implementation/ios/Source/Platform/condition_variable.cc
+++ b/internal/platform/implementation/ios/condition_variable.cc
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/condition_variable.h"
+#include "internal/platform/implementation/ios/condition_variable.h"
 
-#include "internal/platform/implementation/ios/Source/Platform/mutex.h"
+#include "internal/platform/implementation/ios/mutex.h"
 
 namespace location {
 namespace nearby {
diff --git a/internal/platform/implementation/ios/Source/Platform/condition_variable.h b/internal/platform/implementation/ios/condition_variable.h
similarity index 95%
rename from internal/platform/implementation/ios/Source/Platform/condition_variable.h
rename to internal/platform/implementation/ios/condition_variable.h
index 65486ff5..a1a8243d 100644
--- a/internal/platform/implementation/ios/Source/Platform/condition_variable.h
+++ b/internal/platform/implementation/ios/condition_variable.h
@@ -17,7 +17,7 @@
 
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/implementation/condition_variable.h"
-#include "internal/platform/implementation/ios/Source/Platform/mutex.h"
+#include "internal/platform/implementation/ios/mutex.h"
 
 namespace location {
 namespace nearby {
diff --git a/internal/platform/implementation/ios/Source/Platform/condition_variable_test.cc b/internal/platform/implementation/ios/condition_variable_test.cc
similarity index 92%
rename from internal/platform/implementation/ios/Source/Platform/condition_variable_test.cc
rename to internal/platform/implementation/ios/condition_variable_test.cc
index 7d36f864..0b206964 100644
--- a/internal/platform/implementation/ios/Source/Platform/condition_variable_test.cc
+++ b/internal/platform/implementation/ios/condition_variable_test.cc
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/condition_variable.h"
+#include "internal/platform/implementation/ios/condition_variable.h"
 
 #include "gtest/gtest.h"
 #include "absl/time/clock.h"
-#include "internal/platform/implementation/ios/Source/Platform/mutex.h"
+#include "internal/platform/implementation/ios/mutex.h"
 #include "thread/fiber/fiber.h"
 
 namespace location {
diff --git a/internal/platform/implementation/ios/Source/Platform/count_down_latch.cc b/internal/platform/implementation/ios/count_down_latch.cc
similarity index 93%
rename from internal/platform/implementation/ios/Source/Platform/count_down_latch.cc
rename to internal/platform/implementation/ios/count_down_latch.cc
index 9fce8728..de8773c2 100644
--- a/internal/platform/implementation/ios/Source/Platform/count_down_latch.cc
+++ b/internal/platform/implementation/ios/count_down_latch.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/count_down_latch.h"
+#include "internal/platform/implementation/ios/count_down_latch.h"
 
 namespace location {
 namespace nearby {
diff --git a/internal/platform/implementation/ios/Source/Platform/count_down_latch.h b/internal/platform/implementation/ios/count_down_latch.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/count_down_latch.h
rename to internal/platform/implementation/ios/count_down_latch.h
diff --git a/internal/platform/implementation/ios/Source/Platform/count_down_latch_test.cc b/internal/platform/implementation/ios/count_down_latch_test.cc
similarity index 95%
rename from internal/platform/implementation/ios/Source/Platform/count_down_latch_test.cc
rename to internal/platform/implementation/ios/count_down_latch_test.cc
index 2122bded..4bf01dec 100644
--- a/internal/platform/implementation/ios/Source/Platform/count_down_latch_test.cc
+++ b/internal/platform/implementation/ios/count_down_latch_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/count_down_latch.h"
+#include "internal/platform/implementation/ios/count_down_latch.h"
 
 #include "gtest/gtest.h"
 #include "thread/fiber/fiber.h"
diff --git a/internal/platform/implementation/ios/Source/Platform/crypto.mm b/internal/platform/implementation/ios/crypto.mm
similarity index 88%
rename from internal/platform/implementation/ios/Source/Platform/crypto.mm
rename to internal/platform/implementation/ios/crypto.mm
index 004cd56f..fbd1544d 100644
--- a/internal/platform/implementation/ios/Source/Platform/crypto.mm
+++ b/internal/platform/implementation/ios/crypto.mm
@@ -15,8 +15,8 @@
 #include "internal/platform/implementation/crypto.h"
 
 #import "absl/strings/string_view.h"
-#import "internal/platform/implementation/ios/Source/Platform/utils.h"
-#import "internal/platform/implementation/ios/Source/Shared/GNCUtils.h"
+#import "internal/platform/implementation/ios/GNCUtils.h"
+#import "internal/platform/implementation/ios/utils.h"
 
 namespace location {
 namespace nearby {
diff --git a/internal/platform/implementation/ios/Source/Platform/log_message.h b/internal/platform/implementation/ios/log_message.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/log_message.h
rename to internal/platform/implementation/ios/log_message.h
diff --git a/internal/platform/implementation/ios/Source/Platform/log_message.mm b/internal/platform/implementation/ios/log_message.mm
similarity index 97%
rename from internal/platform/implementation/ios/Source/Platform/log_message.mm
rename to internal/platform/implementation/ios/log_message.mm
index 20bf0062..8247f353 100644
--- a/internal/platform/implementation/ios/Source/Platform/log_message.mm
+++ b/internal/platform/implementation/ios/log_message.mm
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/log_message.h"
+#include "internal/platform/implementation/ios/log_message.h"
 
 #ifndef NEARBY_SWIFTPM
 #include "glog/logging.h"
diff --git a/internal/platform/implementation/ios/Source/Platform/multi_thread_executor.h b/internal/platform/implementation/ios/multi_thread_executor.h
similarity index 94%
rename from internal/platform/implementation/ios/Source/Platform/multi_thread_executor.h
rename to internal/platform/implementation/ios/multi_thread_executor.h
index 1a371580..cd8372de 100644
--- a/internal/platform/implementation/ios/Source/Platform/multi_thread_executor.h
+++ b/internal/platform/implementation/ios/multi_thread_executor.h
@@ -15,9 +15,9 @@
 #ifndef PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
 #define PLATFORM_IMPL_IOS_MULTI_THREAD_EXECUTOR_H_
 
+#import "internal/platform/implementation/ios/scheduled_executor.h"
 #include "internal/platform/implementation/submittable_executor.h"
 #import "internal/platform/runnable.h"
-#import "internal/platform/implementation/ios/Source/Platform/scheduled_executor.h"
 
 namespace location {
 namespace nearby {
diff --git a/internal/platform/implementation/ios/Source/Platform/multi_thread_executor.mm b/internal/platform/implementation/ios/multi_thread_executor.mm
similarity index 87%
rename from internal/platform/implementation/ios/Source/Platform/multi_thread_executor.mm
rename to internal/platform/implementation/ios/multi_thread_executor.mm
index e4a38712..3e9e02b4 100644
--- a/internal/platform/implementation/ios/Source/Platform/multi_thread_executor.mm
+++ b/internal/platform/implementation/ios/multi_thread_executor.mm
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Platform/multi_thread_executor.h"
+#import "internal/platform/implementation/ios/multi_thread_executor.h"
 
-#import "internal/platform/implementation/ios/Source/Platform/scheduled_executor.h"
+#import "internal/platform/implementation/ios/scheduled_executor.h"
 #include "internal/platform/runnable.h"
 
 namespace location {
diff --git a/internal/platform/implementation/ios/Source/Platform/mutex.h b/internal/platform/implementation/ios/mutex.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/mutex.h
rename to internal/platform/implementation/ios/mutex.h
diff --git a/internal/platform/implementation/ios/Source/Platform/mutex_test.cc b/internal/platform/implementation/ios/mutex_test.cc
similarity index 97%
rename from internal/platform/implementation/ios/Source/Platform/mutex_test.cc
rename to internal/platform/implementation/ios/mutex_test.cc
index 5c5a9dbe..494cd411 100644
--- a/internal/platform/implementation/ios/Source/Platform/mutex_test.cc
+++ b/internal/platform/implementation/ios/mutex_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "internal/platform/implementation/ios/Source/Platform/mutex.h"
+#include "internal/platform/implementation/ios/mutex.h"
 
 #include "gtest/gtest.h"
 #include "absl/synchronization/mutex.h"
diff --git a/internal/platform/implementation/ios/Source/Platform/platform.mm b/internal/platform/implementation/ios/platform.mm
similarity index 85%
rename from internal/platform/implementation/ios/Source/Platform/platform.mm
rename to internal/platform/implementation/ios/platform.mm
index 2f315500..2cf4007d 100644
--- a/internal/platform/implementation/ios/Source/Platform/platform.mm
+++ b/internal/platform/implementation/ios/platform.mm
@@ -16,17 +16,17 @@
 
 #include <string>
 
-#include "internal/platform/implementation/ios/Source/Platform/atomic_boolean.h"
-#include "internal/platform/implementation/ios/Source/Platform/atomic_uint32.h"
-#include "internal/platform/implementation/ios/Source/Platform/condition_variable.h"
-#include "internal/platform/implementation/ios/Source/Platform/count_down_latch.h"
-#import "internal/platform/implementation/ios/Source/Platform/log_message.h"
-#import "internal/platform/implementation/ios/Source/Platform/multi_thread_executor.h"
-#include "internal/platform/implementation/ios/Source/Platform/mutex.h"
-#import "internal/platform/implementation/ios/Source/Platform/scheduled_executor.h"
-#import "internal/platform/implementation/ios/Source/Platform/single_thread_executor.h"
-#import "internal/platform/implementation/ios/Source/Platform/utils.h"
-#include "internal/platform/implementation/ios/Source/Platform/wifi_lan.h"
+#include "internal/platform/implementation/ios/atomic_boolean.h"
+#include "internal/platform/implementation/ios/atomic_uint32.h"
+#include "internal/platform/implementation/ios/condition_variable.h"
+#include "internal/platform/implementation/ios/count_down_latch.h"
+#import "internal/platform/implementation/ios/log_message.h"
+#import "internal/platform/implementation/ios/multi_thread_executor.h"
+#include "internal/platform/implementation/ios/mutex.h"
+#import "internal/platform/implementation/ios/scheduled_executor.h"
+#import "internal/platform/implementation/ios/single_thread_executor.h"
+#import "internal/platform/implementation/ios/utils.h"
+#include "internal/platform/implementation/ios/wifi_lan.h"
 #include "internal/platform/implementation/mutex.h"
 #include "internal/platform/implementation/shared/file.h"
 #include "internal/platform/payload_id.h"
diff --git a/internal/platform/implementation/ios/Source/Platform/scheduled_executor.h b/internal/platform/implementation/ios/scheduled_executor.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/scheduled_executor.h
rename to internal/platform/implementation/ios/scheduled_executor.h
diff --git a/internal/platform/implementation/ios/Source/Platform/scheduled_executor.mm b/internal/platform/implementation/ios/scheduled_executor.mm
similarity index 96%
rename from internal/platform/implementation/ios/Source/Platform/scheduled_executor.mm
rename to internal/platform/implementation/ios/scheduled_executor.mm
index 0df19ced..96bd5405 100644
--- a/internal/platform/implementation/ios/Source/Platform/scheduled_executor.mm
+++ b/internal/platform/implementation/ios/scheduled_executor.mm
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Platform/scheduled_executor.h"
+#import "internal/platform/implementation/ios/scheduled_executor.h"
 
 #import <Foundation/Foundation.h>
 
 #include "absl/time/time.h"
-#import "internal/platform/implementation/ios/Source/Platform/atomic_boolean.h"
+#import "internal/platform/implementation/ios/atomic_boolean.h"
 #include "internal/platform/runnable.h"
 
 // This wraps the C++ Runnable in an Obj-C object for memory management. It is retained by the
diff --git a/internal/platform/implementation/ios/Source/Platform/single_thread_executor.h b/internal/platform/implementation/ios/single_thread_executor.h
similarity index 92%
rename from internal/platform/implementation/ios/Source/Platform/single_thread_executor.h
rename to internal/platform/implementation/ios/single_thread_executor.h
index 2979672d..28d55fa1 100644
--- a/internal/platform/implementation/ios/Source/Platform/single_thread_executor.h
+++ b/internal/platform/implementation/ios/single_thread_executor.h
@@ -15,7 +15,7 @@
 #ifndef PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
 #define PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
 
-#import "internal/platform/implementation/ios/Source/Platform/multi_thread_executor.h"
+#import "internal/platform/implementation/ios/multi_thread_executor.h"
 
 namespace location {
 namespace nearby {
@@ -32,4 +32,3 @@ class SingleThreadExecutor : public MultiThreadExecutor {
 }  // namespace location
 
 #endif  // PLATFORM_IMPL_IOS_SINGLE_THREAD_EXECUTOR_H_
-
diff --git a/internal/platform/implementation/ios/Source/Platform/system_clock.cc b/internal/platform/implementation/ios/system_clock.cc
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/system_clock.cc
rename to internal/platform/implementation/ios/system_clock.cc
diff --git a/internal/platform/implementation/ios/Source/Platform/utils.h b/internal/platform/implementation/ios/utils.h
similarity index 100%
rename from internal/platform/implementation/ios/Source/Platform/utils.h
rename to internal/platform/implementation/ios/utils.h
diff --git a/internal/platform/implementation/ios/Source/Platform/utils.mm b/internal/platform/implementation/ios/utils.mm
similarity index 98%
rename from internal/platform/implementation/ios/Source/Platform/utils.mm
rename to internal/platform/implementation/ios/utils.mm
index 2dc5bf15..58385de6 100644
--- a/internal/platform/implementation/ios/Source/Platform/utils.mm
+++ b/internal/platform/implementation/ios/utils.mm
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Platform/utils.h"
+#import "internal/platform/implementation/ios/utils.h"
 
 #import "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
diff --git a/internal/platform/implementation/ios/Source/Platform/wifi_lan.h b/internal/platform/implementation/ios/wifi_lan.h
similarity index 98%
rename from internal/platform/implementation/ios/Source/Platform/wifi_lan.h
rename to internal/platform/implementation/ios/wifi_lan.h
index 5a6198b1..d616fe20 100644
--- a/internal/platform/implementation/ios/Source/Platform/wifi_lan.h
+++ b/internal/platform/implementation/ios/wifi_lan.h
@@ -20,9 +20,9 @@
 
 #include "absl/base/thread_annotations.h"
 #include "absl/container/flat_hash_map.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"  // IWYU pragma: export
 #include "internal/platform/implementation/wifi_lan.h"
 #include "internal/platform/nsd_service_info.h"
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"  // IWYU pragma: export
 
 @class GNCMBonjourBrowser;
 @class GNCMBonjourService;
diff --git a/internal/platform/implementation/ios/Source/Platform/wifi_lan.mm b/internal/platform/implementation/ios/wifi_lan.mm
similarity index 97%
rename from internal/platform/implementation/ios/Source/Platform/wifi_lan.mm
rename to internal/platform/implementation/ios/wifi_lan.mm
index debaa4cf..24795467 100644
--- a/internal/platform/implementation/ios/Source/Platform/wifi_lan.mm
+++ b/internal/platform/implementation/ios/wifi_lan.mm
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#import "internal/platform/implementation/ios/Source/Platform/wifi_lan.h"
+#import "internal/platform/implementation/ios/wifi_lan.h"
 
 #include <memory>
 #include <string>
@@ -26,10 +26,10 @@
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/cancellation_flag.h"
 #include "internal/platform/exception.h"
-#import "internal/platform/implementation/ios/Source/Mediums/GNCMConnection.h"
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourBrowser.h"
-#import "internal/platform/implementation/ios/Source/Mediums/WifiLan/GNCMBonjourService.h"
-#include "internal/platform/implementation/ios/Source/Platform/utils.h"
+#import "internal/platform/implementation/ios/Mediums/GNCMConnection.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourBrowser.h"
+#import "internal/platform/implementation/ios/Mediums/WifiLan/GNCMBonjourService.h"
+#include "internal/platform/implementation/ios/utils.h"
 #include "internal/platform/implementation/wifi_lan.h"
 #include "internal/platform/nsd_service_info.h"
 #include "internal/platform/prng.h"