diff --git a/src/iOS/Services/AppInfoService.cs b/src/iOS.Core/Services/AppInfoService.cs
similarity index 93%
rename from src/iOS/Services/AppInfoService.cs
rename to src/iOS.Core/Services/AppInfoService.cs
index 0f372c50f..090a57456 100644
--- a/src/iOS/Services/AppInfoService.cs
+++ b/src/iOS.Core/Services/AppInfoService.cs
@@ -2,7 +2,7 @@
 using Bit.App.Abstractions;
 using Foundation;
 
-namespace Bit.iOS.Services
+namespace Bit.iOS.Core.Services
 {
     public class AppInfoService : IAppInfoService
     {
diff --git a/src/iOS.Core/iOS.Core.csproj b/src/iOS.Core/iOS.Core.csproj
index cf24a88da..99f6f318a 100644
--- a/src/iOS.Core/iOS.Core.csproj
+++ b/src/iOS.Core/iOS.Core.csproj
@@ -86,6 +86,7 @@
     <Compile Include="Controllers\ExtendedUIViewController.cs" />
     <Compile Include="HockeyAppCrashManagerDelegate.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Services\AppInfoService.cs" />
     <Compile Include="Services\NoopDeviceActionService.cs" />
     <Compile Include="Services\DeviceInfoService.cs" />
     <Compile Include="Services\KeyChainStorageService.cs" />
diff --git a/src/iOS.Extension/LoadingViewController.cs b/src/iOS.Extension/LoadingViewController.cs
index c2501157b..e1fc942ee 100644
--- a/src/iOS.Extension/LoadingViewController.cs
+++ b/src/iOS.Extension/LoadingViewController.cs
@@ -280,17 +280,18 @@ namespace Bit.iOS.Extension
             container.RegisterSingleton<ICollectionService, CollectionService>();
             container.RegisterSingleton<ICipherService, CipherService>();
             container.RegisterSingleton<ISyncService, SyncService>();
-            container.RegisterSingleton<IPasswordGenerationService, PasswordGenerationService>();
+            container.RegisterSingleton<IDeviceActionService, NoopDeviceActionService>();
             container.RegisterSingleton<IAppIdService, AppIdService>();
+            container.RegisterSingleton<IPasswordGenerationService, PasswordGenerationService>();
             container.RegisterSingleton<ILockService, LockService>();
+            container.RegisterSingleton<IAppInfoService, AppInfoService>();
             container.RegisterSingleton<IGoogleAnalyticsService, GoogleAnalyticsService>();
+            container.RegisterSingleton<IDeviceInfoService, DeviceInfoService>();
             container.RegisterSingleton<ILocalizeService, LocalizeService>();
             container.RegisterSingleton<ILogService, LogService>();
             container.RegisterSingleton<IHttpService, HttpService>();
             container.RegisterSingleton<ITokenService, TokenService>();
             container.RegisterSingleton<ISettingsService, SettingsService>();
-            container.RegisterSingleton<IDeviceInfoService, DeviceInfoService>();
-            container.RegisterSingleton<IDeviceActionService, NoopDeviceActionService>();
             container.RegisterSingleton<IAppSettingsService, AppSettingsService>();
 
             // Repositories
@@ -299,9 +300,12 @@ namespace Bit.iOS.Extension
             container.RegisterSingleton<ICipherRepository, CipherRepository>();
             container.RegisterSingleton<IAttachmentRepository, AttachmentRepository>();
             container.RegisterSingleton<IConnectApiRepository, ConnectApiRepository>();
-            container.RegisterSingleton<ISettingsRepository, SettingsRepository>();
+            container.RegisterSingleton<IDeviceApiRepository, DeviceApiRepository>();
             container.RegisterSingleton<IAccountsApiRepository, AccountsApiRepository>();
             container.RegisterSingleton<ICipherApiRepository, CipherApiRepository>();
+            container.RegisterSingleton<ISettingsRepository, SettingsRepository>();
+            container.RegisterSingleton<ISettingsApiRepository, SettingsApiRepository>();
+            container.RegisterSingleton<ITwoFactorApiRepository, TwoFactorApiRepository>();
             container.RegisterSingleton<ISyncApiRepository, SyncApiRepository>();
             container.RegisterSingleton<ICollectionRepository, CollectionRepository>();
             container.RegisterSingleton<ICipherCollectionRepository, CipherCollectionRepository>();
diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj
index b78aee041..19d137f31 100644
--- a/src/iOS/iOS.csproj
+++ b/src/iOS/iOS.csproj
@@ -234,7 +234,6 @@
     <Compile Include="Controls\ExtendedPickerRenderer.cs" />
     <Compile Include="Controls\ExtendedEntryRenderer.cs" />
     <Compile Include="Controls\ExtendedTabbedPageRenderer.cs" />
-    <Compile Include="Services\AppInfoService.cs" />
     <Compile Include="Services\DeviceActionService.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />