diff --git a/.gitignore b/.gitignore
index bd88c765176378..2831dd298f80be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -242,7 +242,7 @@ vs-chromium-project.txt
 /remoting/android/internal/
 /remoting/appengine/
 /remoting/host/installer/linux/internal/
-/remoting/ios/
+/remoting/ios/internal/
 /remoting/internal/
 /remoting/proto/chromotocol_proto_lib.xml
 /remoting/remoting_core_resources.xml
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index d2b0db8c67d10d..8a2f4fbecb2572 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn
@@ -38,7 +38,7 @@ group("remoting_all") {
   }
 
   if (is_ios) {
-    deps += [ "//remoting/client/ios:all" ]
+    deps += [ "//remoting/ios:all" ]
   }
 
   if (enable_remoting_host) {
diff --git a/remoting/client/ios/BUILD.gn b/remoting/ios/BUILD.gn
similarity index 94%
rename from remoting/client/ios/BUILD.gn
rename to remoting/ios/BUILD.gn
index 91d7a2d112395f..c273cdd7f53fe1 100644
--- a/remoting/client/ios/BUILD.gn
+++ b/remoting/ios/BUILD.gn
@@ -45,9 +45,9 @@ source_set("ios_core") {
   }
 
   public_deps = [
-    "//remoting/client/ios/domain",
-    "//remoting/client/ios/facade",
-    "//remoting/client/ios/session",
+    "//remoting/ios/domain",
+    "//remoting/ios/facade",
+    "//remoting/ios/session",
     "//third_party/webrtc/base:rtc_base",
     "//third_party/webrtc/modules/desktop_capture:primitives",
   ]
diff --git a/remoting/client/ios/DEPS b/remoting/ios/DEPS
similarity index 73%
rename from remoting/client/ios/DEPS
rename to remoting/ios/DEPS
index 55a863d4d6c791..fc7187348ee991 100644
--- a/remoting/client/ios/DEPS
+++ b/remoting/ios/DEPS
@@ -1,10 +1,14 @@
 include_rules = [
   "+media/base",
+  "+net",
   "+google/protobuf",
   "+google_apis",
   "+ios/third_party/material_components_ios/src",
+  "+remoting/base",
+  "+remoting/client",
   "+remoting/codec",
-  "+remoting/client/ios",
+  "+remoting/protocol",
+  "+remoting/ios",
   "+remoting/signaling",
   "+third_party/libjingle_xmpp",
   "+third_party/webrtc",
diff --git a/remoting/client/ios/app/BUILD.gn b/remoting/ios/app/BUILD.gn
similarity index 88%
rename from remoting/client/ios/app/BUILD.gn
rename to remoting/ios/app/BUILD.gn
index 56f890a1bab1dc..d97cacbe9b7a6f 100644
--- a/remoting/client/ios/app/BUILD.gn
+++ b/remoting/ios/app/BUILD.gn
@@ -42,7 +42,7 @@ source_set("main") {
     "//google_apis",
     "//remoting/base",
     "//remoting/client",
-    "//remoting/client/ios:ios_core",
+    "//remoting/ios:ios_core",
     "//remoting/protocol",
     "//ui/base",
     "//ui/gfx",
@@ -57,7 +57,7 @@ source_set("main") {
 }
 
 tweak_info_plist("tweak_info_plist") {
-  info_plist = "//remoting/client/ios/app/resources/Info.plist"
+  info_plist = "//remoting/ios/app/resources/Info.plist"
   args = [ "--platform=ios" ]
 }
 
@@ -94,10 +94,10 @@ ios_app_bundle("ios_remoting_app") {
   deps = [
     ":main",
     "//base",
-    "//remoting/client/ios/app/resources:assets",
-    "//remoting/client/ios/app/resources:launchscreen_assets",
-    "//remoting/client/ios/app/resources:remoting_icons",
-    "//remoting/client/ios/display",
+    "//remoting/ios/app/resources:assets",
+    "//remoting/ios/app/resources:launchscreen_assets",
+    "//remoting/ios/app/resources:remoting_icons",
+    "//remoting/ios/display",
   ]
 
   bundle_deps = [ ":launchscreen_storyboard" ]
diff --git a/remoting/client/ios/app/app_delegate.h b/remoting/ios/app/app_delegate.h
similarity index 71%
rename from remoting/client/ios/app/app_delegate.h
rename to remoting/ios/app/app_delegate.h
index ceef1d50cb2bc1..2e5bfff39e9ae9 100644
--- a/remoting/client/ios/app/app_delegate.h
+++ b/remoting/ios/app/app_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_APP_DELEGATE_H_
-#define REMOTING_CLIENT_IOS_APP_APP_DELEGATE_H_
+#ifndef REMOTING_IOS_APP_APP_DELEGATE_H_
+#define REMOTING_IOS_APP_APP_DELEGATE_H_
 
 #import <UIKit/UIKit.h>
 
@@ -14,5 +14,5 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_APP_DELEGATE_H_
+#endif  // REMOTING_IOS_APP_APP_DELEGATE_H_
 
diff --git a/remoting/client/ios/app/app_delegate.mm b/remoting/ios/app/app_delegate.mm
similarity index 89%
rename from remoting/client/ios/app/app_delegate.mm
rename to remoting/ios/app/app_delegate.mm
index 7dc13697669a2d..9383cf5f30e7d1 100644
--- a/remoting/client/ios/app/app_delegate.mm
+++ b/remoting/ios/app/app_delegate.mm
@@ -6,15 +6,15 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/app_delegate.h"
+#import "remoting/ios/app/app_delegate.h"
 
 #include "base/logging.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#import "remoting/client/ios/app/remoting_view_controller.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/app/remoting_view_controller.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 @implementation AppDelegate
 
diff --git a/remoting/client/ios/app/client_connection_view_controller.h b/remoting/ios/app/client_connection_view_controller.h
similarity index 88%
rename from remoting/client/ios/app/client_connection_view_controller.h
rename to remoting/ios/app/client_connection_view_controller.h
index 7ae3939187be59..cb5638b38faef3 100644
--- a/remoting/client/ios/app/client_connection_view_controller.h
+++ b/remoting/ios/app/client_connection_view_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
@@ -44,4 +44,4 @@ typedef NS_ENUM(NSInteger, ClientConnectionViewState) {
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_CLIENT_CONNECTION_VIEW_CONTROLLER_H_
diff --git a/remoting/client/ios/app/client_connection_view_controller.mm b/remoting/ios/app/client_connection_view_controller.mm
similarity index 97%
rename from remoting/client/ios/app/client_connection_view_controller.mm
rename to remoting/ios/app/client_connection_view_controller.mm
index 53bfc60634210e..5426c122ae79df 100644
--- a/remoting/client/ios/app/client_connection_view_controller.mm
+++ b/remoting/ios/app/client_connection_view_controller.mm
@@ -6,14 +6,14 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/client_connection_view_controller.h"
+#import "remoting/ios/app/client_connection_view_controller.h"
 
 #import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MDCActivityIndicator.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"
-#import "remoting/client/ios/app/pin_entry_view.h"
-#import "remoting/client/ios/domain/client_session_details.h"
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/app/pin_entry_view.h"
+#import "remoting/ios/domain/client_session_details.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/protocol/client_authentication_config.h"
diff --git a/remoting/client/ios/app/host_collection_view_cell.h b/remoting/ios/app/host_collection_view_cell.h
similarity index 74%
rename from remoting/client/ios/app/host_collection_view_cell.h
rename to remoting/ios/app/host_collection_view_cell.h
index 50f2da2de10633..0995190ba52fc5 100644
--- a/remoting/client/ios/app/host_collection_view_cell.h
+++ b/remoting/ios/app/host_collection_view_cell.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
-#define REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
+#ifndef REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
+#define REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
 
 #import <UIKit/UIKit.h>
 
@@ -20,4 +20,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
+#endif  // REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CELL_H_
diff --git a/remoting/client/ios/app/host_collection_view_cell.mm b/remoting/ios/app/host_collection_view_cell.mm
similarity index 97%
rename from remoting/client/ios/app/host_collection_view_cell.mm
rename to remoting/ios/app/host_collection_view_cell.mm
index 251f1aa2e818eb..0f3e23b1bc036b 100644
--- a/remoting/client/ios/app/host_collection_view_cell.mm
+++ b/remoting/ios/app/host_collection_view_cell.mm
@@ -8,12 +8,12 @@
 
 #import <UIKit/UIKit.h>
 
-#import "remoting/client/ios/app/host_collection_view_cell.h"
+#import "remoting/ios/app/host_collection_view_cell.h"
 
 #import "ios/third_party/material_components_ios/src/components/ShadowElevations/src/MaterialShadowElevations.h"
 #import "ios/third_party/material_components_ios/src/components/ShadowLayer/src/MaterialShadowLayer.h"
 #import "ios/third_party/material_components_ios/src/components/Typography/src/MaterialTypography.h"
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/domain/host_info.h"
 
 static const CGFloat kLinePadding = 2.f;
 static const CGFloat kHostCardIconInset = 10.f;
diff --git a/remoting/client/ios/app/host_collection_view_controller.h b/remoting/ios/app/host_collection_view_controller.h
similarity index 82%
rename from remoting/client/ios/app/host_collection_view_controller.h
rename to remoting/ios/app/host_collection_view_controller.h
index b25b2a8a8e31c3..cba94f0aa137df 100644
--- a/remoting/client/ios/app/host_collection_view_controller.h
+++ b/remoting/ios/app/host_collection_view_controller.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
-#define REMOTING_CLIENT_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
+#ifndef REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
+#define REMOTING_IOS_APP_HOST_COLLECTION_VIEW_CONTOLLER_H_
 
 #import <UIKit/UIKit.h>
 
 #import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
 #import "ios/third_party/material_components_ios/src/components/FlexibleHeader/src/MaterialFlexibleHeader.h"
-#import "remoting/client/ios/app/host_collection_view_cell.h"
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/app/host_collection_view_cell.h"
+#import "remoting/ios/domain/host_info.h"
 
 // The host collection view controller delegate provides the data for available
 // hosts and receives selection events from the collection view controller.
@@ -40,4 +40,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_HOST_LIST_VIEW_CONTOLLER_H_
+#endif  // REMOTING_IOS_APP_HOST_LIST_VIEW_CONTOLLER_H_
diff --git a/remoting/client/ios/app/host_collection_view_controller.mm b/remoting/ios/app/host_collection_view_controller.mm
similarity index 98%
rename from remoting/client/ios/app/host_collection_view_controller.mm
rename to remoting/ios/app/host_collection_view_controller.mm
index 4e90dc22085e41..4724cb482287e3 100644
--- a/remoting/client/ios/app/host_collection_view_controller.mm
+++ b/remoting/ios/app/host_collection_view_controller.mm
@@ -6,7 +6,7 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/host_collection_view_controller.h"
+#import "remoting/ios/app/host_collection_view_controller.h"
 
 #import "ios/third_party/material_components_ios/src/components/Ink/src/MaterialInk.h"
 #import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"
diff --git a/remoting/client/ios/app/host_view_controller.h b/remoting/ios/app/host_view_controller.h
similarity index 69%
rename from remoting/client/ios/app/host_view_controller.h
rename to remoting/ios/app/host_view_controller.h
index b1d700b607c054..0e6de517024d7a 100644
--- a/remoting/client/ios/app/host_view_controller.h
+++ b/remoting/ios/app/host_view_controller.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_HOST_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_HOST_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_HOST_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_HOST_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
-#include "remoting/client/ios/display/gl_display_handler.h"
+#include "remoting/ios/display/gl_display_handler.h"
 
 @class RemotingClient;
 
@@ -20,4 +20,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_REMOTING_HOST_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_REMOTING_HOST_VIEW_CONTROLLER_H_
diff --git a/remoting/client/ios/app/host_view_controller.mm b/remoting/ios/app/host_view_controller.mm
similarity index 95%
rename from remoting/client/ios/app/host_view_controller.mm
rename to remoting/ios/app/host_view_controller.mm
index 5612581491ffce..30b19c417349ef 100644
--- a/remoting/client/ios/app/host_view_controller.mm
+++ b/remoting/ios/app/host_view_controller.mm
@@ -6,15 +6,15 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/host_view_controller.h"
+#import "remoting/ios/app/host_view_controller.h"
 
 #include <memory>
 
 #import <GLKit/GLKit.h>
 
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
-#import "remoting/client/ios/client_gestures.h"
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/client_gestures.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "remoting/client/gesture_interpreter.h"
 
diff --git a/remoting/client/ios/app/main.mm b/remoting/ios/app/main.mm
similarity index 94%
rename from remoting/client/ios/app/main.mm
rename to remoting/ios/app/main.mm
index 408b2888aa5850..d66bba0264a8fb 100644
--- a/remoting/client/ios/app/main.mm
+++ b/remoting/ios/app/main.mm
@@ -10,7 +10,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
-#import "remoting/client/ios/app/app_delegate.h"
+#import "remoting/ios/app/app_delegate.h"
 
 int main(int argc, char* argv[]) {
   // This class is designed to fulfill the dependents needs when it goes out of
diff --git a/remoting/client/ios/app/pin_entry_view.h b/remoting/ios/app/pin_entry_view.h
similarity index 82%
rename from remoting/client/ios/app/pin_entry_view.h
rename to remoting/ios/app/pin_entry_view.h
index 4c492c3c46ab43..acbf923d81e2bd 100644
--- a/remoting/client/ios/app/pin_entry_view.h
+++ b/remoting/ios/app/pin_entry_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_PIN_ENTRY_VIEW_H_
-#define REMOTING_CLIENT_IOS_APP_PIN_ENTRY_VIEW_H_
+#ifndef REMOTING_IOS_APP_PIN_ENTRY_VIEW_H_
+#define REMOTING_IOS_APP_PIN_ENTRY_VIEW_H_
 
 #import <UIKit/UIKit.h>
 
@@ -25,4 +25,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_PIN_ENTRY_VIEW_H_
+#endif  // REMOTING_IOS_APP_PIN_ENTRY_VIEW_H_
diff --git a/remoting/client/ios/app/pin_entry_view.mm b/remoting/ios/app/pin_entry_view.mm
similarity index 98%
rename from remoting/client/ios/app/pin_entry_view.mm
rename to remoting/ios/app/pin_entry_view.mm
index 9cfb2cd0b805e8..7660ffa21dac99 100644
--- a/remoting/client/ios/app/pin_entry_view.mm
+++ b/remoting/ios/app/pin_entry_view.mm
@@ -6,7 +6,7 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/pin_entry_view.h"
+#import "remoting/ios/app/pin_entry_view.h"
 
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 
diff --git a/remoting/client/ios/app/remoting_settings_view_controller.h b/remoting/ios/app/remoting_settings_view_controller.h
similarity index 62%
rename from remoting/client/ios/app/remoting_settings_view_controller.h
rename to remoting/ios/app/remoting_settings_view_controller.h
index 25fc047a76f9c1..7258c0a3c0c27f 100644
--- a/remoting/client/ios/app/remoting_settings_view_controller.h
+++ b/remoting/ios/app/remoting_settings_view_controller.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
 
 #import "ios/third_party/material_components_ios/src/components/Collections/src/MaterialCollections.h"
 
 @interface RemotingSettingsViewController : MDCCollectionViewController
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_REMOTING_SETTINGS_VIEW_CONTROLLER_H_
diff --git a/remoting/client/ios/app/remoting_settings_view_controller.mm b/remoting/ios/app/remoting_settings_view_controller.mm
similarity index 97%
rename from remoting/client/ios/app/remoting_settings_view_controller.mm
rename to remoting/ios/app/remoting_settings_view_controller.mm
index 1db1db01c8c9dd..e3a539cc4e7a6a 100644
--- a/remoting/client/ios/app/remoting_settings_view_controller.mm
+++ b/remoting/ios/app/remoting_settings_view_controller.mm
@@ -6,12 +6,12 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/remoting_settings_view_controller.h"
+#import "remoting/ios/app/remoting_settings_view_controller.h"
 
 #import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 #include "base/strings/stringprintf.h"
 #include "google_apis/google_api_keys.h"
diff --git a/remoting/client/ios/app/remoting_view_controller.h b/remoting/ios/app/remoting_view_controller.h
similarity index 60%
rename from remoting/client/ios/app/remoting_view_controller.h
rename to remoting/ios/app/remoting_view_controller.h
index f3188d7b4bd5bb..3e62bb2756b16a 100644
--- a/remoting/client/ios/app/remoting_view_controller.h
+++ b/remoting/ios/app/remoting_view_controller.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
-#define REMOTING_CLIENT_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
+#ifndef REMOTING_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
+#define REMOTING_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
 
 #import "ios/third_party/material_components_ios/src/components/FlexibleHeader/src/MaterialFlexibleHeader.h"
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 @interface RemotingViewController : MDCFlexibleHeaderContainerViewController
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
+#endif  // REMOTING_IOS_APP_REMOTING_VIEW_CONTROLLER_H_
diff --git a/remoting/client/ios/app/remoting_view_controller.mm b/remoting/ios/app/remoting_view_controller.mm
similarity index 94%
rename from remoting/client/ios/app/remoting_view_controller.mm
rename to remoting/ios/app/remoting_view_controller.mm
index bb3c50fd6497a9..627ffaf76fda75 100644
--- a/remoting/client/ios/app/remoting_view_controller.mm
+++ b/remoting/ios/app/remoting_view_controller.mm
@@ -6,21 +6,21 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/app/remoting_view_controller.h"
+#import "remoting/ios/app/remoting_view_controller.h"
 
 #import "base/mac/bind_objc_block.h"
 #import "ios/third_party/material_components_ios/src/components/AnimationTiming/src/MaterialAnimationTiming.h"
 #import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
 #import "ios/third_party/material_components_ios/src/components/Dialogs/src/MaterialDialogs.h"
 #import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
-#import "remoting/client/ios/app/client_connection_view_controller.h"
-#import "remoting/client/ios/app/host_collection_view_controller.h"
-#import "remoting/client/ios/app/host_view_controller.h"
-#import "remoting/client/ios/app/remoting_settings_view_controller.h"
-#import "remoting/client/ios/domain/client_session_details.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/app/client_connection_view_controller.h"
+#import "remoting/ios/app/host_collection_view_controller.h"
+#import "remoting/ios/app/host_view_controller.h"
+#import "remoting/ios/app/remoting_settings_view_controller.h"
+#import "remoting/ios/domain/client_session_details.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/Back.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/Back.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_1x_ios_36dp.png b/remoting/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_1x_ios_36dp.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_1x_ios_36dp.png
rename to remoting/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_1x_ios_36dp.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_2x_ios_36dp.png b/remoting/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_2x_ios_36dp.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_2x_ios_36dp.png
rename to remoting/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_2x_ios_36dp.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_3x_ios_36dp.png b/remoting/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_3x_ios_36dp.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_3x_ios_36dp.png
rename to remoting/ios/app/resources/Assets.xcassets/Back.imageset/ic_keyboard_arrow_left_white_3x_ios_36dp.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Contents.json b/remoting/ios/app/resources/Assets.xcassets/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/Settings.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/Settings.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_1x_ios_24dp.png b/remoting/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_1x_ios_24dp.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_1x_ios_24dp.png
rename to remoting/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_1x_ios_24dp.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_2x_ios_24dp.png b/remoting/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_2x_ios_24dp.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_2x_ios_24dp.png
rename to remoting/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_2x_ios_24dp.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_3x_ios_24dp.png b/remoting/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_3x_ios_24dp.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_3x_ios_24dp.png
rename to remoting/ios/app/resources/Assets.xcassets/Settings.imageset/ic_settings_white_3x_ios_24dp.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop.png b/remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png b/remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@2x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png b/remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop.imageset/ic_desktop@3x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png b/remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png b/remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@2x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png b/remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_desktop_windows.imageset/ic_desktop_windows@3x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@2x.png b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@2x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@2x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@3x.png b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@3x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen.imageset/ic_fullscreen@3x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit.png b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@2x.png b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@2x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@2x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@3x.png b/remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@3x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_fullscreen_exit.imageset/ic_fullscreen_exit@3x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse.png b/remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png b/remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@2x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png b/remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_mouse.imageset/ic_mouse@3x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/Contents.json b/remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/Contents.json
rename to remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png b/remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png b/remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_2x.png
diff --git a/remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png b/remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png
rename to remoting/ios/app/resources/Assets.xcassets/ic_touch_app.imageset/ic_touch_app_3x.png
diff --git a/remoting/client/ios/app/resources/BUILD.gn b/remoting/ios/app/resources/BUILD.gn
similarity index 100%
rename from remoting/client/ios/app/resources/BUILD.gn
rename to remoting/ios/app/resources/BUILD.gn
diff --git a/remoting/client/ios/app/resources/Info.plist b/remoting/ios/app/resources/Info.plist
similarity index 100%
rename from remoting/client/ios/app/resources/Info.plist
rename to remoting/ios/app/resources/Info.plist
diff --git a/remoting/client/ios/app/resources/LaunchScreen.storyboard b/remoting/ios/app/resources/LaunchScreen.storyboard
similarity index 100%
rename from remoting/client/ios/app/resources/LaunchScreen.storyboard
rename to remoting/ios/app/resources/LaunchScreen.storyboard
diff --git a/remoting/client/ios/app/resources/Remoting.entitlements b/remoting/ios/app/resources/Remoting.entitlements
similarity index 100%
rename from remoting/client/ios/app/resources/Remoting.entitlements
rename to remoting/ios/app/resources/Remoting.entitlements
diff --git a/remoting/client/ios/app/resources/chromium/Icon-120.png b/remoting/ios/app/resources/chromium/Icon-120.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-120.png
rename to remoting/ios/app/resources/chromium/Icon-120.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-152.png b/remoting/ios/app/resources/chromium/Icon-152.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-152.png
rename to remoting/ios/app/resources/chromium/Icon-152.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-167.png b/remoting/ios/app/resources/chromium/Icon-167.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-167.png
rename to remoting/ios/app/resources/chromium/Icon-167.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-180.png b/remoting/ios/app/resources/chromium/Icon-180.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-180.png
rename to remoting/ios/app/resources/chromium/Icon-180.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-29.png b/remoting/ios/app/resources/chromium/Icon-29.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-29.png
rename to remoting/ios/app/resources/chromium/Icon-29.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-40.png b/remoting/ios/app/resources/chromium/Icon-40.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-40.png
rename to remoting/ios/app/resources/chromium/Icon-40.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-58.png b/remoting/ios/app/resources/chromium/Icon-58.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-58.png
rename to remoting/ios/app/resources/chromium/Icon-58.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-76.png b/remoting/ios/app/resources/chromium/Icon-76.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-76.png
rename to remoting/ios/app/resources/chromium/Icon-76.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-80.png b/remoting/ios/app/resources/chromium/Icon-80.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-80.png
rename to remoting/ios/app/resources/chromium/Icon-80.png
diff --git a/remoting/client/ios/app/resources/chromium/Icon-87.png b/remoting/ios/app/resources/chromium/Icon-87.png
similarity index 100%
rename from remoting/client/ios/app/resources/chromium/Icon-87.png
rename to remoting/ios/app/resources/chromium/Icon-87.png
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/Contents.json b/remoting/ios/app/resources/launchscreen_images.xcassets/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/Contents.json
rename to remoting/ios/app/resources/launchscreen_images.xcassets/Contents.json
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo.png
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@2x.png
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_app_logo.imageset/launchscreen_app_logo@3x.png
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/Contents.json
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name.png
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@2x.png
diff --git a/remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png b/remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png
similarity index 100%
rename from remoting/client/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png
rename to remoting/ios/app/resources/launchscreen_images.xcassets/launchscreen_brand_name.imageset/launchscreen_brand_name@3x.png
diff --git a/remoting/client/ios/build/InfoPlist.strings.jinja2 b/remoting/ios/build/InfoPlist.strings.jinja2
similarity index 100%
rename from remoting/client/ios/build/InfoPlist.strings.jinja2
rename to remoting/ios/build/InfoPlist.strings.jinja2
diff --git a/remoting/client/ios/build/localizable_string_id_list.txt b/remoting/ios/build/localizable_string_id_list.txt
similarity index 100%
rename from remoting/client/ios/build/localizable_string_id_list.txt
rename to remoting/ios/build/localizable_string_id_list.txt
diff --git a/remoting/client/ios/client_gestures.h b/remoting/ios/client_gestures.h
similarity index 92%
rename from remoting/client/ios/client_gestures.h
rename to remoting/ios/client_gestures.h
index 45cfff4b464b31..132302e269fb26 100644
--- a/remoting/client/ios/client_gestures.h
+++ b/remoting/ios/client_gestures.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_CLIENT_GESTURES_H_
-#define REMOTING_CLIENT_IOS_CLIENT_GESTURES_H_
+#ifndef REMOTING_IOS_CLIENT_GESTURES_H_
+#define REMOTING_IOS_CLIENT_GESTURES_H_
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #include "base/logging.h"
-#import "remoting/client/ios/key_input.h"
+#import "remoting/ios/key_input.h"
 
 @class RemotingClient;
 
@@ -69,4 +69,4 @@ typedef NS_ENUM(NSInteger, MouseButton) {
 
 @end
 
-#endif  //  REMOTING_CLIENT_IOS_CLIENT_GESTURES_H_
+#endif  //  REMOTING_IOS_CLIENT_GESTURES_H_
diff --git a/remoting/client/ios/client_gestures.mm b/remoting/ios/client_gestures.mm
similarity index 99%
rename from remoting/client/ios/client_gestures.mm
rename to remoting/ios/client_gestures.mm
index f67beac120a2cc..f6e0be754de3c1 100644
--- a/remoting/client/ios/client_gestures.mm
+++ b/remoting/ios/client_gestures.mm
@@ -6,8 +6,8 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/client_gestures.h"
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/client_gestures.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "remoting/client/gesture_interpreter.h"
 
diff --git a/remoting/client/ios/display/BUILD.gn b/remoting/ios/display/BUILD.gn
similarity index 100%
rename from remoting/client/ios/display/BUILD.gn
rename to remoting/ios/display/BUILD.gn
diff --git a/remoting/client/ios/display/gl_demo_screen.h b/remoting/ios/display/gl_demo_screen.h
similarity index 84%
rename from remoting/client/ios/display/gl_demo_screen.h
rename to remoting/ios/display/gl_demo_screen.h
index e522bbd16dfab4..82045bc50203a0 100644
--- a/remoting/client/ios/display/gl_demo_screen.h
+++ b/remoting/ios/display/gl_demo_screen.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_DISPLAY_GL_DEMO_SCREEN_H_
-#define REMOTING_CLIENT_IOS_DISPLAY_GL_DEMO_SCREEN_H_
+#ifndef REMOTING_IOS_DISPLAY_GL_DEMO_SCREEN_H_
+#define REMOTING_IOS_DISPLAY_GL_DEMO_SCREEN_H_
 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
@@ -37,4 +37,4 @@ class GlDemoScreen : public Drawable {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_IOS_DISPLAY_GL_DEMO_SCREEN_H_
+#endif  // REMOTING_IOS_DISPLAY_GL_DEMO_SCREEN_H_
diff --git a/remoting/client/ios/display/gl_demo_screen.mm b/remoting/ios/display/gl_demo_screen.mm
similarity index 98%
rename from remoting/client/ios/display/gl_demo_screen.mm
rename to remoting/ios/display/gl_demo_screen.mm
index 4bb01679a3576d..c293fe5cacabf1 100644
--- a/remoting/client/ios/display/gl_demo_screen.mm
+++ b/remoting/ios/display/gl_demo_screen.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/ios/display/gl_demo_screen.h"
+#include "remoting/ios/display/gl_demo_screen.h"
 
 #include "base/logging.h"
 #include "remoting/client/display/canvas.h"
diff --git a/remoting/client/ios/display/gl_display_handler.h b/remoting/ios/display/gl_display_handler.h
similarity index 89%
rename from remoting/client/ios/display/gl_display_handler.h
rename to remoting/ios/display/gl_display_handler.h
index 62d681b89500e3..7bd513a5b04e66 100644
--- a/remoting/client/ios/display/gl_display_handler.h
+++ b/remoting/ios/display/gl_display_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_DISPLAY_GL_DISPLAY_HANDLER_H_
-#define REMOTING_CLIENT_IOS_DISPLAY_GL_DISPLAY_HANDLER_H_
+#ifndef REMOTING_IOS_DISPLAY_GL_DISPLAY_HANDLER_H_
+#define REMOTING_IOS_DISPLAY_GL_DISPLAY_HANDLER_H_
 
 #import <Foundation/Foundation.h>
 #import <GLKit/GLKit.h>
@@ -59,4 +59,4 @@ class CursorShapeStub;
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_DISPLAY_GL_DISPLAY_HANDLER_H_
+#endif  // REMOTING_IOS_DISPLAY_GL_DISPLAY_HANDLER_H_
diff --git a/remoting/client/ios/display/gl_display_handler.mm b/remoting/ios/display/gl_display_handler.mm
similarity index 98%
rename from remoting/client/ios/display/gl_display_handler.mm
rename to remoting/ios/display/gl_display_handler.mm
index 4f7ef51d4bccf2..c83d8b521be57a 100644
--- a/remoting/client/ios/display/gl_display_handler.mm
+++ b/remoting/ios/display/gl_display_handler.mm
@@ -8,11 +8,11 @@
 
 #include <array>
 
-#import "remoting/client/ios/display/gl_display_handler.h"
+#import "remoting/ios/display/gl_display_handler.h"
 
 #import "base/mac/bind_objc_block.h"
 #import "remoting/client/display/sys_opengl.h"
-#import "remoting/client/ios/display/gl_demo_screen.h"
+#import "remoting/ios/display/gl_demo_screen.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
diff --git a/remoting/client/ios/domain/BUILD.gn b/remoting/ios/domain/BUILD.gn
similarity index 100%
rename from remoting/client/ios/domain/BUILD.gn
rename to remoting/ios/domain/BUILD.gn
diff --git a/remoting/client/ios/domain/client_session_details.h b/remoting/ios/domain/client_session_details.h
similarity index 83%
rename from remoting/client/ios/domain/client_session_details.h
rename to remoting/ios/domain/client_session_details.h
index 349987de1451e5..7309892b608922 100644
--- a/remoting/client/ios/domain/client_session_details.h
+++ b/remoting/ios/domain/client_session_details.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_DOMAIN_CLIENT_SESSION_DETAILS_H_
-#define REMOTING_CLIENT_IOS_DOMAIN_CLIENT_SESSION_DETAILS_H_
+#ifndef REMOTING_IOS_DOMAIN_CLIENT_SESSION_DETAILS_H_
+#define REMOTING_IOS_DOMAIN_CLIENT_SESSION_DETAILS_H_
 
 #import <Foundation/Foundation.h>
 
@@ -32,4 +32,4 @@ typedef NS_ENUM(NSInteger, SessionState) {
 
 @end
 
-#endif  //  REMOTING_CLIENT_IOS_DOMAIN_CLIENT_SESSION_DETAILS_H_
+#endif  //  REMOTING_IOS_DOMAIN_CLIENT_SESSION_DETAILS_H_
diff --git a/remoting/client/ios/domain/client_session_details.mm b/remoting/ios/domain/client_session_details.mm
similarity index 83%
rename from remoting/client/ios/domain/client_session_details.mm
rename to remoting/ios/domain/client_session_details.mm
index 71a393557ec537..7e73b95dd25972 100644
--- a/remoting/client/ios/domain/client_session_details.mm
+++ b/remoting/ios/domain/client_session_details.mm
@@ -6,9 +6,9 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/domain/client_session_details.h"
+#import "remoting/ios/domain/client_session_details.h"
 
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/domain/host_info.h"
 
 @implementation ClientSessionDetails
 
diff --git a/remoting/client/ios/domain/host_info.h b/remoting/ios/domain/host_info.h
similarity index 89%
rename from remoting/client/ios/domain/host_info.h
rename to remoting/ios/domain/host_info.h
index ad646a1b28cf29..6b6ca8f76050ce 100644
--- a/remoting/client/ios/domain/host_info.h
+++ b/remoting/ios/domain/host_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_DOMAIN_HOST_INFO_H_
-#define REMOTING_CLIENT_IOS_DOMAIN_HOST_INFO_H_
+#ifndef REMOTING_IOS_DOMAIN_HOST_INFO_H_
+#define REMOTING_IOS_DOMAIN_HOST_INFO_H_
 
 #import <Foundation/Foundation.h>
 
@@ -33,4 +33,4 @@
 
 @end
 
-#endif  //  REMOTING_CLIENT_IOS_DOMAIN_HOST_INFO_H_
+#endif  //  REMOTING_IOS_DOMAIN_HOST_INFO_H_
diff --git a/remoting/client/ios/domain/host_info.mm b/remoting/ios/domain/host_info.mm
similarity index 98%
rename from remoting/client/ios/domain/host_info.mm
rename to remoting/ios/domain/host_info.mm
index b90c0652ac8bd0..36cf191bd57f4c 100644
--- a/remoting/client/ios/domain/host_info.mm
+++ b/remoting/ios/domain/host_info.mm
@@ -6,7 +6,7 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/domain/host_info.h"
 
 @implementation HostInfo
 
diff --git a/remoting/client/ios/domain/user_info.h b/remoting/ios/domain/user_info.h
similarity index 85%
rename from remoting/client/ios/domain/user_info.h
rename to remoting/ios/domain/user_info.h
index 8c463317839959..c8f9e8eb17cbe6 100644
--- a/remoting/client/ios/domain/user_info.h
+++ b/remoting/ios/domain/user_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_DOMAIN_USER_INFO_H_
-#define REMOTING_CLIENT_IOS_DOMAIN_USER_INFO_H_
+#ifndef REMOTING_IOS_DOMAIN_USER_INFO_H_
+#define REMOTING_IOS_DOMAIN_USER_INFO_H_
 
 #import <Foundation/Foundation.h>
 
@@ -27,4 +27,4 @@
 
 @end
 
-#endif  //  REMOTING_CLIENT_IOS_DOMAIN_USER_INFO_H_
+#endif  //  REMOTING_IOS_DOMAIN_USER_INFO_H_
diff --git a/remoting/client/ios/domain/user_info.mm b/remoting/ios/domain/user_info.mm
similarity index 96%
rename from remoting/client/ios/domain/user_info.mm
rename to remoting/ios/domain/user_info.mm
index 3257fd22551bbb..eeecee8ff30d37 100644
--- a/remoting/client/ios/domain/user_info.mm
+++ b/remoting/ios/domain/user_info.mm
@@ -6,7 +6,7 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/domain/user_info.h"
+#import "remoting/ios/domain/user_info.h"
 
 @implementation UserInfo
 
diff --git a/remoting/client/ios/facade/BUILD.gn b/remoting/ios/facade/BUILD.gn
similarity index 95%
rename from remoting/client/ios/facade/BUILD.gn
rename to remoting/ios/facade/BUILD.gn
index a02d4231bd06e6..bbc9b1c0fdf2ac 100644
--- a/remoting/client/ios/facade/BUILD.gn
+++ b/remoting/ios/facade/BUILD.gn
@@ -23,7 +23,7 @@ source_set("facade") {
   deps = [
     "//base",
     "//remoting/base:authorization",
-    "//remoting/client/ios/domain",
+    "//remoting/ios/domain",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
diff --git a/remoting/client/ios/facade/host_info.cc b/remoting/ios/facade/host_info.cc
similarity index 97%
rename from remoting/client/ios/facade/host_info.cc
rename to remoting/ios/facade/host_info.cc
index c036e535baf94d..6e14be4354ea58 100644
--- a/remoting/client/ios/facade/host_info.cc
+++ b/remoting/ios/facade/host_info.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/ios/facade/host_info.h"
+#include "remoting/ios/facade/host_info.h"
 
 #include "base/logging.h"
 
diff --git a/remoting/client/ios/facade/host_info.h b/remoting/ios/facade/host_info.h
similarity index 87%
rename from remoting/client/ios/facade/host_info.h
rename to remoting/ios/facade/host_info.h
index 1915bf273a664f..e27132ceb097dd 100644
--- a/remoting/client/ios/facade/host_info.h
+++ b/remoting/ios/facade/host_info.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_FACADE_HOST_INFO_H_
-#define REMOTING_CLIENT_IOS_FACADE_HOST_INFO_H_
+#ifndef REMOTING_IOS_FACADE_HOST_INFO_H_
+#define REMOTING_IOS_FACADE_HOST_INFO_H_
 
 #include <string>
 #include <vector>
@@ -38,4 +38,4 @@ struct HostInfo {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_IOS_FACADE_HOST_INFO_H_
+#endif  // REMOTING_IOS_FACADE_HOST_INFO_H_
diff --git a/remoting/client/ios/facade/host_list_fetcher.cc b/remoting/ios/facade/host_list_fetcher.cc
similarity index 98%
rename from remoting/client/ios/facade/host_list_fetcher.cc
rename to remoting/ios/facade/host_list_fetcher.cc
index e7c4f38ac3c204..9342399a889068 100644
--- a/remoting/client/ios/facade/host_list_fetcher.cc
+++ b/remoting/ios/facade/host_list_fetcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/ios/facade/host_list_fetcher.h"
+#include "remoting/ios/facade/host_list_fetcher.h"
 
 #include <thread>
 
diff --git a/remoting/client/ios/facade/host_list_fetcher.h b/remoting/ios/facade/host_list_fetcher.h
similarity index 91%
rename from remoting/client/ios/facade/host_list_fetcher.h
rename to remoting/ios/facade/host_list_fetcher.h
index af1f8dc44e2b7c..3e89bac6223230 100644
--- a/remoting/client/ios/facade/host_list_fetcher.h
+++ b/remoting/ios/facade/host_list_fetcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_FACADE_HOST_LIST_FETCHER_H_
-#define REMOTING_CLIENT_IOS_FACADE_HOST_LIST_FETCHER_H_
+#ifndef REMOTING_IOS_FACADE_HOST_LIST_FETCHER_H_
+#define REMOTING_IOS_FACADE_HOST_LIST_FETCHER_H_
 
 #include <memory>
 #include <string>
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "remoting/client/ios/facade/host_info.h"
+#include "remoting/ios/facade/host_info.h"
 
 namespace remoting {
 
@@ -66,4 +66,4 @@ class HostListFetcher : public net::URLFetcherDelegate {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_IOS_FACADE_HOST_LIST_FETCHER_H_
+#endif  // REMOTING_IOS_FACADE_HOST_LIST_FETCHER_H_
diff --git a/remoting/client/ios/facade/ios_client_runtime_delegate.h b/remoting/ios/facade/ios_client_runtime_delegate.h
similarity index 81%
rename from remoting/client/ios/facade/ios_client_runtime_delegate.h
rename to remoting/ios/facade/ios_client_runtime_delegate.h
index 032f3b7f43454e..ed92c92483dc3d 100644
--- a/remoting/client/ios/facade/ios_client_runtime_delegate.h
+++ b/remoting/ios/facade/ios_client_runtime_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_FACADE_IOS_CLIENT_RUNTIME_DELEGATE_H_
-#define REMOTING_CLIENT_IOS_FACADE_IOS_CLIENT_RUNTIME_DELEGATE_H_
+#ifndef REMOTING_IOS_FACADE_IOS_CLIENT_RUNTIME_DELEGATE_H_
+#define REMOTING_IOS_FACADE_IOS_CLIENT_RUNTIME_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -33,4 +33,4 @@ class IosClientRuntimeDelegate : public ChromotingClientRuntime::Delegate {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_IOS_FACADE_CLIENT_RUNTIME_DELEGATE_H_
+#endif  // REMOTING_IOS_FACADE_CLIENT_RUNTIME_DELEGATE_H_
diff --git a/remoting/client/ios/facade/ios_client_runtime_delegate.mm b/remoting/ios/facade/ios_client_runtime_delegate.mm
similarity index 92%
rename from remoting/client/ios/facade/ios_client_runtime_delegate.mm
rename to remoting/ios/facade/ios_client_runtime_delegate.mm
index b773b2aa1b1ccf..ebb3c798b4cff5 100644
--- a/remoting/client/ios/facade/ios_client_runtime_delegate.mm
+++ b/remoting/ios/facade/ios_client_runtime_delegate.mm
@@ -6,11 +6,11 @@
 #error "This file requires ARC support."
 #endif
 
-#include "remoting/client/ios/facade/ios_client_runtime_delegate.h"
+#include "remoting/ios/facade/ios_client_runtime_delegate.h"
 
 #import "base/mac/bind_objc_block.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
diff --git a/remoting/client/ios/facade/remoting_authentication.h b/remoting/ios/facade/remoting_authentication.h
similarity index 87%
rename from remoting/client/ios/facade/remoting_authentication.h
rename to remoting/ios/facade/remoting_authentication.h
index 1ab7e33aca0a3d..5eeed4f4925a16 100644
--- a/remoting/client/ios/facade/remoting_authentication.h
+++ b/remoting/ios/facade/remoting_authentication.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_FACADE_REMOTING_AUTHENTICATION_H_
-#define REMOTING_CLIENT_IOS_FACADE_REMOTING_AUTHENTICATION_H_
+#ifndef REMOTING_IOS_FACADE_REMOTING_AUTHENTICATION_H_
+#define REMOTING_IOS_FACADE_REMOTING_AUTHENTICATION_H_
 
 #import "remoting/client/chromoting_client_runtime.h"
-#import "remoting/client/ios/domain/user_info.h"
+#import "remoting/ios/domain/user_info.h"
 
 #include "base/memory/weak_ptr.h"
 #include "remoting/base/oauth_token_getter.h"
@@ -48,4 +48,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_FACADE_REMOTING_AUTHENTICATION_H_
+#endif  // REMOTING_IOS_FACADE_REMOTING_AUTHENTICATION_H_
diff --git a/remoting/client/ios/facade/remoting_authentication.mm b/remoting/ios/facade/remoting_authentication.mm
similarity index 95%
rename from remoting/client/ios/facade/remoting_authentication.mm
rename to remoting/ios/facade/remoting_authentication.mm
index 5abe68fbf6d336..9327511208ebab 100644
--- a/remoting/client/ios/facade/remoting_authentication.mm
+++ b/remoting/ios/facade/remoting_authentication.mm
@@ -6,17 +6,17 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_authentication.h"
 
 #import <Foundation/Foundation.h>
 #import <Security/Security.h>
 
 #import "base/mac/bind_objc_block.h"
-#import "remoting/client/ios/facade/host_info.h"
-#import "remoting/client/ios/facade/host_list_fetcher.h"
-#import "remoting/client/ios/facade/ios_client_runtime_delegate.h"
-#import "remoting/client/ios/facade/remoting_service.h"
-#import "remoting/client/ios/keychain_wrapper.h"
+#import "remoting/ios/facade/host_info.h"
+#import "remoting/ios/facade/host_list_fetcher.h"
+#import "remoting/ios/facade/ios_client_runtime_delegate.h"
+#import "remoting/ios/facade/remoting_service.h"
+#import "remoting/ios/keychain_wrapper.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
diff --git a/remoting/client/ios/facade/remoting_service.h b/remoting/ios/facade/remoting_service.h
similarity index 90%
rename from remoting/client/ios/facade/remoting_service.h
rename to remoting/ios/facade/remoting_service.h
index 2a65639c2e7882..33f9fd999104ac 100644
--- a/remoting/client/ios/facade/remoting_service.h
+++ b/remoting/ios/facade/remoting_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_FACADE_REMOTING_SERVICE_H_
-#define REMOTING_CLIENT_IOS_FACADE_REMOTING_SERVICE_H_
+#ifndef REMOTING_IOS_FACADE_REMOTING_SERVICE_H_
+#define REMOTING_IOS_FACADE_REMOTING_SERVICE_H_
 
 #import "remoting/client/chromoting_client_runtime.h"
 
@@ -47,4 +47,4 @@ extern NSString* const kUserInfo;
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_FACADE_REMOTING_SERVICE_H_
+#endif  // REMOTING_IOS_FACADE_REMOTING_SERVICE_H_
diff --git a/remoting/client/ios/facade/remoting_service.mm b/remoting/ios/facade/remoting_service.mm
similarity index 91%
rename from remoting/client/ios/facade/remoting_service.mm
rename to remoting/ios/facade/remoting_service.mm
index 20f499fa01a17f..d4c338c5549631 100644
--- a/remoting/client/ios/facade/remoting_service.mm
+++ b/remoting/ios/facade/remoting_service.mm
@@ -6,20 +6,20 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/facade/remoting_service.h"
+#import "remoting/ios/facade/remoting_service.h"
 
 #import <Foundation/Foundation.h>
 #import <Security/Security.h>
 
 #import "base/mac/bind_objc_block.h"
-#import "remoting/client/ios/domain/host_info.h"
-#import "remoting/client/ios/domain/user_info.h"
-#import "remoting/client/ios/facade/host_info.h"
-#import "remoting/client/ios/facade/host_list_fetcher.h"
-#import "remoting/client/ios/facade/ios_client_runtime_delegate.h"
-#import "remoting/client/ios/facade/remoting_authentication.h"
-#import "remoting/client/ios/facade/remoting_service.h"
-#import "remoting/client/ios/keychain_wrapper.h"
+#import "remoting/ios/domain/host_info.h"
+#import "remoting/ios/domain/user_info.h"
+#import "remoting/ios/facade/host_info.h"
+#import "remoting/ios/facade/host_list_fetcher.h"
+#import "remoting/ios/facade/ios_client_runtime_delegate.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
+#import "remoting/ios/keychain_wrapper.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
diff --git a/remoting/client/ios/host_preferences.h b/remoting/ios/host_preferences.h
similarity index 85%
rename from remoting/client/ios/host_preferences.h
rename to remoting/ios/host_preferences.h
index 553167b9e72000..d8dba18b724060 100644
--- a/remoting/client/ios/host_preferences.h
+++ b/remoting/ios/host_preferences.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_HOST_PREFERENCES_H_
-#define REMOTING_CLIENT_IOS_HOST_PREFERENCES_H_
+#ifndef REMOTING_IOS_HOST_PREFERENCES_H_
+#define REMOTING_IOS_HOST_PREFERENCES_H_
 
 #import <CoreData/CoreData.h>
 
@@ -25,4 +25,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_HOST_PREFERENCES_H_
+#endif  // REMOTING_IOS_HOST_PREFERENCES_H_
diff --git a/remoting/client/ios/host_preferences.mm b/remoting/ios/host_preferences.mm
similarity index 95%
rename from remoting/client/ios/host_preferences.mm
rename to remoting/ios/host_preferences.mm
index 59ba32272ef418..d0c0efc6b7cb51 100644
--- a/remoting/client/ios/host_preferences.mm
+++ b/remoting/ios/host_preferences.mm
@@ -6,10 +6,10 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/host_preferences.h"
+#import "remoting/ios/host_preferences.h"
 
 #import "base/logging.h"
-#import "remoting/client/ios/host_preferences_persistence.h"
+#import "remoting/ios/host_preferences_persistence.h"
 
 namespace {
 static NSString* const kHostPreferencesDataKeyHostDictionary =
diff --git a/remoting/client/ios/host_preferences_persistence.h b/remoting/ios/host_preferences_persistence.h
similarity index 74%
rename from remoting/client/ios/host_preferences_persistence.h
rename to remoting/ios/host_preferences_persistence.h
index b5484ebfb51988..486b64fdc8e984 100644
--- a/remoting/client/ios/host_preferences_persistence.h
+++ b/remoting/ios/host_preferences_persistence.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_HOST_PREFERENCES_PERSISTENCE_H_
-#define REMOTING_CLIENT_IOS_HOST_PREFERENCES_PERSISTENCE_H_
+#ifndef REMOTING_IOS_HOST_PREFERENCES_PERSISTENCE_H_
+#define REMOTING_IOS_HOST_PREFERENCES_PERSISTENCE_H_
 
 #import <CoreData/CoreData.h>
 
@@ -18,4 +18,4 @@ NSData* ReadHostPreferencesFromKeychain();
 }  // namespace ios
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_IOS_HOST_PREFERENCES_PERSISTENCE_H_
+#endif  // REMOTING_IOS_HOST_PREFERENCES_PERSISTENCE_H_
diff --git a/remoting/client/ios/host_preferences_persistence_chromium.mm b/remoting/ios/host_preferences_persistence_chromium.mm
similarity index 92%
rename from remoting/client/ios/host_preferences_persistence_chromium.mm
rename to remoting/ios/host_preferences_persistence_chromium.mm
index fee56097b7f171..a2258db458ad55 100644
--- a/remoting/client/ios/host_preferences_persistence_chromium.mm
+++ b/remoting/ios/host_preferences_persistence_chromium.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "remoting/client/ios/host_preferences_persistence.h"
+#import "remoting/ios/host_preferences_persistence.h"
 
 #import "base/logging.h"
 
diff --git a/remoting/client/ios/key_input.h b/remoting/ios/key_input.h
similarity index 89%
rename from remoting/client/ios/key_input.h
rename to remoting/ios/key_input.h
index da5fa99dccaf21..f48d4ade0e5a22 100644
--- a/remoting/client/ios/key_input.h
+++ b/remoting/ios/key_input.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_KEY_INPUT_H_
-#define REMOTING_CLIENT_IOS_KEY_INPUT_H_
+#ifndef REMOTING_IOS_KEY_INPUT_H_
+#define REMOTING_IOS_KEY_INPUT_H_
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
@@ -36,4 +36,4 @@
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_KEY_INPUT_H_
+#endif  // REMOTING_IOS_KEY_INPUT_H_
diff --git a/remoting/client/ios/key_input.mm b/remoting/ios/key_input.mm
similarity index 98%
rename from remoting/client/ios/key_input.mm
rename to remoting/ios/key_input.mm
index eb6e6c7fb5a5bd..00b44d94ddec72 100644
--- a/remoting/client/ios/key_input.mm
+++ b/remoting/ios/key_input.mm
@@ -6,8 +6,8 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/key_input.h"
-#import "remoting/client/ios/key_map_us.h"
+#import "remoting/ios/key_input.h"
+#import "remoting/ios/key_map_us.h"
 
 @interface KeyInput (Private)
 - (void)transmitAppropriateKeyCode:(NSString*)text;
diff --git a/remoting/client/ios/key_input_unittest.mm b/remoting/ios/key_input_unittest.mm
similarity index 98%
rename from remoting/client/ios/key_input_unittest.mm
rename to remoting/ios/key_input_unittest.mm
index 6fb0e71279d11d..266b454863fb2c 100644
--- a/remoting/client/ios/key_input_unittest.mm
+++ b/remoting/ios/key_input_unittest.mm
@@ -6,8 +6,8 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/key_input.h"
-#import "remoting/client/ios/key_map_us.h"
+#import "remoting/ios/key_input.h"
+#import "remoting/ios/key_map_us.h"
 
 #include <vector>
 
diff --git a/remoting/client/ios/key_map_us.h b/remoting/ios/key_map_us.h
similarity index 97%
rename from remoting/client/ios/key_map_us.h
rename to remoting/ios/key_map_us.h
index 3363995effb166..1087d76de5c5fa 100644
--- a/remoting/client/ios/key_map_us.h
+++ b/remoting/ios/key_map_us.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_KEY_MAP_US_H_
-#define REMOTING_CLIENT_IOS_KEY_MAP_US_H_
+#ifndef REMOTING_IOS_KEY_MAP_US_H_
+#define REMOTING_IOS_KEY_MAP_US_H_
 
 // A mapping for the US keyboard on a US IPAD to Chromoting Scancodes.
 
@@ -157,4 +157,4 @@ const KeyCodeMeta kKeyCodeMetaUS[] = {
     {0x07004c, NO}    //          DEL
 };
 
-#endif  // REMOTING_CLIENT_IOS_KEY_MAP_US_H_
+#endif  // REMOTING_IOS_KEY_MAP_US_H_
diff --git a/remoting/client/ios/keychain_wrapper.h b/remoting/ios/keychain_wrapper.h
similarity index 82%
rename from remoting/client/ios/keychain_wrapper.h
rename to remoting/ios/keychain_wrapper.h
index d92b6ae91df6ec..e2cabbb4c173bb 100644
--- a/remoting/client/ios/keychain_wrapper.h
+++ b/remoting/ios/keychain_wrapper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_KEYCHAIN_WRAPPER_H_
-#define REMOTING_CLIENT_IOS_KEYCHAIN_WRAPPER_H_
+#ifndef REMOTING_IOS_KEYCHAIN_WRAPPER_H_
+#define REMOTING_IOS_KEYCHAIN_WRAPPER_H_
 
 #import <Foundation/Foundation.h>
 
@@ -23,4 +23,4 @@
 
 @end
 
-#endif  //  REMOTING_CLIENT_IOS_KEYCHAIN_WRAPPER_H_
+#endif  //  REMOTING_IOS_KEYCHAIN_WRAPPER_H_
diff --git a/remoting/client/ios/keychain_wrapper.mm b/remoting/ios/keychain_wrapper.mm
similarity index 98%
rename from remoting/client/ios/keychain_wrapper.mm
rename to remoting/ios/keychain_wrapper.mm
index c1ae602c8ce20a..1992e4595302d7 100644
--- a/remoting/client/ios/keychain_wrapper.mm
+++ b/remoting/ios/keychain_wrapper.mm
@@ -6,9 +6,9 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/keychain_wrapper.h"
+#import "remoting/ios/keychain_wrapper.h"
 
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/domain/host_info.h"
 
 static const UInt8 kKeychainItemIdentifier[] = "org.chromium.RemoteDesktop\0";
 
diff --git a/remoting/client/ios/session/BUILD.gn b/remoting/ios/session/BUILD.gn
similarity index 89%
rename from remoting/client/ios/session/BUILD.gn
rename to remoting/ios/session/BUILD.gn
index e927ffb72b1810..faaef6363db64a 100644
--- a/remoting/client/ios/session/BUILD.gn
+++ b/remoting/ios/session/BUILD.gn
@@ -17,8 +17,8 @@ source_set("session") {
   deps = [
     "//base",
     "//remoting/client",
-    "//remoting/client/ios/display",
-    "//remoting/client/ios/domain",
+    "//remoting/ios/display",
+    "//remoting/ios/domain",
     "//remoting/protocol",
   ]
 
diff --git a/remoting/client/ios/session/remoting_client.h b/remoting/ios/session/remoting_client.h
similarity index 92%
rename from remoting/client/ios/session/remoting_client.h
rename to remoting/ios/session/remoting_client.h
index 09a3a7b8462e38..6dbe9f2b1f3d8c 100644
--- a/remoting/client/ios/session/remoting_client.h
+++ b/remoting/ios/session/remoting_client.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_SESSION_REMOTING_CLIENT_H_
-#define REMOTING_CLIENT_IOS_SESSION_REMOTING_CLIENT_H_
+#ifndef REMOTING_IOS_SESSION_REMOTING_CLIENT_H_
+#define REMOTING_IOS_SESSION_REMOTING_CLIENT_H_
 
 #import <Foundation/Foundation.h>
 
-#import "remoting/client/ios/display/gl_display_handler.h"
+#import "remoting/ios/display/gl_display_handler.h"
 
 #include "remoting/protocol/connection_to_host.h"
 
@@ -80,4 +80,4 @@ extern NSString* const kHostSessionPin;
 
 @end
 
-#endif  // REMOTING_CLIENT_IOS_SESSION_REMOTING_CLIENT_H_
+#endif  // REMOTING_IOS_SESSION_REMOTING_CLIENT_H_
diff --git a/remoting/client/ios/session/remoting_client.mm b/remoting/ios/session/remoting_client.mm
similarity index 96%
rename from remoting/client/ios/session/remoting_client.mm
rename to remoting/ios/session/remoting_client.mm
index 3338641dd05570..6429c2cd4e1903 100644
--- a/remoting/client/ios/session/remoting_client.mm
+++ b/remoting/ios/session/remoting_client.mm
@@ -6,22 +6,22 @@
 #error "This file requires ARC support."
 #endif
 
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include <memory>
 
 #import "base/mac/bind_objc_block.h"
 #import "ios/third_party/material_components_ios/src/components/Dialogs/src/MaterialDialogs.h"
-#import "remoting/client/ios/display/gl_display_handler.h"
-#import "remoting/client/ios/domain/client_session_details.h"
-#import "remoting/client/ios/domain/host_info.h"
+#import "remoting/ios/display/gl_display_handler.h"
+#import "remoting/ios/domain/client_session_details.h"
+#import "remoting/ios/domain/host_info.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/client/chromoting_client_runtime.h"
 #include "remoting/client/chromoting_session.h"
 #include "remoting/client/connect_to_host_info.h"
 #include "remoting/client/gesture_interpreter.h"
-#include "remoting/client/ios/session/remoting_client_session_delegate.h"
+#include "remoting/ios/session/remoting_client_session_delegate.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/video_renderer.h"
 
diff --git a/remoting/client/ios/session/remoting_client_session_delegate.h b/remoting/ios/session/remoting_client_session_delegate.h
similarity index 87%
rename from remoting/client/ios/session/remoting_client_session_delegate.h
rename to remoting/ios/session/remoting_client_session_delegate.h
index ab0b9efb873420..646f0f3425e7e7 100644
--- a/remoting/client/ios/session/remoting_client_session_delegate.h
+++ b/remoting/ios/session/remoting_client_session_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_CLIENT_IOS_SESSION_REMOTING_CLIENT_SESSION_DELEGATE_H_
-#define REMOTING_CLIENT_IOS_SESSION_REMOTING_CLIENT_SESSION_DELEGATE_H_
+#ifndef REMOTING_IOS_SESSION_REMOTING_CLIENT_SESSION_DELEGATE_H_
+#define REMOTING_IOS_SESSION_REMOTING_CLIENT_SESSION_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
@@ -48,4 +48,4 @@ class RemotingClientSessonDelegate : public ChromotingSession::Delegate {
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_IOS_SESSION_REMOTING_CLIENT_SESSION_DELEGATE_H_
+#endif  // REMOTING_IOS_SESSION_REMOTING_CLIENT_SESSION_DELEGATE_H_
diff --git a/remoting/client/ios/session/remoting_client_session_delegate.mm b/remoting/ios/session/remoting_client_session_delegate.mm
similarity index 95%
rename from remoting/client/ios/session/remoting_client_session_delegate.mm
rename to remoting/ios/session/remoting_client_session_delegate.mm
index ffcf132946d06e..b9f2acfa43d827 100644
--- a/remoting/client/ios/session/remoting_client_session_delegate.mm
+++ b/remoting/ios/session/remoting_client_session_delegate.mm
@@ -6,9 +6,9 @@
 #error "This file requires ARC support."
 #endif
 
-#include "remoting/client/ios/session/remoting_client_session_delegate.h"
+#include "remoting/ios/session/remoting_client_session_delegate.h"
 
-#import "remoting/client/ios/session/remoting_client.h"
+#import "remoting/ios/session/remoting_client.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/client/chromoting_client_runtime.h"