Re-organize projects.

bitbound · Sep 13, 2024 · e685814 · e685814
1 parent 60e1b2d
commit e685814
Show file tree

Hide file tree

Showing 105 changed files with 21 additions and 21 deletions.
diff --git a/...olR.Web.Client/ControlR.Web.Client.csproj → ...olR.Web.Client/ControlR.Web.Client.csproj b/...olR.Web.Client/ControlR.Web.Client.csproj → ...olR.Web.Client/ControlR.Web.Client.csproj
diff --git a/.../ControlR.Web.Client/Enums/ControlMode.cs → ControlR.Web.Client/Enums/ControlMode.cs b/.../ControlR.Web.Client/Enums/ControlMode.cs → ControlR.Web.Client/Enums/ControlMode.cs
diff --git a/...ControlR.Web.Client/Enums/KeypairState.cs → ControlR.Web.Client/Enums/KeypairState.cs b/...ControlR.Web.Client/Enums/KeypairState.cs → ControlR.Web.Client/Enums/KeypairState.cs
diff --git a/...ontrolR.Web.Client/Enums/ServerUriType.cs → ControlR.Web.Client/Enums/ServerUriType.cs b/...ontrolR.Web.Client/Enums/ServerUriType.cs → ControlR.Web.Client/Enums/ServerUriType.cs
diff --git a/...Web/ControlR.Web.Client/Enums/ViewMode.cs → ControlR.Web.Client/Enums/ViewMode.cs b/...Web/ControlR.Web.Client/Enums/ViewMode.cs → ControlR.Web.Client/Enums/ViewMode.cs
diff --git a/.../ControlR.Web.Client/Enums/WindowState.cs → ControlR.Web.Client/Enums/WindowState.cs b/.../ControlR.Web.Client/Enums/WindowState.cs → ControlR.Web.Client/Enums/WindowState.cs
diff --git a/...ent/Extensions/AlertSeverityExtensions.cs → ...ent/Extensions/AlertSeverityExtensions.cs b/...ent/Extensions/AlertSeverityExtensions.cs → ...ent/Extensions/AlertSeverityExtensions.cs
diff --git a/...Client/Extensions/IMessengerExtensions.cs → ...Client/Extensions/IMessengerExtensions.cs b/...Client/Extensions/IMessengerExtensions.cs → ...Client/Extensions/IMessengerExtensions.cs
diff --git a/...ntrolR.Web.Client/Layout/MainLayout.razor → ControlR.Web.Client/Layout/MainLayout.razor b/...ntrolR.Web.Client/Layout/MainLayout.razor → ControlR.Web.Client/Layout/MainLayout.razor
diff --git a/.../ControlR.Web.Client/Layout/NavMenu.razor → ControlR.Web.Client/Layout/NavMenu.razor b/.../ControlR.Web.Client/Layout/NavMenu.razor → ControlR.Web.Client/Layout/NavMenu.razor
diff --git a/...eb.Client/Models/DeviceContentInstance.cs → ...eb.Client/Models/DeviceContentInstance.cs b/...eb.Client/Models/DeviceContentInstance.cs → ...eb.Client/Models/DeviceContentInstance.cs
diff --git a/...Web.Client/Models/DrawUnmarshalledInfo.cs → ...Web.Client/Models/DrawUnmarshalledInfo.cs b/...Web.Client/Models/DrawUnmarshalledInfo.cs → ...Web.Client/Models/DrawUnmarshalledInfo.cs
diff --git a/.../Models/Messages/DesktopChangedMessage.cs → .../Models/Messages/DesktopChangedMessage.cs b/.../Models/Messages/DesktopChangedMessage.cs → .../Models/Messages/DesktopChangedMessage.cs
diff --git a/...ssages/DeviceContentWindowStateMessage.cs → ...ssages/DeviceContentWindowStateMessage.cs b/...ssages/DeviceContentWindowStateMessage.cs → ...ssages/DeviceContentWindowStateMessage.cs
diff --git a/...sages/HubConnectionStateChangedMessage.cs → ...sages/HubConnectionStateChangedMessage.cs b/...sages/HubConnectionStateChangedMessage.cs → ...sages/HubConnectionStateChangedMessage.cs
diff --git a/...dels/Messages/ServerStatsUpdateMessage.cs → ...dels/Messages/ServerStatsUpdateMessage.cs b/...dels/Messages/ServerStatsUpdateMessage.cs → ...dels/Messages/ServerStatsUpdateMessage.cs
diff --git a/...ssages/StreamerDownloadProgressMessage.cs → ...ssages/StreamerDownloadProgressMessage.cs b/...ssages/StreamerDownloadProgressMessage.cs → ...ssages/StreamerDownloadProgressMessage.cs
diff --git a/.../Models/Messages/TerminalOutputMessage.cs → .../Models/Messages/TerminalOutputMessage.cs b/.../Models/Messages/TerminalOutputMessage.cs → .../Models/Messages/TerminalOutputMessage.cs
diff --git a/...eb.Client/Models/Messages/ToastMessage.cs → ...eb.Client/Models/Messages/ToastMessage.cs b/...eb.Client/Models/Messages/ToastMessage.cs → ...eb.Client/Models/Messages/ToastMessage.cs
diff --git a/...Web.Client/Models/RemoteControlSession.cs → ...Web.Client/Models/RemoteControlSession.cs b/...Web.Client/Models/RemoteControlSession.cs → ...Web.Client/Models/RemoteControlSession.cs
diff --git a/...trolR.Web.Client/Models/SettingsExport.cs → ControlR.Web.Client/Models/SettingsExport.cs b/...trolR.Web.Client/Models/SettingsExport.cs → ControlR.Web.Client/Models/SettingsExport.cs
diff --git a/....Web/ControlR.Web.Client/Pages/Auth.razor → ControlR.Web.Client/Pages/Auth.razor b/....Web/ControlR.Web.Client/Pages/Auth.razor → ControlR.Web.Client/Pages/Auth.razor
diff --git a/...b/ControlR.Web.Client/Pages/Counter.razor → ControlR.Web.Client/Pages/Counter.razor b/...b/ControlR.Web.Client/Pages/Counter.razor → ControlR.Web.Client/Pages/Counter.razor
diff --git a/....Web/ControlR.Web.Client/Pages/Home.razor → ControlR.Web.Client/Pages/Home.razor b/....Web/ControlR.Web.Client/Pages/Home.razor → ControlR.Web.Client/Pages/Home.razor
diff --git a/...b/ControlR.Web.Client/Pages/Weather.razor → ControlR.Web.Client/Pages/Weather.razor b/...b/ControlR.Web.Client/Pages/Weather.razor → ControlR.Web.Client/Pages/Weather.razor
diff --git a/.../PersistentAuthenticationStateProvider.cs → .../PersistentAuthenticationStateProvider.cs b/.../PersistentAuthenticationStateProvider.cs → .../PersistentAuthenticationStateProvider.cs
diff --git a/ControlR.Web/ControlR.Web.Client/Program.cs → ControlR.Web.Client/Program.cs b/ControlR.Web/ControlR.Web.Client/Program.cs → ControlR.Web.Client/Program.cs
diff --git a/...ControlR.Web.Client/RedirectToLogin.razor → ControlR.Web.Client/RedirectToLogin.razor b/...ControlR.Web.Client/RedirectToLogin.razor → ControlR.Web.Client/RedirectToLogin.razor
diff --git a/...rolR.Web/ControlR.Web.Client/Routes.razor → ControlR.Web.Client/Routes.razor b/...rolR.Web/ControlR.Web.Client/Routes.razor → ControlR.Web.Client/Routes.razor
diff --git a/...ntrolR.Web.Client/Services/BusyCounter.cs → ControlR.Web.Client/Services/BusyCounter.cs b/...ntrolR.Web.Client/Services/BusyCounter.cs → ControlR.Web.Client/Services/BusyCounter.cs
diff --git a/...R.Web.Client/Services/ClipboardManager.cs → ...R.Web.Client/Services/ClipboardManager.cs b/...R.Web.Client/Services/ClipboardManager.cs → ...R.Web.Client/Services/ClipboardManager.cs
diff --git a/...ient/Services/DeviceContentWindowStore.cs → ...ient/Services/DeviceContentWindowStore.cs b/...ient/Services/DeviceContentWindowStore.cs → ...ient/Services/DeviceContentWindowStore.cs
diff --git a/...trolR.Web.Client/Services/DevicesCache.cs → ControlR.Web.Client/Services/DevicesCache.cs b/...trolR.Web.Client/Services/DevicesCache.cs → ControlR.Web.Client/Services/DevicesCache.cs
diff --git a/...ControlR.Web.Client/Services/JsInterop.cs → ControlR.Web.Client/Services/JsInterop.cs b/...ControlR.Web.Client/Services/JsInterop.cs → ControlR.Web.Client/Services/JsInterop.cs
diff --git a/...b.Client/Services/NotificationProvider.cs → ...b.Client/Services/NotificationProvider.cs b/...b.Client/Services/NotificationProvider.cs → ...b.Client/Services/NotificationProvider.cs
diff --git a/.../ControlR.Web.Client/Services/Settings.cs → ControlR.Web.Client/Services/Settings.cs b/.../ControlR.Web.Client/Services/Settings.cs → ControlR.Web.Client/Services/Settings.cs
diff --git a/...R.Web.Client/Services/SettingsExporter.cs → ...R.Web.Client/Services/SettingsExporter.cs b/...R.Web.Client/Services/SettingsExporter.cs → ...R.Web.Client/Services/SettingsExporter.cs
diff --git a/...eb.Client/Services/ViewerHubConnection.cs → ...eb.Client/Services/ViewerHubConnection.cs b/...eb.Client/Services/ViewerHubConnection.cs → ...eb.Client/Services/ViewerHubConnection.cs
diff --git a/....Client/Services/ViewerStreamingClient.cs → ....Client/Services/ViewerStreamingClient.cs b/....Client/Services/ViewerStreamingClient.cs → ....Client/Services/ViewerStreamingClient.cs
diff --git a/ControlR.Web/ControlR.Web.Client/UserInfo.cs → ControlR.Web.Client/UserInfo.cs b/ControlR.Web/ControlR.Web.Client/UserInfo.cs → ControlR.Web.Client/UserInfo.cs
diff --git a/ControlR.Web/ControlR.Web.Client/Usings.cs → ControlR.Web.Client/Usings.cs b/ControlR.Web/ControlR.Web.Client/Usings.cs → ControlR.Web.Client/Usings.cs
diff --git a/...lR.Web/ControlR.Web.Client/_Imports.razor → ControlR.Web.Client/_Imports.razor b/...lR.Web/ControlR.Web.Client/_Imports.razor → ControlR.Web.Client/_Imports.razor
diff --git a/...ient/wwwroot/appsettings.Development.json → ...ient/wwwroot/appsettings.Development.json b/...ient/wwwroot/appsettings.Development.json → ...ient/wwwroot/appsettings.Development.json
diff --git a/...trolR.Web.Client/wwwroot/appsettings.json → ControlR.Web.Client/wwwroot/appsettings.json b/...trolR.Web.Client/wwwroot/appsettings.json → ControlR.Web.Client/wwwroot/appsettings.json
diff --git a/...mponentsEndpointRouteBuilderExtensions.cs → ...mponentsEndpointRouteBuilderExtensions.cs b/...mponentsEndpointRouteBuilderExtensions.cs → ...mponentsEndpointRouteBuilderExtensions.cs
diff --git a/...onents/Account/IdentityNoOpEmailSender.cs → ...onents/Account/IdentityNoOpEmailSender.cs b/...onents/Account/IdentityNoOpEmailSender.cs → ...onents/Account/IdentityNoOpEmailSender.cs
diff --git a/...onents/Account/IdentityRedirectManager.cs → ...onents/Account/IdentityRedirectManager.cs b/...onents/Account/IdentityRedirectManager.cs → ...onents/Account/IdentityRedirectManager.cs
diff --git a/...omponents/Account/IdentityUserAccessor.cs → ...omponents/Account/IdentityUserAccessor.cs b/...omponents/Account/IdentityUserAccessor.cs → ...omponents/Account/IdentityUserAccessor.cs
diff --git a/...mponents/Account/Pages/AccessDenied.razor → ...mponents/Account/Pages/AccessDenied.razor b/...mponents/Account/Pages/AccessDenied.razor → ...mponents/Account/Pages/AccessDenied.razor
diff --git a/...mponents/Account/Pages/ConfirmEmail.razor → ...mponents/Account/Pages/ConfirmEmail.razor b/...mponents/Account/Pages/ConfirmEmail.razor → ...mponents/Account/Pages/ConfirmEmail.razor
diff --git a/...ts/Account/Pages/ConfirmEmailChange.razor → ...ts/Account/Pages/ConfirmEmailChange.razor b/...ts/Account/Pages/ConfirmEmailChange.razor → ...ts/Account/Pages/ConfirmEmailChange.razor
diff --git a/...ponents/Account/Pages/ExternalLogin.razor → ...ponents/Account/Pages/ExternalLogin.razor b/...ponents/Account/Pages/ExternalLogin.razor → ...ponents/Account/Pages/ExternalLogin.razor
diff --git a/...onents/Account/Pages/ForgotPassword.razor → ...onents/Account/Pages/ForgotPassword.razor b/...onents/Account/Pages/ForgotPassword.razor → ...onents/Account/Pages/ForgotPassword.razor
diff --git a/...nt/Pages/ForgotPasswordConfirmation.razor → ...nt/Pages/ForgotPasswordConfirmation.razor b/...nt/Pages/ForgotPasswordConfirmation.razor → ...nt/Pages/ForgotPasswordConfirmation.razor
diff --git a/.../Account/Pages/InvalidPasswordReset.razor → .../Account/Pages/InvalidPasswordReset.razor b/.../Account/Pages/InvalidPasswordReset.razor → .../Account/Pages/InvalidPasswordReset.razor
diff --git a/...omponents/Account/Pages/InvalidUser.razor → ...omponents/Account/Pages/InvalidUser.razor b/...omponents/Account/Pages/InvalidUser.razor → ...omponents/Account/Pages/InvalidUser.razor
diff --git a/...eb/Components/Account/Pages/Lockout.razor → ...er/Components/Account/Pages/Lockout.razor b/...eb/Components/Account/Pages/Lockout.razor → ...er/Components/Account/Pages/Lockout.razor
diff --git a/....Web/Components/Account/Pages/Login.razor → ...rver/Components/Account/Pages/Login.razor b/....Web/Components/Account/Pages/Login.razor → ...rver/Components/Account/Pages/Login.razor
diff --git a/...mponents/Account/Pages/LoginWith2fa.razor → ...mponents/Account/Pages/LoginWith2fa.razor b/...mponents/Account/Pages/LoginWith2fa.razor → ...mponents/Account/Pages/LoginWith2fa.razor
diff --git a/...Account/Pages/LoginWithRecoveryCode.razor → ...Account/Pages/LoginWithRecoveryCode.razor b/...Account/Pages/LoginWithRecoveryCode.razor → ...Account/Pages/LoginWithRecoveryCode.razor
diff --git a/...Account/Pages/Manage/ChangePassword.razor → ...Account/Pages/Manage/ChangePassword.razor b/...Account/Pages/Manage/ChangePassword.razor → ...Account/Pages/Manage/ChangePassword.razor
diff --git a/...unt/Pages/Manage/DeletePersonalData.razor → ...unt/Pages/Manage/DeletePersonalData.razor b/...unt/Pages/Manage/DeletePersonalData.razor → ...unt/Pages/Manage/DeletePersonalData.razor
diff --git a/...nts/Account/Pages/Manage/Disable2fa.razor → ...nts/Account/Pages/Manage/Disable2fa.razor b/...nts/Account/Pages/Manage/Disable2fa.razor → ...nts/Account/Pages/Manage/Disable2fa.razor
diff --git a/...mponents/Account/Pages/Manage/Email.razor → ...mponents/Account/Pages/Manage/Email.razor b/...mponents/Account/Pages/Manage/Email.razor → ...mponents/Account/Pages/Manage/Email.razor
diff --git a/...nt/Pages/Manage/EnableAuthenticator.razor → ...nt/Pages/Manage/EnableAuthenticator.razor b/...nt/Pages/Manage/EnableAuthenticator.razor → ...nt/Pages/Manage/EnableAuthenticator.razor
diff --git a/...Account/Pages/Manage/ExternalLogins.razor → ...Account/Pages/Manage/ExternalLogins.razor b/...Account/Pages/Manage/ExternalLogins.razor → ...Account/Pages/Manage/ExternalLogins.razor
diff --git a/.../Pages/Manage/GenerateRecoveryCodes.razor → .../Pages/Manage/GenerateRecoveryCodes.razor b/.../Pages/Manage/GenerateRecoveryCodes.razor → .../Pages/Manage/GenerateRecoveryCodes.razor
diff --git a/...mponents/Account/Pages/Manage/Index.razor → ...mponents/Account/Pages/Manage/Index.razor b/...mponents/Account/Pages/Manage/Index.razor → ...mponents/Account/Pages/Manage/Index.razor
diff --git a/...s/Account/Pages/Manage/PersonalData.razor → ...s/Account/Pages/Manage/PersonalData.razor b/...s/Account/Pages/Manage/PersonalData.razor → ...s/Account/Pages/Manage/PersonalData.razor
diff --git a/...unt/Pages/Manage/ResetAuthenticator.razor → ...unt/Pages/Manage/ResetAuthenticator.razor b/...unt/Pages/Manage/ResetAuthenticator.razor → ...unt/Pages/Manage/ResetAuthenticator.razor
diff --git a/...ts/Account/Pages/Manage/SetPassword.razor → ...ts/Account/Pages/Manage/SetPassword.razor b/...ts/Account/Pages/Manage/SetPassword.razor → ...ts/Account/Pages/Manage/SetPassword.razor
diff --git a/...ages/Manage/TwoFactorAuthentication.razor → ...ages/Manage/TwoFactorAuthentication.razor b/...ages/Manage/TwoFactorAuthentication.razor → ...ages/Manage/TwoFactorAuthentication.razor
diff --git a/...nents/Account/Pages/Manage/_Imports.razor → ...nents/Account/Pages/Manage/_Imports.razor b/...nents/Account/Pages/Manage/_Imports.razor → ...nents/Account/Pages/Manage/_Imports.razor
diff --git a/...b/Components/Account/Pages/Register.razor → ...r/Components/Account/Pages/Register.razor b/...b/Components/Account/Pages/Register.razor → ...r/Components/Account/Pages/Register.razor
diff --git a/.../Account/Pages/RegisterConfirmation.razor → .../Account/Pages/RegisterConfirmation.razor b/.../Account/Pages/RegisterConfirmation.razor → .../Account/Pages/RegisterConfirmation.razor
diff --git a/...count/Pages/ResendEmailConfirmation.razor → ...count/Pages/ResendEmailConfirmation.razor b/...count/Pages/ResendEmailConfirmation.razor → ...count/Pages/ResendEmailConfirmation.razor
diff --git a/...ponents/Account/Pages/ResetPassword.razor → ...ponents/Account/Pages/ResetPassword.razor b/...ponents/Account/Pages/ResetPassword.razor → ...ponents/Account/Pages/ResetPassword.razor
diff --git a/...unt/Pages/ResetPasswordConfirmation.razor → ...unt/Pages/ResetPasswordConfirmation.razor b/...unt/Pages/ResetPasswordConfirmation.razor → ...unt/Pages/ResetPasswordConfirmation.razor
diff --git a/...b/Components/Account/Pages/_Imports.razor → ...r/Components/Account/Pages/_Imports.razor b/...b/Components/Account/Pages/_Imports.razor → ...r/Components/Account/Pages/_Imports.razor
diff --git a/...evalidatingAuthenticationStateProvider.cs → ...evalidatingAuthenticationStateProvider.cs b/...evalidatingAuthenticationStateProvider.cs → ...evalidatingAuthenticationStateProvider.cs
diff --git a/...onents/Account/Shared/AccountLayout.razor → ...onents/Account/Shared/AccountLayout.razor b/...onents/Account/Shared/AccountLayout.razor → ...onents/Account/Shared/AccountLayout.razor
diff --git a/.../Account/Shared/ExternalLoginPicker.razor → .../Account/Shared/ExternalLoginPicker.razor b/.../Account/Shared/ExternalLoginPicker.razor → .../Account/Shared/ExternalLoginPicker.razor
diff --git a/...ponents/Account/Shared/ManageLayout.razor → ...ponents/Account/Shared/ManageLayout.razor b/...ponents/Account/Shared/ManageLayout.razor → ...ponents/Account/Shared/ManageLayout.razor
diff --git a/...onents/Account/Shared/ManageNavMenu.razor → ...onents/Account/Shared/ManageNavMenu.razor b/...onents/Account/Shared/ManageNavMenu.razor → ...onents/Account/Shared/ManageNavMenu.razor
diff --git a/...ts/Account/Shared/ShowRecoveryCodes.razor → ...ts/Account/Shared/ShowRecoveryCodes.razor b/...ts/Account/Shared/ShowRecoveryCodes.razor → ...ts/Account/Shared/ShowRecoveryCodes.razor
diff --git a/...onents/Account/Shared/StatusMessage.razor → ...onents/Account/Shared/StatusMessage.razor b/...onents/Account/Shared/StatusMessage.razor → ...onents/Account/Shared/StatusMessage.razor
diff --git a/...olR.Web/ControlR.Web/Components/App.razor → ControlR.Web.Server/Components/App.razor b/...olR.Web/ControlR.Web/Components/App.razor → ControlR.Web.Server/Components/App.razor
diff --git a/...ControlR.Web/Components/Pages/Error.razor → ...R.Web.Server/Components/Pages/Error.razor b/...ControlR.Web/Components/Pages/Error.razor → ...R.Web.Server/Components/Pages/Error.razor
diff --git a/...eb/ControlR.Web/Components/_Imports.razor → ...rolR.Web.Server/Components/_Imports.razor b/...eb/ControlR.Web/Components/_Imports.razor → ...rolR.Web.Server/Components/_Imports.razor
diff --git a/...rolR.Web/ControlR.Web/ControlR.Web.csproj → ...olR.Web.Server/ControlR.Web.Server.csproj b/...rolR.Web/ControlR.Web/ControlR.Web.csproj → ...olR.Web.Server/ControlR.Web.Server.csproj
diff --git a/ControlR.Web/ControlR.Web/Data/AppDb.cs → ControlR.Web.Server/Data/AppDb.cs b/ControlR.Web/ControlR.Web/Data/AppDb.cs → ControlR.Web.Server/Data/AppDb.cs
diff --git a/ControlR.Web/ControlR.Web/Data/AppUser.cs → ControlR.Web.Server/Data/AppUser.cs b/ControlR.Web/ControlR.Web/Data/AppUser.cs → ControlR.Web.Server/Data/AppUser.cs
diff --git a/...ations/20240911042133_Initial.Designer.cs → ...ations/20240911042133_Initial.Designer.cs b/...ations/20240911042133_Initial.Designer.cs → ...ations/20240911042133_Initial.Designer.cs
diff --git a/...Data/Migrations/20240911042133_Initial.cs → ...Data/Migrations/20240911042133_Initial.cs b/...Data/Migrations/20240911042133_Initial.cs → ...Data/Migrations/20240911042133_Initial.cs
diff --git a/...Web/Data/Migrations/AppDbModelSnapshot.cs → ...ver/Data/Migrations/AppDbModelSnapshot.cs b/...Web/Data/Migrations/AppDbModelSnapshot.cs → ...ver/Data/Migrations/AppDbModelSnapshot.cs
diff --git a/ControlR.Web/ControlR.Web/Dockerfile → ControlR.Web.Server/Dockerfile b/ControlR.Web/ControlR.Web/Dockerfile → ControlR.Web.Server/Dockerfile
diff --git a/...ontrolR.Web/Extensions/IHostExtensions.cs → ....Web.Server/Extensions/IHostExtensions.cs b/...ontrolR.Web/Extensions/IHostExtensions.cs → ....Web.Server/Extensions/IHostExtensions.cs
diff --git a/ControlR.Web/ControlR.Web/Program.cs → ControlR.Web.Server/Program.cs b/ControlR.Web/ControlR.Web/Program.cs → ControlR.Web.Server/Program.cs
diff --git a/...ntrolR.Web/Properties/launchSettings.json → ...Web.Server/Properties/launchSettings.json b/...ntrolR.Web/Properties/launchSettings.json → ...Web.Server/Properties/launchSettings.json
diff --git a/...R.Web/Properties/serviceDependencies.json → ...erver/Properties/serviceDependencies.json b/...R.Web/Properties/serviceDependencies.json → ...erver/Properties/serviceDependencies.json
diff --git a/...Properties/serviceDependencies.local.json → ...Properties/serviceDependencies.local.json b/...Properties/serviceDependencies.local.json → ...Properties/serviceDependencies.local.json
diff --git a/...ControlR.Web/appsettings.Development.json → ...R.Web.Server/appsettings.Development.json b/...ControlR.Web/appsettings.Development.json → ...R.Web.Server/appsettings.Development.json
diff --git a/ControlR.Web/ControlR.Web/appsettings.json → ControlR.Web.Server/appsettings.json b/ControlR.Web/ControlR.Web/appsettings.json → ControlR.Web.Server/appsettings.json
diff --git a/...rolR.Web/ControlR.Web/wwwroot/favicon.ico → ControlR.Web.Server/wwwroot/favicon.ico b/...rolR.Web/ControlR.Web/wwwroot/favicon.ico → ControlR.Web.Server/wwwroot/favicon.ico
diff --git a/ControlR.sln b/ControlR.sln
@@ -59,15 +59,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Libraries.ScreenCa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Libraries.ScreenCapture.Benchmarks", "Tests\ControlR.Libraries.ScreenCapture.Benchmarks\ControlR.Libraries.ScreenCapture.Benchmarks.csproj", "{95B98845-4F9C-4B6B-88F7-9194A2A824CA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web", "ControlR.Web\ControlR.Web\ControlR.Web.csproj", "{DBF3FC17-FCA8-4B24-8315-A123BD20824A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Libraries.Clients", "Libraries\ControlR.Libraries.Clients\ControlR.Libraries.Clients.csproj", "{E36620C7-2D12-4956-BF31-A82258A7C656}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web.Client", "ControlR.Web\ControlR.Web.Client\ControlR.Web.Client.csproj", "{36009437-70AC-4E0D-8634-08EE0A5A252F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web.AppHost", "ControlR.Web.AppHost\ControlR.Web.AppHost.csproj", "{72C717A1-099B-4EF3-8BD4-8D1587AD34F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web.AppHost", "ControlR.Web.AppHost\ControlR.Web.AppHost.csproj", "{6EB6C06A-627F-4E08-8E47-760321209079}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web.Server", "ControlR.Web.Server\ControlR.Web.Server.csproj", "{318CCA27-F0E2-4956-B94E-78E67BDAD81A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web.ServiceDefaults", "ControlR.Web.ServiceDefaults\ControlR.Web.ServiceDefaults.csproj", "{B9F8747E-4FA6-4739-A818-061BDCCF18C0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web.Client", "ControlR.Web.Client\ControlR.Web.Client.csproj", "{633D8066-7BC4-40CE-A752-B21CBF39CD79}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlR.Libraries.Clients", "Libraries\ControlR.Libraries.Clients\ControlR.Libraries.Clients.csproj", "{E36620C7-2D12-4956-BF31-A82258A7C656}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlR.Web.ServiceDefaults", "ControlR.Web.ServiceDefaults\ControlR.Web.ServiceDefaults.csproj", "{A00149C9-B0AD-4241-B418-516D457A2DF4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -135,26 +135,26 @@ Global
 		{95B98845-4F9C-4B6B-88F7-9194A2A824CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95B98845-4F9C-4B6B-88F7-9194A2A824CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95B98845-4F9C-4B6B-88F7-9194A2A824CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DBF3FC17-FCA8-4B24-8315-A123BD20824A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBF3FC17-FCA8-4B24-8315-A123BD20824A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBF3FC17-FCA8-4B24-8315-A123BD20824A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBF3FC17-FCA8-4B24-8315-A123BD20824A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36009437-70AC-4E0D-8634-08EE0A5A252F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36009437-70AC-4E0D-8634-08EE0A5A252F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36009437-70AC-4E0D-8634-08EE0A5A252F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36009437-70AC-4E0D-8634-08EE0A5A252F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6EB6C06A-627F-4E08-8E47-760321209079}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EB6C06A-627F-4E08-8E47-760321209079}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EB6C06A-627F-4E08-8E47-760321209079}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EB6C06A-627F-4E08-8E47-760321209079}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9F8747E-4FA6-4739-A818-061BDCCF18C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9F8747E-4FA6-4739-A818-061BDCCF18C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9F8747E-4FA6-4739-A818-061BDCCF18C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9F8747E-4FA6-4739-A818-061BDCCF18C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E36620C7-2D12-4956-BF31-A82258A7C656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E36620C7-2D12-4956-BF31-A82258A7C656}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E36620C7-2D12-4956-BF31-A82258A7C656}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E36620C7-2D12-4956-BF31-A82258A7C656}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72C717A1-099B-4EF3-8BD4-8D1587AD34F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72C717A1-099B-4EF3-8BD4-8D1587AD34F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72C717A1-099B-4EF3-8BD4-8D1587AD34F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72C717A1-099B-4EF3-8BD4-8D1587AD34F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{318CCA27-F0E2-4956-B94E-78E67BDAD81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{318CCA27-F0E2-4956-B94E-78E67BDAD81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{318CCA27-F0E2-4956-B94E-78E67BDAD81A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{318CCA27-F0E2-4956-B94E-78E67BDAD81A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{633D8066-7BC4-40CE-A752-B21CBF39CD79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{633D8066-7BC4-40CE-A752-B21CBF39CD79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{633D8066-7BC4-40CE-A752-B21CBF39CD79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{633D8066-7BC4-40CE-A752-B21CBF39CD79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A00149C9-B0AD-4241-B418-516D457A2DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A00149C9-B0AD-4241-B418-516D457A2DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A00149C9-B0AD-4241-B418-516D457A2DF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A00149C9-B0AD-4241-B418-516D457A2DF4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE