diff --git a/.gitignore b/.gitignore
index bb32bcf9..da2d9046 100644
--- a/.gitignore
+++ b/.gitignore
@@ -260,10 +260,10 @@ paket-files/
 __pycache__/
 *.pyc
 
-/Remotely_Server/wwwroot/Downloads/*.exe
-/Remotely_Server/wwwroot/Downloads/*.zip
-/Remotely_Server/wwwroot/Downloads/*.appimage
-/Remotely_Server/Server.db
-/Remotely_Server/Recordings/*
-/Remotely_Server/ffmpeg.exe
-/Remotely_Server/Properties/PublishProfiles
\ No newline at end of file
+/Server/wwwroot/Downloads/*.exe
+/Server/wwwroot/Downloads/*.zip
+/Server/wwwroot/Downloads/*.appimage
+/Server/Server.db
+/Server/Recordings/*
+/Server/ffmpeg.exe
+/Server/Properties/PublishProfiles
\ No newline at end of file
diff --git a/Remotely_Agent/Remotely_Agent.csproj b/Agent/Agent.csproj
similarity index 95%
rename from Remotely_Agent/Remotely_Agent.csproj
rename to Agent/Agent.csproj
index 871ea656..97497814 100644
--- a/Remotely_Agent/Remotely_Agent.csproj
+++ b/Agent/Agent.csproj
@@ -15,7 +15,7 @@
     <PackageProjectUrl>https://remotely.lucency.co</PackageProjectUrl>
     <Platforms>AnyCPU;x86;x64</Platforms>
     <AssemblyName>Remotely_Agent</AssemblyName>
-    <RootNamespace>Remotely_Agent</RootNamespace>
+    <RootNamespace>Agent</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj" />
+    <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Remotely_Agent/Program.cs b/Agent/Program.cs
similarity index 97%
rename from Remotely_Agent/Program.cs
rename to Agent/Program.cs
index 877970ce..f664533c 100644
--- a/Remotely_Agent/Program.cs
+++ b/Agent/Program.cs
@@ -1,5 +1,5 @@
-using Remotely_Agent.Services;
-using Remotely_Shared.Services;
+using Remotely.Agent.Services;
+using Remotely.Shared.Services;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using System.ServiceProcess;
 using System.Threading.Tasks;
 using System.Diagnostics;
 
-namespace Remotely_Agent
+namespace Remotely.Agent
 {
     public class Program
     {
diff --git a/Remotely_Agent/Properties/launchSettings.json b/Agent/Properties/launchSettings.json
similarity index 100%
rename from Remotely_Agent/Properties/launchSettings.json
rename to Agent/Properties/launchSettings.json
diff --git a/Remotely_Agent/Services/Bash.cs b/Agent/Services/Bash.cs
similarity index 98%
rename from Remotely_Agent/Services/Bash.cs
rename to Agent/Services/Bash.cs
index ae776238..cdfaa320 100644
--- a/Remotely_Agent/Services/Bash.cs
+++ b/Agent/Services/Bash.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading;
 using System.Collections.Concurrent;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public class Bash
     {
diff --git a/Remotely_Agent/Services/CMD.cs b/Agent/Services/CMD.cs
similarity index 98%
rename from Remotely_Agent/Services/CMD.cs
rename to Agent/Services/CMD.cs
index 738d55e8..9885b0f7 100644
--- a/Remotely_Agent/Services/CMD.cs
+++ b/Agent/Services/CMD.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Text;
 using System.Threading;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public class CMD
     {
diff --git a/Remotely_Agent/Services/DeviceSocket.cs b/Agent/Services/DeviceSocket.cs
similarity index 99%
rename from Remotely_Agent/Services/DeviceSocket.cs
rename to Agent/Services/DeviceSocket.cs
index b1c6670d..d3aa03e8 100644
--- a/Remotely_Agent/Services/DeviceSocket.cs
+++ b/Agent/Services/DeviceSocket.cs
@@ -1,5 +1,5 @@
-using Remotely_Shared.Models;
-using Remotely_Shared.Services;
+using Remotely.Shared.Models;
+using Remotely.Shared.Services;
 using Microsoft.AspNetCore.SignalR.Client;
 using Newtonsoft.Json;
 using System;
@@ -12,9 +12,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
 using System.Reflection;
-using Remotely_Shared.Win32;
+using Remotely.Shared.Win32;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public static class DeviceSocket
     {
diff --git a/Remotely_Agent/Services/Logger.cs b/Agent/Services/Logger.cs
similarity index 98%
rename from Remotely_Agent/Services/Logger.cs
rename to Agent/Services/Logger.cs
index 5491ae49..c36557f5 100644
--- a/Remotely_Agent/Services/Logger.cs
+++ b/Agent/Services/Logger.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public static class Logger
     {
diff --git a/Remotely_Agent/Services/PSCore.cs b/Agent/Services/PSCore.cs
similarity index 98%
rename from Remotely_Agent/Services/PSCore.cs
rename to Agent/Services/PSCore.cs
index ecf21f49..23700b8f 100644
--- a/Remotely_Agent/Services/PSCore.cs
+++ b/Agent/Services/PSCore.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Concurrent;
@@ -8,7 +8,7 @@ using System.Management.Automation;
 using System.Text;
 using System.Timers;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public class PSCore
     {
diff --git a/Remotely_Agent/Services/Uninstaller.cs b/Agent/Services/Uninstaller.cs
similarity index 94%
rename from Remotely_Agent/Services/Uninstaller.cs
rename to Agent/Services/Uninstaller.cs
index 9ddc5e89..2b13b2ca 100644
--- a/Remotely_Agent/Services/Uninstaller.cs
+++ b/Agent/Services/Uninstaller.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Services;
+using Remotely.Shared.Services;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Management.Automation;
 using System.Text;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public class Uninstaller
     {
diff --git a/Remotely_Agent/Services/Updater.cs b/Agent/Services/Updater.cs
similarity index 99%
rename from Remotely_Agent/Services/Updater.cs
rename to Agent/Services/Updater.cs
index 062112be..1aaa076b 100644
--- a/Remotely_Agent/Services/Updater.cs
+++ b/Agent/Services/Updater.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Services;
+using Remotely.Shared.Services;
 using Microsoft.AspNetCore.SignalR.Client;
 using System;
 using System.Diagnostics;
@@ -10,7 +10,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using System.Linq;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public class Updater
     {
diff --git a/Remotely_Agent/Services/Utilities.cs b/Agent/Services/Utilities.cs
similarity index 96%
rename from Remotely_Agent/Services/Utilities.cs
rename to Agent/Services/Utilities.cs
index 5e94cd84..82617997 100644
--- a/Remotely_Agent/Services/Utilities.cs
+++ b/Agent/Services/Utilities.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public static class Utilities
     {
diff --git a/Remotely_Agent/Services/WindowsPS.cs b/Agent/Services/WindowsPS.cs
similarity index 98%
rename from Remotely_Agent/Services/WindowsPS.cs
rename to Agent/Services/WindowsPS.cs
index c55b50cb..8ea0790c 100644
--- a/Remotely_Agent/Services/WindowsPS.cs
+++ b/Agent/Services/WindowsPS.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.Text;
 using System.Threading;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     public class WindowsPS
     {
diff --git a/Remotely_Agent/Services/WindowsService.Designer.cs b/Agent/Services/WindowsService.Designer.cs
similarity index 96%
rename from Remotely_Agent/Services/WindowsService.Designer.cs
rename to Agent/Services/WindowsService.Designer.cs
index 5ef988f8..b7ff0e7b 100644
--- a/Remotely_Agent/Services/WindowsService.Designer.cs
+++ b/Agent/Services/WindowsService.Designer.cs
@@ -1,4 +1,4 @@
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     partial class WindowsService
     {
diff --git a/Remotely_Agent/Services/WindowsService.cs b/Agent/Services/WindowsService.cs
similarity index 96%
rename from Remotely_Agent/Services/WindowsService.cs
rename to Agent/Services/WindowsService.cs
index e2fe2778..bddf3bba 100644
--- a/Remotely_Agent/Services/WindowsService.cs
+++ b/Agent/Services/WindowsService.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Services;
+using Remotely.Shared.Services;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.ServiceProcess;
 using System.Text;
 
-namespace Remotely_Agent.Services
+namespace Remotely.Agent.Services
 {
     partial class WindowsService : ServiceBase
     {
diff --git a/Remotely_Desktop.Unix/App.xaml b/Desktop.Unix/App.xaml
similarity index 94%
rename from Remotely_Desktop.Unix/App.xaml
rename to Desktop.Unix/App.xaml
index 71d35736..f3419d25 100644
--- a/Remotely_Desktop.Unix/App.xaml
+++ b/Desktop.Unix/App.xaml
@@ -1,7 +1,7 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Remotely_Desktop.Unix;assembly=Remotely_Desktop"
-             x:Class="Remotely_Desktop.Unix.App">
+             xmlns:local="clr-namespace:Remotely.Desktop.Unix;assembly=Remotely_Desktop"
+             x:Class="Remotely.Desktop.Unix.App">
     <Application.DataTemplates>
         <local:ViewLocator/>
     </Application.DataTemplates>
diff --git a/Remotely_Desktop.Unix/App.xaml.cs b/Desktop.Unix/App.xaml.cs
similarity index 86%
rename from Remotely_Desktop.Unix/App.xaml.cs
rename to Desktop.Unix/App.xaml.cs
index dd7e1d6c..b8d4ee0b 100644
--- a/Remotely_Desktop.Unix/App.xaml.cs
+++ b/Desktop.Unix/App.xaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Markup.Xaml;
 
-namespace Remotely_Desktop.Unix
+namespace Remotely.Desktop.Unix
 {
     public class App : Application
     {
diff --git a/Remotely_Desktop.Unix/Assets/avalonia-logo.ico b/Desktop.Unix/Assets/avalonia-logo.ico
similarity index 100%
rename from Remotely_Desktop.Unix/Assets/avalonia-logo.ico
rename to Desktop.Unix/Assets/avalonia-logo.ico
diff --git a/Remotely_Desktop.Unix/Assets/favicon.ico b/Desktop.Unix/Assets/favicon.ico
similarity index 100%
rename from Remotely_Desktop.Unix/Assets/favicon.ico
rename to Desktop.Unix/Assets/favicon.ico
diff --git a/Remotely_Desktop.Unix/Controls/HostNamePrompt.xaml b/Desktop.Unix/Controls/HostNamePrompt.xaml
similarity index 89%
rename from Remotely_Desktop.Unix/Controls/HostNamePrompt.xaml
rename to Desktop.Unix/Controls/HostNamePrompt.xaml
index 6998a78e..c022a3f2 100644
--- a/Remotely_Desktop.Unix/Controls/HostNamePrompt.xaml
+++ b/Desktop.Unix/Controls/HostNamePrompt.xaml
@@ -3,8 +3,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Remotely_Desktop.Unix.Controls.HostNamePrompt"
-        xmlns:ViewModels="clr-namespace:Remotely_Desktop.Unix.ViewModels;assembly=Remotely_Desktop"
+        x:Class="Remotely.Desktop.Unix.Controls.HostNamePrompt"
+        xmlns:ViewModels="clr-namespace:Remotely.Desktop.Unix.ViewModels;assembly=Remotely_Desktop"
         Title="Remotely Host Name" Height="150" Width="350"  WindowStartupLocation="CenterOwner">
   <Window.DataContext>
     <ViewModels:HostNamePromptViewModel/>
diff --git a/Remotely_Desktop.Unix/Controls/HostNamePrompt.xaml.cs b/Desktop.Unix/Controls/HostNamePrompt.xaml.cs
similarity index 91%
rename from Remotely_Desktop.Unix/Controls/HostNamePrompt.xaml.cs
rename to Desktop.Unix/Controls/HostNamePrompt.xaml.cs
index ce004057..066768f6 100644
--- a/Remotely_Desktop.Unix/Controls/HostNamePrompt.xaml.cs
+++ b/Desktop.Unix/Controls/HostNamePrompt.xaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Remotely_Desktop.Unix.Controls
+namespace Remotely.Desktop.Unix.Controls
 {
     public class HostNamePrompt : Window
     {
diff --git a/Remotely_Desktop.Unix/Controls/MessageBox.xaml b/Desktop.Unix/Controls/MessageBox.xaml
similarity index 93%
rename from Remotely_Desktop.Unix/Controls/MessageBox.xaml
rename to Desktop.Unix/Controls/MessageBox.xaml
index 93ccdb04..cc64f638 100644
--- a/Remotely_Desktop.Unix/Controls/MessageBox.xaml
+++ b/Desktop.Unix/Controls/MessageBox.xaml
@@ -3,8 +3,8 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        xmlns:vm="clr-namespace:Remotely_Desktop.Unix.ViewModels;assembly=Remotely_Desktop"
-        x:Class="Remotely_Desktop.Unix.Controls.MessageBox"
+        xmlns:vm="clr-namespace:Remotely.Desktop.Unix.ViewModels;assembly=Remotely_Desktop"
+        x:Class="Remotely.Desktop.Unix.Controls.MessageBox"
         Title="{Binding Caption}" SizeToContent="WidthAndHeight" MinWidth="200" MinHeight="100" WindowStartupLocation="CenterOwner">
   <Window.DataContext>
     <vm:MessageBoxViewModel></vm:MessageBoxViewModel>
diff --git a/Remotely_Desktop.Unix/Controls/MessageBox.xaml.cs b/Desktop.Unix/Controls/MessageBox.xaml.cs
similarity index 94%
rename from Remotely_Desktop.Unix/Controls/MessageBox.xaml.cs
rename to Desktop.Unix/Controls/MessageBox.xaml.cs
index 36584e55..764e32ab 100644
--- a/Remotely_Desktop.Unix/Controls/MessageBox.xaml.cs
+++ b/Desktop.Unix/Controls/MessageBox.xaml.cs
@@ -1,10 +1,10 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Remotely_Desktop.Unix.ViewModels;
+using Remotely.Desktop.Unix.ViewModels;
 using System.Threading.Tasks;
 
-namespace Remotely_Desktop.Unix.Controls
+namespace Remotely.Desktop.Unix.Controls
 {
     public class MessageBox : Window
     {
diff --git a/Remotely_Desktop.Unix/Remotely_Desktop.Unix.csproj b/Desktop.Unix/Desktop.Unix.csproj
similarity index 80%
rename from Remotely_Desktop.Unix/Remotely_Desktop.Unix.csproj
rename to Desktop.Unix/Desktop.Unix.csproj
index a648a15f..beadbf0a 100644
--- a/Remotely_Desktop.Unix/Remotely_Desktop.Unix.csproj
+++ b/Desktop.Unix/Desktop.Unix.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <ApplicationIcon>Assets\favicon.ico</ApplicationIcon>
     <AssemblyName>Remotely_Desktop</AssemblyName>
-    <RootNamespace>Remotely_Desktop.Unix</RootNamespace>
+    <RootNamespace>Remotely.Desktop.Unix</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />
@@ -36,8 +36,8 @@
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.8.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Remotely_ScreenCast.Core\Remotely_ScreenCast.Core.csproj" />
-    <ProjectReference Include="..\Remotely_ScreenCast.Linux\Remotely_ScreenCast.Linux.csproj" />
-    <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj" />
+    <ProjectReference Include="..\ScreenCast.Core\ScreenCast.Core.csproj" />
+    <ProjectReference Include="..\ScreenCast.Linux\ScreenCast.Linux.csproj" />
+    <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Remotely_Desktop.Unix/Program.cs b/Desktop.Unix/Program.cs
similarity index 90%
rename from Remotely_Desktop.Unix/Program.cs
rename to Desktop.Unix/Program.cs
index 33769877..d4044221 100644
--- a/Remotely_Desktop.Unix/Program.cs
+++ b/Desktop.Unix/Program.cs
@@ -1,10 +1,10 @@
 using System;
 using Avalonia;
 using Avalonia.Logging.Serilog;
-using Remotely_Desktop.Unix.ViewModels;
-using Remotely_Desktop.Unix.Views;
+using Remotely.Desktop.Unix.ViewModels;
+using Remotely.Desktop.Unix.Views;
 
-namespace Remotely_Desktop.Unix
+namespace Remotely.Desktop.Unix
 {
     class Program
     {
diff --git a/Remotely_Desktop.Unix/Services/Config.cs b/Desktop.Unix/Services/Config.cs
similarity index 97%
rename from Remotely_Desktop.Unix/Services/Config.cs
rename to Desktop.Unix/Services/Config.cs
index d54f02e3..105ae3fe 100644
--- a/Remotely_Desktop.Unix/Services/Config.cs
+++ b/Desktop.Unix/Services/Config.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_Desktop.Unix.Services
+namespace Remotely.Desktop.Unix.Services
 {
     public class Config
     {
diff --git a/Remotely_Desktop.Unix/Services/Executor.cs b/Desktop.Unix/Services/Executor.cs
similarity index 95%
rename from Remotely_Desktop.Unix/Services/Executor.cs
rename to Desktop.Unix/Services/Executor.cs
index d72c439a..aa474be7 100644
--- a/Remotely_Desktop.Unix/Services/Executor.cs
+++ b/Desktop.Unix/Services/Executor.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace Remotely_Desktop.Unix.Services
+namespace Remotely.Desktop.Unix.Services
 {
     public class Executor : ICommand
     {
diff --git a/Remotely_Desktop.Unix/ViewLocator.cs b/Desktop.Unix/ViewLocator.cs
similarity index 90%
rename from Remotely_Desktop.Unix/ViewLocator.cs
rename to Desktop.Unix/ViewLocator.cs
index 473ed0da..f78a27c5 100644
--- a/Remotely_Desktop.Unix/ViewLocator.cs
+++ b/Desktop.Unix/ViewLocator.cs
@@ -1,9 +1,9 @@
 using System;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
-using Remotely_Desktop.Unix.ViewModels;
+using Remotely.Desktop.Unix.ViewModels;
 
-namespace Remotely_Desktop.Unix
+namespace Remotely.Desktop.Unix
 {
     public class ViewLocator : IDataTemplate
     {
diff --git a/Remotely_Desktop.Unix/ViewModels/HostNamePromptViewModel.cs b/Desktop.Unix/ViewModels/HostNamePromptViewModel.cs
similarity index 90%
rename from Remotely_Desktop.Unix/ViewModels/HostNamePromptViewModel.cs
rename to Desktop.Unix/ViewModels/HostNamePromptViewModel.cs
index 44f01576..df59cd9f 100644
--- a/Remotely_Desktop.Unix/ViewModels/HostNamePromptViewModel.cs
+++ b/Desktop.Unix/ViewModels/HostNamePromptViewModel.cs
@@ -7,9 +7,9 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Controls;
 using ReactiveUI;
-using Remotely_Desktop.Unix.Services;
+using Remotely.Desktop.Unix.Services;
 
-namespace Remotely_Desktop.Unix.ViewModels
+namespace Remotely.Desktop.Unix.ViewModels
 {
     public class HostNamePromptViewModel : ViewModelBase
     {
diff --git a/Remotely_Desktop.Unix/ViewModels/MainWindowViewModel.cs b/Desktop.Unix/ViewModels/MainWindowViewModel.cs
similarity index 94%
rename from Remotely_Desktop.Unix/ViewModels/MainWindowViewModel.cs
rename to Desktop.Unix/ViewModels/MainWindowViewModel.cs
index ced42d60..72f65b42 100644
--- a/Remotely_Desktop.Unix/ViewModels/MainWindowViewModel.cs
+++ b/Desktop.Unix/ViewModels/MainWindowViewModel.cs
@@ -2,16 +2,16 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 using ReactiveUI;
-using Remotely_Desktop.Unix.Controls;
-using Remotely_Desktop.Unix.Services;
-using Remotely_ScreenCast.Core;
-using Remotely_ScreenCast.Core.Capture;
-using Remotely_ScreenCast.Core.Models;
-using Remotely_ScreenCast.Core.Utilities;
-using Remotely_ScreenCast.Linux.Capture;
-using Remotely_ScreenCast.Linux.Input;
-using Remotely_Shared.Models;
-using Remotely_Shared.Services;
+using Remotely.Desktop.Unix.Controls;
+using Remotely.Desktop.Unix.Services;
+using Remotely.ScreenCast.Core;
+using Remotely.ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Linux.Capture;
+using Remotely.ScreenCast.Linux.Input;
+using Remotely.Shared.Models;
+using Remotely.Shared.Services;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -21,7 +21,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace Remotely_Desktop.Unix.ViewModels
+namespace Remotely.Desktop.Unix.ViewModels
 {
     public class MainWindowViewModel : ReactiveObject
     {
diff --git a/Remotely_Desktop.Unix/ViewModels/MessageBoxViewModel.cs b/Desktop.Unix/ViewModels/MessageBoxViewModel.cs
similarity index 89%
rename from Remotely_Desktop.Unix/ViewModels/MessageBoxViewModel.cs
rename to Desktop.Unix/ViewModels/MessageBoxViewModel.cs
index 04aebb1e..cd49e7cd 100644
--- a/Remotely_Desktop.Unix/ViewModels/MessageBoxViewModel.cs
+++ b/Desktop.Unix/ViewModels/MessageBoxViewModel.cs
@@ -1,12 +1,12 @@
 using Avalonia.Controls;
-using Remotely_Desktop.Unix.Controls;
-using Remotely_Desktop.Unix.Services;
+using Remotely.Desktop.Unix.Controls;
+using Remotely.Desktop.Unix.Services;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Input;
 
-namespace Remotely_Desktop.Unix.ViewModels
+namespace Remotely.Desktop.Unix.ViewModels
 {
     public class MessageBoxViewModel : ViewModelBase
     {
diff --git a/Remotely_Desktop.Unix/ViewModels/ViewModelBase.cs b/Desktop.Unix/ViewModels/ViewModelBase.cs
similarity index 78%
rename from Remotely_Desktop.Unix/ViewModels/ViewModelBase.cs
rename to Desktop.Unix/ViewModels/ViewModelBase.cs
index 0fc227c8..42499eb4 100644
--- a/Remotely_Desktop.Unix/ViewModels/ViewModelBase.cs
+++ b/Desktop.Unix/ViewModels/ViewModelBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using ReactiveUI;
 
-namespace Remotely_Desktop.Unix.ViewModels
+namespace Remotely.Desktop.Unix.ViewModels
 {
     public class ViewModelBase : ReactiveObject
     {
diff --git a/Remotely_Desktop.Unix/Views/MainWindow.xaml b/Desktop.Unix/Views/MainWindow.xaml
similarity index 97%
rename from Remotely_Desktop.Unix/Views/MainWindow.xaml
rename to Desktop.Unix/Views/MainWindow.xaml
index 2a8ae6c6..2e52886d 100644
--- a/Remotely_Desktop.Unix/Views/MainWindow.xaml
+++ b/Desktop.Unix/Views/MainWindow.xaml
@@ -1,10 +1,10 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:vm="clr-namespace:Remotely_Desktop.Unix.ViewModels;assembly=Remotely_Desktop"
+        xmlns:vm="clr-namespace:Remotely.Desktop.Unix.ViewModels;assembly=Remotely_Desktop"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-        x:Class="Remotely_Desktop.Unix.Views.MainWindow"
+        x:Class="Remotely.Desktop.Unix.Views.MainWindow"
         Icon="/Assets/favicon.ico"
         Title="Remotely" Height="275" Width="350" HasSystemDecorations="False">
     <Window.DataContext>
diff --git a/Remotely_Desktop.Unix/Views/MainWindow.xaml.cs b/Desktop.Unix/Views/MainWindow.xaml.cs
similarity index 92%
rename from Remotely_Desktop.Unix/Views/MainWindow.xaml.cs
rename to Desktop.Unix/Views/MainWindow.xaml.cs
index a241d47b..3df5ade3 100644
--- a/Remotely_Desktop.Unix/Views/MainWindow.xaml.cs
+++ b/Desktop.Unix/Views/MainWindow.xaml.cs
@@ -1,10 +1,10 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Remotely_Desktop.Unix.ViewModels;
+using Remotely.Desktop.Unix.ViewModels;
 using System.Threading.Tasks;
 
-namespace Remotely_Desktop.Unix.Views
+namespace Remotely.Desktop.Unix.Views
 {
     public class MainWindow : Window
     {
diff --git a/Remotely_Desktop.Unix/nuget.config b/Desktop.Unix/nuget.config
similarity index 100%
rename from Remotely_Desktop.Unix/nuget.config
rename to Desktop.Unix/nuget.config
diff --git a/Remotely_Desktop.Win/App.config b/Desktop.Win/App.config
similarity index 100%
rename from Remotely_Desktop.Win/App.config
rename to Desktop.Win/App.config
diff --git a/Remotely_Desktop.Win/App.xaml b/Desktop.Win/App.xaml
similarity index 93%
rename from Remotely_Desktop.Win/App.xaml
rename to Desktop.Win/App.xaml
index eb710864..1af8a261 100644
--- a/Remotely_Desktop.Win/App.xaml
+++ b/Desktop.Win/App.xaml
@@ -1,7 +1,7 @@
-<Application x:Class="Remotely_Desktop.Win.App"
+<Application x:Class="Remotely.Desktop.Win.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Remotely_Desktop.Win"
+             xmlns:local="clr-namespace:Remotely.Desktop.Win"
              StartupUri="MainWindow.xaml" DispatcherUnhandledException="Application_DispatcherUnhandledException">
     <Application.Resources>
         <Style x:Key="TitlebarButton" TargetType="Button">
diff --git a/Remotely_Desktop.Win/App.xaml.cs b/Desktop.Win/App.xaml.cs
similarity index 81%
rename from Remotely_Desktop.Win/App.xaml.cs
rename to Desktop.Win/App.xaml.cs
index 673c5f5d..89dfe34e 100644
--- a/Remotely_Desktop.Win/App.xaml.cs
+++ b/Desktop.Win/App.xaml.cs
@@ -1,6 +1,6 @@
-using Remotely_Desktop.Win.Services;
-using Remotely_Desktop.Win.ViewModels;
-using Remotely_ScreenCast.Core.Utilities;
+using Remotely.Desktop.Win.Services;
+using Remotely.Desktop.Win.ViewModels;
+using Remotely.ScreenCast.Core.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -9,7 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace Remotely_Desktop.Win
+namespace Remotely.Desktop.Win
 {
     /// <summary>
     /// Interaction logic for App.xaml
diff --git a/Remotely_Desktop.Win/Controls/HostNamePrompt.xaml b/Desktop.Win/Controls/HostNamePrompt.xaml
similarity index 84%
rename from Remotely_Desktop.Win/Controls/HostNamePrompt.xaml
rename to Desktop.Win/Controls/HostNamePrompt.xaml
index 62492870..96e08ba3 100644
--- a/Remotely_Desktop.Win/Controls/HostNamePrompt.xaml
+++ b/Desktop.Win/Controls/HostNamePrompt.xaml
@@ -3,8 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Remotely_Desktop.Win.Controls"
-        xmlns:ViewModels="clr-namespace:Remotely_Desktop.Win.ViewModels" x:Name="PromptWindow" x:Class="Remotely_Desktop.Win.Controls.HostNamePrompt"
+        xmlns:local="clr-namespace:Remotely.Desktop.Win.Controls"
+        xmlns:ViewModels="clr-namespace:Remotely.Desktop.Win.ViewModels" x:Name="PromptWindow" x:Class="Remotely.Desktop.Win.Controls.HostNamePrompt"
         mc:Ignorable="d"
         Title="Remotely Host Name" Height="150" Width="350" Icon="/Remotely_Desktop;component/favicon.ico" WindowStartupLocation="CenterOwner">
     <Window.DataContext>
diff --git a/Remotely_Desktop.Win/Controls/HostNamePrompt.xaml.cs b/Desktop.Win/Controls/HostNamePrompt.xaml.cs
similarity index 89%
rename from Remotely_Desktop.Win/Controls/HostNamePrompt.xaml.cs
rename to Desktop.Win/Controls/HostNamePrompt.xaml.cs
index 6ade5839..98b35490 100644
--- a/Remotely_Desktop.Win/Controls/HostNamePrompt.xaml.cs
+++ b/Desktop.Win/Controls/HostNamePrompt.xaml.cs
@@ -1,4 +1,4 @@
-using Remotely_Desktop.Win.ViewModels;
+using Remotely.Desktop.Win.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +13,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace Remotely_Desktop.Win.Controls
+namespace Remotely.Desktop.Win.Controls
 {
     /// <summary>
     /// Interaction logic for HostNamePrompt.xaml
diff --git a/Remotely_Desktop.Win/Remotely_Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj
similarity index 93%
rename from Remotely_Desktop.Win/Remotely_Desktop.Win.csproj
rename to Desktop.Win/Desktop.Win.csproj
index eae2c14c..9c642fe2 100644
--- a/Remotely_Desktop.Win/Remotely_Desktop.Win.csproj
+++ b/Desktop.Win/Desktop.Win.csproj
@@ -7,7 +7,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{486A238C-387B-49C5-A361-B86ACDB2572A}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>Remotely_Desktop.Win</RootNamespace>
+    <RootNamespace>Remotely.Desktop.Win</RootNamespace>
     <AssemblyName>Remotely_Desktop</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -143,12 +143,10 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="packages.config" />
-    <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Remotely_Desktop.Win_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -160,17 +158,17 @@
     <Resource Include="favicon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Remotely_ScreenCast.Core\Remotely_ScreenCast.Core.csproj">
+    <ProjectReference Include="..\ScreenCast.Core\ScreenCast.Core.csproj">
       <Project>{b04a1728-2e87-491e-bc7f-f575a1754def}</Project>
-      <Name>Remotely_ScreenCast.Core</Name>
+      <Name>ScreenCast.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Remotely_ScreenCast.Win\Remotely_ScreenCast.Win.csproj">
+    <ProjectReference Include="..\ScreenCast.Win\ScreenCast.Win.csproj">
       <Project>{2dcea1f5-9b64-4edb-9cd0-4d6675d96709}</Project>
-      <Name>Remotely_ScreenCast.Win</Name>
+      <Name>ScreenCast.Win</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj">
+    <ProjectReference Include="..\Shared\Shared.csproj">
       <Project>{3b1b36ae-7a60-4974-a868-1e24894d4149}</Project>
-      <Name>Remotely_Shared</Name>
+      <Name>Shared</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Remotely_Desktop.Win/FodyWeavers.xml b/Desktop.Win/FodyWeavers.xml
similarity index 100%
rename from Remotely_Desktop.Win/FodyWeavers.xml
rename to Desktop.Win/FodyWeavers.xml
diff --git a/Remotely_Desktop.Win/FodyWeavers.xsd b/Desktop.Win/FodyWeavers.xsd
similarity index 100%
rename from Remotely_Desktop.Win/FodyWeavers.xsd
rename to Desktop.Win/FodyWeavers.xsd
diff --git a/Remotely_Desktop.Win/MainWindow.xaml b/Desktop.Win/MainWindow.xaml
similarity index 96%
rename from Remotely_Desktop.Win/MainWindow.xaml
rename to Desktop.Win/MainWindow.xaml
index caa521c1..eb3146d6 100644
--- a/Remotely_Desktop.Win/MainWindow.xaml
+++ b/Desktop.Win/MainWindow.xaml
@@ -3,8 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Remotely_Desktop.Win"
-        xmlns:ViewModels="clr-namespace:Remotely_Desktop.Win.ViewModels" x:Class="Remotely_Desktop.Win.MainWindow"
+        xmlns:local="clr-namespace:Remotely.Desktop.Win"
+        xmlns:ViewModels="clr-namespace:Remotely.Desktop.Win.ViewModels" x:Class="Remotely.Desktop.Win.MainWindow"
         mc:Ignorable="d"
         Title="Remotely" Height="250" Width="350" MouseLeftButtonDown="Window_MouseLeftButtonDown" WindowStyle="None" ResizeMode="NoResize" Icon="favicon.ico" Loaded="Window_Loaded">
     <Window.Resources>
diff --git a/Remotely_Desktop.Win/MainWindow.xaml.cs b/Desktop.Win/MainWindow.xaml.cs
similarity index 95%
rename from Remotely_Desktop.Win/MainWindow.xaml.cs
rename to Desktop.Win/MainWindow.xaml.cs
index 3d336974..7c4a9654 100644
--- a/Remotely_Desktop.Win/MainWindow.xaml.cs
+++ b/Desktop.Win/MainWindow.xaml.cs
@@ -1,5 +1,5 @@
-using Remotely_Desktop.Win.ViewModels;
-using Remotely_ScreenCast.Core.Models;
+using Remotely.Desktop.Win.ViewModels;
+using Remotely.ScreenCast.Core.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +17,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Remotely_Desktop.Win
+namespace Remotely.Desktop.Win
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
diff --git a/Remotely_Desktop.Win/Properties/AssemblyInfo.cs b/Desktop.Win/Properties/AssemblyInfo.cs
similarity index 100%
rename from Remotely_Desktop.Win/Properties/AssemblyInfo.cs
rename to Desktop.Win/Properties/AssemblyInfo.cs
diff --git a/Remotely_Desktop.Win/Properties/Resources.Designer.cs b/Desktop.Win/Properties/Resources.Designer.cs
similarity index 96%
rename from Remotely_Desktop.Win/Properties/Resources.Designer.cs
rename to Desktop.Win/Properties/Resources.Designer.cs
index 34046c10..5af2aa56 100644
--- a/Remotely_Desktop.Win/Properties/Resources.Designer.cs
+++ b/Desktop.Win/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Remotely_Desktop.Win.Win.Properties {
+namespace Remotely.Desktop.Win.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace Remotely_Desktop.Win.Win.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Remotely_Desktop.Win.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Remotely.Desktop.Win.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Remotely_Desktop.Win/Properties/Resources.resx b/Desktop.Win/Properties/Resources.resx
similarity index 100%
rename from Remotely_Desktop.Win/Properties/Resources.resx
rename to Desktop.Win/Properties/Resources.resx
diff --git a/Remotely_Desktop.Win/Properties/Settings.Designer.cs b/Desktop.Win/Properties/Settings.Designer.cs
similarity index 93%
rename from Remotely_Desktop.Win/Properties/Settings.Designer.cs
rename to Desktop.Win/Properties/Settings.Designer.cs
index 5a1369d8..c78c75e0 100644
--- a/Remotely_Desktop.Win/Properties/Settings.Designer.cs
+++ b/Desktop.Win/Properties/Settings.Designer.cs
@@ -8,11 +8,11 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Remotely_Desktop.Win.Win.Properties {
+namespace Remotely.Desktop.Win.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Remotely_Desktop.Win/Properties/Settings.settings b/Desktop.Win/Properties/Settings.settings
similarity index 100%
rename from Remotely_Desktop.Win/Properties/Settings.settings
rename to Desktop.Win/Properties/Settings.settings
diff --git a/Remotely_Desktop.Win/Services/Config.cs b/Desktop.Win/Services/Config.cs
similarity index 97%
rename from Remotely_Desktop.Win/Services/Config.cs
rename to Desktop.Win/Services/Config.cs
index de60457d..d6e17109 100644
--- a/Remotely_Desktop.Win/Services/Config.cs
+++ b/Desktop.Win/Services/Config.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_Desktop.Win.Services
+namespace Remotely.Desktop.Win.Services
 {
     public class Config
     {
diff --git a/Remotely_Desktop.Win/ViewModels/HostNamePromptViewModel.cs b/Desktop.Win/ViewModels/HostNamePromptViewModel.cs
similarity index 92%
rename from Remotely_Desktop.Win/ViewModels/HostNamePromptViewModel.cs
rename to Desktop.Win/ViewModels/HostNamePromptViewModel.cs
index c85d6efc..42d25f1b 100644
--- a/Remotely_Desktop.Win/ViewModels/HostNamePromptViewModel.cs
+++ b/Desktop.Win/ViewModels/HostNamePromptViewModel.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_Desktop.Win.ViewModels
+namespace Remotely.Desktop.Win.ViewModels
 {
     public class HostNamePromptViewModel : INotifyPropertyChanged
     {
diff --git a/Remotely_Desktop.Win/ViewModels/MainWindowViewModel.cs b/Desktop.Win/ViewModels/MainWindowViewModel.cs
similarity index 95%
rename from Remotely_Desktop.Win/ViewModels/MainWindowViewModel.cs
rename to Desktop.Win/ViewModels/MainWindowViewModel.cs
index b0b9bebe..6b9863f8 100644
--- a/Remotely_Desktop.Win/ViewModels/MainWindowViewModel.cs
+++ b/Desktop.Win/ViewModels/MainWindowViewModel.cs
@@ -1,13 +1,13 @@
-using Remotely_Desktop.Win.Controls;
-using Remotely_Desktop.Win.Services;
-using Remotely_Shared.Models;
-using Remotely_ScreenCast.Core;
-using Remotely_ScreenCast.Core.Capture;
-using Remotely_ScreenCast.Core.Models;
-using Remotely_ScreenCast.Core.Utilities;
-using Remotely_ScreenCast.Win;
-using Remotely_ScreenCast.Win.Capture;
-using Remotely_ScreenCast.Win.Input;
+using Remotely.Desktop.Win.Controls;
+using Remotely.Desktop.Win.Services;
+using Remotely.Shared.Models;
+using Remotely.ScreenCast.Core;
+using Remotely.ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Win;
+using Remotely.ScreenCast.Win.Capture;
+using Remotely.ScreenCast.Win.Input;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -23,7 +23,7 @@ using System.Windows;
 using System.Security.Principal;
 using System.Security.Claims;
 
-namespace Remotely_Desktop.Win.ViewModels
+namespace Remotely.Desktop.Win.ViewModels
 {
     public class MainWindowViewModel : INotifyPropertyChanged
     {
diff --git a/Remotely_Desktop.Win/favicon.ico b/Desktop.Win/favicon.ico
similarity index 100%
rename from Remotely_Desktop.Win/favicon.ico
rename to Desktop.Win/favicon.ico
diff --git a/Remotely_Desktop.Win/packages.config b/Desktop.Win/packages.config
similarity index 100%
rename from Remotely_Desktop.Win/packages.config
rename to Desktop.Win/packages.config
diff --git a/Remotely.sln b/Remotely.sln
index 21c0fa90..d91403ac 100644
--- a/Remotely.sln
+++ b/Remotely.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28606.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_Agent", "Remotely_Agent\Remotely_Agent.csproj", "{98A8DF30-0993-4B49-822E-244A70AB8C4D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Agent", "Agent\Agent.csproj", "{98A8DF30-0993-4B49-822E-244A70AB8C4D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{2CAC9A2B-1402-465F-83F8-958B4E081CA3}"
 	ProjectSection(SolutionItems) = preProject
@@ -22,22 +22,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{D96B47
 		Assets\Remotely_Logo.png = Assets\Remotely_Logo.png
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_Server", "Remotely_Server\Remotely_Server.csproj", "{3E835099-C417-4D82-8D5C-13DC09AF48AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{3E835099-C417-4D82-8D5C-13DC09AF48AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Remotely_ScreenCast.Win", "Remotely_ScreenCast.Win\Remotely_ScreenCast.Win.csproj", "{2DCEA1F5-9B64-4EDB-9CD0-4D6675D96709}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenCast.Win", "ScreenCast.Win\ScreenCast.Win.csproj", "{2DCEA1F5-9B64-4EDB-9CD0-4D6675D96709}"
 	ProjectSection(ProjectDependencies) = postProject
 		{98A8DF30-0993-4B49-822E-244A70AB8C4D} = {98A8DF30-0993-4B49-822E-244A70AB8C4D}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Remotely_Desktop.Win", "Remotely_Desktop.Win\Remotely_Desktop.Win.csproj", "{486A238C-387B-49C5-A361-B86ACDB2572A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Desktop.Win", "Desktop.Win\Desktop.Win.csproj", "{486A238C-387B-49C5-A361-B86ACDB2572A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_ScreenCast.Linux", "Remotely_ScreenCast.Linux\Remotely_ScreenCast.Linux.csproj", "{E46F11D0-3C88-4D43-8CCC-EE7182CAD5C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScreenCast.Linux", "ScreenCast.Linux\ScreenCast.Linux.csproj", "{E46F11D0-3C88-4D43-8CCC-EE7182CAD5C1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_ScreenCast.Core", "Remotely_ScreenCast.Core\Remotely_ScreenCast.Core.csproj", "{B04A1728-2E87-491E-BC7F-F575A1754DEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScreenCast.Core", "ScreenCast.Core\ScreenCast.Core.csproj", "{B04A1728-2E87-491E-BC7F-F575A1754DEF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_Shared", "Remotely_Shared\Remotely_Shared.csproj", "{3B1B36AE-7A60-4974-A868-1E24894D4149}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{3B1B36AE-7A60-4974-A868-1E24894D4149}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Remotely_Desktop.Unix", "Remotely_Desktop.Unix\Remotely_Desktop.Unix.csproj", "{FF7FD66A-B3E2-4D39-A457-A00C94EDE9E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Desktop.Unix", "Desktop.Unix\Desktop.Unix.csproj", "{FF7FD66A-B3E2-4D39-A457-A00C94EDE9E6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/Remotely_Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
deleted file mode 100644
index 630827cd..00000000
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
+++ /dev/null
@@ -1,3 +0,0 @@
-@using Remotely_Server.Areas.Identity.Pages.Account.Manage
-@using Remotely_Server.Data;
-@using Remotely_Shared.Models
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/_ViewImports.cshtml b/Remotely_Server/Areas/Identity/Pages/Account/_ViewImports.cshtml
deleted file mode 100644
index 5a020c32..00000000
--- a/Remotely_Server/Areas/Identity/Pages/Account/_ViewImports.cshtml
+++ /dev/null
@@ -1,2 +0,0 @@
-@using Remotely_Server.Areas.Identity.Pages.Account
-@using Remotely_Shared.Models
diff --git a/Remotely_Server/Areas/Identity/Pages/_ViewImports.cshtml b/Remotely_Server/Areas/Identity/Pages/_ViewImports.cshtml
deleted file mode 100644
index 3addd979..00000000
--- a/Remotely_Server/Areas/Identity/Pages/_ViewImports.cshtml
+++ /dev/null
@@ -1,5 +0,0 @@
-@using Microsoft.AspNetCore.Identity
-@using Remotely_Server.Areas.Identity
-@using Remotely_Shared.Models
-@namespace Remotely_Server.Areas.Identity.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/Remotely_Server/CurrentVersion.txt b/Remotely_Server/CurrentVersion.txt
deleted file mode 100644
index fb1a1e30..00000000
--- a/Remotely_Server/CurrentVersion.txt
+++ /dev/null
@@ -1 +0,0 @@
-2019.05.24.2024
diff --git a/Remotely_Shared/Models/CommandContext.d.ts b/Remotely_Shared/Models/CommandContext.d.ts
deleted file mode 100644
index 12ea1458..00000000
--- a/Remotely_Shared/Models/CommandContext.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-	interface CommandContext {
-		ID: string;
-		CommandMode: string;
-		CommandText: string;
-		SenderUserID: string;
-		SenderConnectionID: string;
-		TargetDeviceIDs: string[];
-		PSCoreResults: any[];
-		CommandResults: any[];
-		TimeStamp: Date;
-		OrganizationID: string;
-	}
diff --git a/Remotely_Shared/Models/CursorInfo.d.ts b/Remotely_Shared/Models/CursorInfo.d.ts
deleted file mode 100644
index e7037d9b..00000000
--- a/Remotely_Shared/Models/CursorInfo.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-	interface CursorInfo {
-		ImageBytes: any[];
-		HotSpot: any;
-		CssOverride: string;
-	}
diff --git a/Remotely_Shared/Models/Device.d.ts b/Remotely_Shared/Models/Device.d.ts
deleted file mode 100644
index 9d219b24..00000000
--- a/Remotely_Shared/Models/Device.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-	interface Device {
-		CurrentUser: string;
-		Drives: any[];
-		FreeMemory: number;
-		FreeStorage: number;
-		ID: string;
-		Is64Bit: boolean;
-		IsOnline: boolean;
-		LastOnline: Date;
-		DeviceName: string;
-		Organization: {
-			ID: string;
-			OrganizationName: string;
-			RemotelyUsers: any[];
-			Devices: .Device[];
-			CommandContexts: any[];
-			EventLogs: any[];
-			PermissionGroups: any[];
-			InviteLinks: any[];
-			SharedFiles: any[];
-		};
-		OrganizationID: string;
-		OSArchitecture: any;
-		OSDescription: string;
-		DevicePermissionLinks: any[];
-		Platform: string;
-		ProcessorCount: number;
-		ServerVerificationToken: string;
-		Tags: string;
-		TotalMemory: number;
-		TotalStorage: number;
-	}
diff --git a/Remotely_Shared/Models/DevicePermissionLink.d.ts b/Remotely_Shared/Models/DevicePermissionLink.d.ts
deleted file mode 100644
index b414652a..00000000
--- a/Remotely_Shared/Models/DevicePermissionLink.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-	interface DevicePermissionLink {
-		DeviceID: string;
-		Device: .Device;
-		PermissionGroupID: string;
-		PermissionGroup: {
-			ID: string;
-			Name: string;
-			Organization: {
-				ID: string;
-				OrganizationName: string;
-				RemotelyUsers: any[];
-				Devices: .Device[];
-				CommandContexts: .CommandContext[];
-				EventLogs: any[];
-				PermissionGroups: any[];
-				InviteLinks: any[];
-				SharedFiles: any[];
-			};
-			UserPermissionLinks: any[];
-			DevicePermissionLinks: .DevicePermissionLink[];
-		};
-	}
diff --git a/Remotely_Shared/Models/GenericCommandResult.d.ts b/Remotely_Shared/Models/GenericCommandResult.d.ts
deleted file mode 100644
index d2d900d5..00000000
--- a/Remotely_Shared/Models/GenericCommandResult.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-	interface GenericCommandResult {
-		DeviceID: string;
-		CommandContextID: string;
-		CommandType: string;
-		StandardOutput: string;
-		ErrorOutput: string;
-		TimeStamp: Date;
-	}
diff --git a/Remotely_Shared/Models/PSCoreCommandResult.d.ts b/Remotely_Shared/Models/PSCoreCommandResult.d.ts
deleted file mode 100644
index 7e4f17f5..00000000
--- a/Remotely_Shared/Models/PSCoreCommandResult.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-	interface PSCoreCommandResult {
-		CommandContextID: string;
-		DeviceID: string;
-		VerboseOutput: string[];
-		DebugOutput: string[];
-		ErrorOutput: string[];
-		HostOutput: string;
-		InformationOutput: string[];
-		WarningOutput: string[];
-		TimeStamp: Date;
-	}
diff --git a/Remotely_Shared/Models/RemotelyUserOptions.d.ts b/Remotely_Shared/Models/RemotelyUserOptions.d.ts
deleted file mode 100644
index 10487419..00000000
--- a/Remotely_Shared/Models/RemotelyUserOptions.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-	interface RemotelyUserOptions {
-		ConsolePrompt: string;
-		CommandModeShortcutWeb: string;
-		CommandModeShortcutPSCore: string;
-		CommandModeShortcutWinPS: string;
-		CommandModeShortcutCMD: string;
-		CommandModeShortcutBash: string;
-	}
diff --git a/Remotely_Shared/Remotely_Shared.csproj b/Remotely_Shared/Remotely_Shared.csproj
deleted file mode 100644
index 17197dfd..00000000
--- a/Remotely_Shared/Remotely_Shared.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Models\PSCoreCommandResult.d.ts">
-      <DependentUpon>PSCoreCommandResult.cs</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Models\CommandContext.cs">
-      <LastGenOutput>CommandContext.d.ts</LastGenOutput>
-      <Generator>DtsGenerator</Generator>
-    </Compile>
-    <Compile Update="Models\CursorInfo.cs">
-      <LastGenOutput>CursorInfo.d.ts</LastGenOutput>
-      <Generator>DtsGenerator</Generator>
-    </Compile>
-    <Compile Update="Models\Device.cs">
-      <LastGenOutput>Device.d.ts</LastGenOutput>
-      <Generator>DtsGenerator</Generator>
-    </Compile>
-    <Compile Update="Models\DevicePermissionLink.cs">
-      <LastGenOutput>DevicePermissionLink.d.ts</LastGenOutput>
-      <Generator>DtsGenerator</Generator>
-    </Compile>
-    <Compile Update="Models\GenericCommandResult.cs">
-      <LastGenOutput>GenericCommandResult.d.ts</LastGenOutput>
-      <Generator>DtsGenerator</Generator>
-    </Compile>
-    <Compile Update="Models\PSCoreCommandResult.cs">
-      <LastGenOutput>PSCoreCommandResult.d.ts</LastGenOutput>
-      <Generator>DtsGenerator</Generator>
-    </Compile>
-    <Compile Update="Models\RemotelyUserOptions.cs">
-      <LastGenOutput>RemotelyUserOptions.d.ts</LastGenOutput>
-      <Generator>DtsGenerator</Generator>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="Models\CommandContext.d.ts">
-      <DependentUpon>CommandContext.cs</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </None>
-    <None Update="Models\CursorInfo.d.ts">
-      <DependentUpon>CursorInfo.cs</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </None>
-    <None Update="Models\Device.d.ts">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Device.cs</DependentUpon>
-    </None>
-    <None Update="Models\DevicePermissionLink.d.ts">
-      <DependentUpon>DevicePermissionLink.cs</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </None>
-    <None Update="Models\GenericCommandResult.d.ts">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>GenericCommandResult.cs</DependentUpon>
-    </None>
-    <None Update="Models\RemotelyUserOptions.d.ts">
-      <DependentUpon>RemotelyUserOptions.cs</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/Remotely_ScreenCast.Core/Capture/ICapturer.cs b/ScreenCast.Core/Capture/ICapturer.cs
similarity index 93%
rename from Remotely_ScreenCast.Core/Capture/ICapturer.cs
rename to ScreenCast.Core/Capture/ICapturer.cs
index 9204a6e5..9b791d0c 100644
--- a/Remotely_ScreenCast.Core/Capture/ICapturer.cs
+++ b/ScreenCast.Core/Capture/ICapturer.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core.Capture
+namespace Remotely.ScreenCast.Core.Capture
 {
     public interface ICapturer : IDisposable
     {
diff --git a/Remotely_ScreenCast.Core/Capture/ImageUtils.cs b/ScreenCast.Core/Capture/ImageUtils.cs
similarity index 98%
rename from Remotely_ScreenCast.Core/Capture/ImageUtils.cs
rename to ScreenCast.Core/Capture/ImageUtils.cs
index 09ea8551..dc8face1 100644
--- a/Remotely_ScreenCast.Core/Capture/ImageUtils.cs
+++ b/ScreenCast.Core/Capture/ImageUtils.cs
@@ -1,4 +1,4 @@
-using Remotely_ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Models;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -10,7 +10,7 @@ using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core.Capture
+namespace Remotely.ScreenCast.Core.Capture
 {
     public class ImageUtils
     {
diff --git a/Remotely_ScreenCast.Core/Capture/ScreenCaster.cs b/ScreenCast.Core/Capture/ScreenCaster.cs
similarity index 96%
rename from Remotely_ScreenCast.Core/Capture/ScreenCaster.cs
rename to ScreenCast.Core/Capture/ScreenCaster.cs
index 2991f5b8..e730c7bc 100644
--- a/Remotely_ScreenCast.Core/Capture/ScreenCaster.cs
+++ b/ScreenCast.Core/Capture/ScreenCaster.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.SignalR.Client;
-using Remotely_ScreenCast.Core.Models;
-using Remotely_ScreenCast.Core.Sockets;
-using Remotely_ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Sockets;
+using Remotely.ScreenCast.Core.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core.Capture
+namespace Remotely.ScreenCast.Core.Capture
 {
     public class ScreenCaster
     {
diff --git a/Remotely_ScreenCast.Core/Conductor.cs b/ScreenCast.Core/Conductor.cs
similarity index 93%
rename from Remotely_ScreenCast.Core/Conductor.cs
rename to ScreenCast.Core/Conductor.cs
index a72c3a65..879b06a8 100644
--- a/Remotely_ScreenCast.Core/Conductor.cs
+++ b/ScreenCast.Core/Conductor.cs
@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
-using Remotely_Shared.Models;
-using Remotely_ScreenCast.Core.Enums;
-using Remotely_ScreenCast.Core.Input;
-using Remotely_ScreenCast.Core.Models;
-using Remotely_ScreenCast.Core.Sockets;
-using Remotely_ScreenCast.Core.Utilities;
+using Remotely.Shared.Models;
+using Remotely.ScreenCast.Core.Enums;
+using Remotely.ScreenCast.Core.Input;
+using Remotely.ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Sockets;
+using Remotely.ScreenCast.Core.Utilities;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -13,7 +13,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core
+namespace Remotely.ScreenCast.Core
 {
     public class Conductor
     {
diff --git a/Remotely_ScreenCast.Core/Enums/AppMode.cs b/ScreenCast.Core/Enums/AppMode.cs
similarity index 82%
rename from Remotely_ScreenCast.Core/Enums/AppMode.cs
rename to ScreenCast.Core/Enums/AppMode.cs
index 849618b5..cfe4f370 100644
--- a/Remotely_ScreenCast.Core/Enums/AppMode.cs
+++ b/ScreenCast.Core/Enums/AppMode.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core.Enums
+namespace Remotely.ScreenCast.Core.Enums
 {
     public enum AppMode
     {
diff --git a/Remotely_ScreenCast.Core/Input/IKeyboardMouseInput.cs b/ScreenCast.Core/Input/IKeyboardMouseInput.cs
similarity index 89%
rename from Remotely_ScreenCast.Core/Input/IKeyboardMouseInput.cs
rename to ScreenCast.Core/Input/IKeyboardMouseInput.cs
index 5581e773..d68b4bd2 100644
--- a/Remotely_ScreenCast.Core/Input/IKeyboardMouseInput.cs
+++ b/ScreenCast.Core/Input/IKeyboardMouseInput.cs
@@ -1,11 +1,11 @@
-using Remotely_ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core.Input
+namespace Remotely.ScreenCast.Core.Input
 {
     public interface IKeyboardMouseInput
     {
diff --git a/Remotely_ScreenCast.Core/Models/Viewer.cs b/ScreenCast.Core/Models/Viewer.cs
similarity index 94%
rename from Remotely_ScreenCast.Core/Models/Viewer.cs
rename to ScreenCast.Core/Models/Viewer.cs
index 0a725112..3914b7d5 100644
--- a/Remotely_ScreenCast.Core/Models/Viewer.cs
+++ b/ScreenCast.Core/Models/Viewer.cs
@@ -1,4 +1,4 @@
-using Remotely_ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Capture;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -6,7 +6,7 @@ using System.Drawing.Imaging;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core.Models
+namespace Remotely.ScreenCast.Core.Models
 {
     public class Viewer
     {
diff --git a/Remotely_ScreenCast.Core/Remotely_ScreenCast.Core.csproj b/ScreenCast.Core/ScreenCast.Core.csproj
similarity index 83%
rename from Remotely_ScreenCast.Core/Remotely_ScreenCast.Core.csproj
rename to ScreenCast.Core/ScreenCast.Core.csproj
index 30fa02af..4cbbd36c 100644
--- a/Remotely_ScreenCast.Core/Remotely_ScreenCast.Core.csproj
+++ b/ScreenCast.Core/ScreenCast.Core.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Remotely.ScreenCast.Core</RootNamespace>
+    <AssemblyName>Remotely_ScreenCast.Core</AssemblyName>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -24,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj" />
+    <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Remotely_ScreenCast.Core/Sockets/CasterSocket.cs b/ScreenCast.Core/Sockets/CasterSocket.cs
similarity index 98%
rename from Remotely_ScreenCast.Core/Sockets/CasterSocket.cs
rename to ScreenCast.Core/Sockets/CasterSocket.cs
index 77995078..45e4be37 100644
--- a/Remotely_ScreenCast.Core/Sockets/CasterSocket.cs
+++ b/ScreenCast.Core/Sockets/CasterSocket.cs
@@ -1,20 +1,20 @@
 using Microsoft.AspNetCore.SignalR.Client;
-using Remotely_Shared.Models;
-using Remotely_ScreenCast.Core.Models;
+using Remotely.Shared.Models;
+using Remotely.ScreenCast.Core.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Remotely_ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Capture;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
-using Remotely_ScreenCast.Core.Utilities;
-using Remotely_ScreenCast.Core.Input;
+using Remotely.ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Core.Input;
 
-namespace Remotely_ScreenCast.Core.Sockets
+namespace Remotely.ScreenCast.Core.Sockets
 {
     public class CasterSocket
     {
diff --git a/Remotely_ScreenCast.Core/Utilities/Logger.cs b/ScreenCast.Core/Utilities/Logger.cs
similarity index 98%
rename from Remotely_ScreenCast.Core/Utilities/Logger.cs
rename to ScreenCast.Core/Utilities/Logger.cs
index a8e5a217..212b6d58 100644
--- a/Remotely_ScreenCast.Core/Utilities/Logger.cs
+++ b/ScreenCast.Core/Utilities/Logger.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Core.Utilities
+namespace Remotely.ScreenCast.Core.Utilities
 {
     public static class Logger
     {
diff --git a/Remotely_ScreenCast.Linux/Capture/X11Capture.cs b/ScreenCast.Linux/Capture/X11Capture.cs
similarity index 96%
rename from Remotely_ScreenCast.Linux/Capture/X11Capture.cs
rename to ScreenCast.Linux/Capture/X11Capture.cs
index 59ac8121..ca71d935 100644
--- a/Remotely_ScreenCast.Linux/Capture/X11Capture.cs
+++ b/ScreenCast.Linux/Capture/X11Capture.cs
@@ -1,6 +1,6 @@
-using Remotely_ScreenCast.Core.Capture;
-using Remotely_ScreenCast.Core.Utilities;
-using Remotely_ScreenCast.Linux.X11Interop;
+using Remotely.ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Linux.X11Interop;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -8,7 +8,7 @@ using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Remotely_ScreenCast.Linux.Capture
+namespace Remotely.ScreenCast.Linux.Capture
 {
     public class X11Capture : ICapturer
     {
diff --git a/Remotely_ScreenCast.Linux/Input/X11Input.cs b/ScreenCast.Linux/Input/X11Input.cs
similarity index 97%
rename from Remotely_ScreenCast.Linux/Input/X11Input.cs
rename to ScreenCast.Linux/Input/X11Input.cs
index 399a8464..7a27d373 100644
--- a/Remotely_ScreenCast.Linux/Input/X11Input.cs
+++ b/ScreenCast.Linux/Input/X11Input.cs
@@ -1,15 +1,15 @@
-using Remotely_ScreenCast.Core.Input;
-using Remotely_ScreenCast.Core.Utilities;
-using Remotely_ScreenCast.Linux.X11Interop;
-using Remotely_ScreenCast.Core;
+using Remotely.ScreenCast.Core.Input;
+using Remotely.ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Linux.X11Interop;
+using Remotely.ScreenCast.Core;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Linq;
-using Remotely_ScreenCast.Linux.Capture;
-using Remotely_ScreenCast.Core.Models;
+using Remotely.ScreenCast.Linux.Capture;
+using Remotely.ScreenCast.Core.Models;
 
-namespace Remotely_ScreenCast.Linux.Input
+namespace Remotely.ScreenCast.Linux.Input
 {
     public class X11Input : IKeyboardMouseInput
     {
diff --git a/Remotely_ScreenCast.Linux/Program.cs b/ScreenCast.Linux/Program.cs
similarity index 86%
rename from Remotely_ScreenCast.Linux/Program.cs
rename to ScreenCast.Linux/Program.cs
index a5c1c633..09ff00f2 100644
--- a/Remotely_ScreenCast.Linux/Program.cs
+++ b/ScreenCast.Linux/Program.cs
@@ -1,17 +1,17 @@
-using Remotely_Shared.Models;
-using Remotely_ScreenCast.Core;
-using Remotely_ScreenCast.Core.Capture;
-using Remotely_ScreenCast.Core.Utilities;
-using Remotely_ScreenCast.Linux.Capture;
-using Remotely_ScreenCast.Linux.Input;
-using Remotely_ScreenCast.Linux.X11Interop;
+using Remotely.Shared.Models;
+using Remotely.ScreenCast.Core;
+using Remotely.ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Linux.Capture;
+using Remotely.ScreenCast.Linux.Input;
+using Remotely.ScreenCast.Linux.X11Interop;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
 using System.Threading.Tasks;
 
-namespace Remotely_ScreenCast.Linux
+namespace Remotely.ScreenCast.Linux
 {
     public class Program
     {
diff --git a/Remotely_ScreenCast.Linux/Remotely_ScreenCast.Linux.csproj b/ScreenCast.Linux/ScreenCast.Linux.csproj
similarity index 80%
rename from Remotely_ScreenCast.Linux/Remotely_ScreenCast.Linux.csproj
rename to ScreenCast.Linux/ScreenCast.Linux.csproj
index 521c7428..09fccd15 100644
--- a/Remotely_ScreenCast.Linux/Remotely_ScreenCast.Linux.csproj
+++ b/ScreenCast.Linux/ScreenCast.Linux.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <Description>Allows unattended remote control via the Remotely server.</Description>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <AssemblyName>Remotely_ScreenCast.Linux</AssemblyName>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -21,8 +22,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Remotely_ScreenCast.Core\Remotely_ScreenCast.Core.csproj" />
-    <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj" />
+    <ProjectReference Include="..\ScreenCast.Core\ScreenCast.Core.csproj" />
+    <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Remotely_ScreenCast.Linux/X11Interop/LibX11.cs b/ScreenCast.Linux/X11Interop/LibX11.cs
similarity index 99%
rename from Remotely_ScreenCast.Linux/X11Interop/LibX11.cs
rename to ScreenCast.Linux/X11Interop/LibX11.cs
index 91456bdd..876f53f5 100644
--- a/Remotely_ScreenCast.Linux/X11Interop/LibX11.cs
+++ b/ScreenCast.Linux/X11Interop/LibX11.cs
@@ -31,7 +31,7 @@ using System.Security;
 using System.Security.Permissions;
 using System.Text;
 
-namespace Remotely_ScreenCast.Linux.X11Interop
+namespace Remotely.ScreenCast.Linux.X11Interop
 {
     public static unsafe class LibX11
     {
diff --git a/Remotely_ScreenCast.Linux/X11Interop/LibXtst.cs b/ScreenCast.Linux/X11Interop/LibXtst.cs
similarity index 94%
rename from Remotely_ScreenCast.Linux/X11Interop/LibXtst.cs
rename to ScreenCast.Linux/X11Interop/LibXtst.cs
index 0dd00ec3..44bb2d8f 100644
--- a/Remotely_ScreenCast.Linux/X11Interop/LibXtst.cs
+++ b/ScreenCast.Linux/X11Interop/LibXtst.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Remotely_ScreenCast.Linux.X11Interop
+namespace Remotely.ScreenCast.Linux.X11Interop
 {
     public class LibXtst
     {
diff --git a/Remotely_ScreenCast.Win/App.config b/ScreenCast.Win/App.config
similarity index 100%
rename from Remotely_ScreenCast.Win/App.config
rename to ScreenCast.Win/App.config
diff --git a/Remotely_ScreenCast.Win/Capture/AudioCapturer.cs b/ScreenCast.Win/Capture/AudioCapturer.cs
similarity index 96%
rename from Remotely_ScreenCast.Win/Capture/AudioCapturer.cs
rename to ScreenCast.Win/Capture/AudioCapturer.cs
index bcf4afdb..93bf7b88 100644
--- a/Remotely_ScreenCast.Win/Capture/AudioCapturer.cs
+++ b/ScreenCast.Win/Capture/AudioCapturer.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using NAudio.Wave;
-using Remotely_ScreenCast.Core;
+using Remotely.ScreenCast.Core;
 
-namespace Remotely_ScreenCast.Win.Capture
+namespace Remotely.ScreenCast.Win.Capture
 {
     public class AudioCapturer
     {
diff --git a/Remotely_ScreenCast.Win/Capture/BitBltCapture.cs b/ScreenCast.Win/Capture/BitBltCapture.cs
similarity index 96%
rename from Remotely_ScreenCast.Win/Capture/BitBltCapture.cs
rename to ScreenCast.Win/Capture/BitBltCapture.cs
index 556a70d3..171324d8 100644
--- a/Remotely_ScreenCast.Win/Capture/BitBltCapture.cs
+++ b/ScreenCast.Win/Capture/BitBltCapture.cs
@@ -11,11 +11,11 @@ using System.Collections.Generic;
 using System.Drawing.Drawing2D;
 using System.Diagnostics;
 using System.Runtime.Serialization.Formatters.Binary;
-using Remotely_ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Core.Utilities;
 using System.Threading;
-using Remotely_ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Capture;
 
-namespace Remotely_ScreenCast.Win.Capture
+namespace Remotely.ScreenCast.Win.Capture
 {
     public class BitBltCapture : ICapturer
     {
diff --git a/Remotely_ScreenCast.Win/Capture/CursorIconWatcher.cs b/ScreenCast.Win/Capture/CursorIconWatcher.cs
similarity index 96%
rename from Remotely_ScreenCast.Win/Capture/CursorIconWatcher.cs
rename to ScreenCast.Win/Capture/CursorIconWatcher.cs
index 1234d7f4..5831fb50 100644
--- a/Remotely_ScreenCast.Win/Capture/CursorIconWatcher.cs
+++ b/ScreenCast.Win/Capture/CursorIconWatcher.cs
@@ -1,5 +1,5 @@
-using Remotely_ScreenCast.Core;
-using Remotely_ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core;
+using Remotely.ScreenCast.Core.Models;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -11,10 +11,10 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
 using System.Windows.Forms;
-using Remotely_Shared.Win32;
-using Remotely_Shared.Models;
+using Remotely.Shared.Win32;
+using Remotely.Shared.Models;
 
-namespace Remotely_ScreenCast.Win.Capture
+namespace Remotely.ScreenCast.Win.Capture
 {
     /// <summary>
     /// A class that can be used to watch for cursor icon changes.
diff --git a/Remotely_ScreenCast.Win/Capture/DXCapture.cs b/ScreenCast.Win/Capture/DXCapture.cs
similarity index 98%
rename from Remotely_ScreenCast.Win/Capture/DXCapture.cs
rename to ScreenCast.Win/Capture/DXCapture.cs
index 1f113ad7..8ae2aa09 100644
--- a/Remotely_ScreenCast.Win/Capture/DXCapture.cs
+++ b/ScreenCast.Win/Capture/DXCapture.cs
@@ -1,5 +1,5 @@
-using Remotely_ScreenCast.Core.Capture;
-using Remotely_ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Utilities;
 using SharpDX;
 using SharpDX.Direct3D11;
 using SharpDX.DXGI;
@@ -11,7 +11,7 @@ using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
 
-namespace Remotely_ScreenCast.Win.Capture
+namespace Remotely.ScreenCast.Win.Capture
 {
     public class DXCapture : ICapturer
     {
diff --git a/Remotely_ScreenCast.Win/FodyWeavers.xml b/ScreenCast.Win/FodyWeavers.xml
similarity index 100%
rename from Remotely_ScreenCast.Win/FodyWeavers.xml
rename to ScreenCast.Win/FodyWeavers.xml
diff --git a/Remotely_ScreenCast.Win/FodyWeavers.xsd b/ScreenCast.Win/FodyWeavers.xsd
similarity index 100%
rename from Remotely_ScreenCast.Win/FodyWeavers.xsd
rename to ScreenCast.Win/FodyWeavers.xsd
diff --git a/Remotely_ScreenCast.Win/Input/WinInput.cs b/ScreenCast.Win/Input/WinInput.cs
similarity index 97%
rename from Remotely_ScreenCast.Win/Input/WinInput.cs
rename to ScreenCast.Win/Input/WinInput.cs
index d964ee16..4aaf809b 100644
--- a/Remotely_ScreenCast.Win/Input/WinInput.cs
+++ b/ScreenCast.Win/Input/WinInput.cs
@@ -1,11 +1,11 @@
-using Remotely_ScreenCast.Core.Input;
-using Remotely_ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Input;
+using Remotely.ScreenCast.Core.Models;
 using System;
-using Remotely_Shared.Win32;
-using static Remotely_Shared.Win32.User32;
-using Remotely_ScreenCast.Core.Capture;
+using Remotely.Shared.Win32;
+using static Remotely.Shared.Win32.User32;
+using Remotely.ScreenCast.Core.Capture;
 
-namespace Remotely_ScreenCast.Win.Input
+namespace Remotely.ScreenCast.Win.Input
 {
     public class WinInput : IKeyboardMouseInput
     {
diff --git a/Remotely_ScreenCast.Win/Program.cs b/ScreenCast.Win/Program.cs
similarity index 94%
rename from Remotely_ScreenCast.Win/Program.cs
rename to ScreenCast.Win/Program.cs
index 1622de20..63486305 100644
--- a/Remotely_ScreenCast.Win/Program.cs
+++ b/ScreenCast.Win/Program.cs
@@ -1,14 +1,14 @@
 using Microsoft.AspNetCore.SignalR.Client;
 using Microsoft.Extensions.DependencyInjection;
-using Remotely_Shared.Models;
-using Remotely_ScreenCast.Core;
-using Remotely_ScreenCast.Core.Capture;
-using Remotely_ScreenCast.Core.Enums;
-using Remotely_ScreenCast.Core.Models;
-using Remotely_ScreenCast.Core.Sockets;
-using Remotely_ScreenCast.Core.Utilities;
-using Remotely_ScreenCast.Win.Capture;
-using Remotely_ScreenCast.Win.Input;
+using Remotely.Shared.Models;
+using Remotely.ScreenCast.Core;
+using Remotely.ScreenCast.Core.Capture;
+using Remotely.ScreenCast.Core.Enums;
+using Remotely.ScreenCast.Core.Models;
+using Remotely.ScreenCast.Core.Sockets;
+using Remotely.ScreenCast.Core.Utilities;
+using Remotely.ScreenCast.Win.Capture;
+using Remotely.ScreenCast.Win.Input;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -20,10 +20,10 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Remotely_Shared.Win32;
+using Remotely.Shared.Win32;
 using NAudio.Wave;
 
-namespace Remotely_ScreenCast.Win
+namespace Remotely.ScreenCast.Win
 {
 	public class Program
 	{
diff --git a/Remotely_ScreenCast.Win/Properties/AssemblyInfo.cs b/ScreenCast.Win/Properties/AssemblyInfo.cs
similarity index 100%
rename from Remotely_ScreenCast.Win/Properties/AssemblyInfo.cs
rename to ScreenCast.Win/Properties/AssemblyInfo.cs
diff --git a/Remotely_ScreenCast.Win/Remotely_ScreenCast.Win.csproj b/ScreenCast.Win/ScreenCast.Win.csproj
similarity index 96%
rename from Remotely_ScreenCast.Win/Remotely_ScreenCast.Win.csproj
rename to ScreenCast.Win/ScreenCast.Win.csproj
index 1263552d..bc8fd5cf 100644
--- a/Remotely_ScreenCast.Win/Remotely_ScreenCast.Win.csproj
+++ b/ScreenCast.Win/ScreenCast.Win.csproj
@@ -163,13 +163,13 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Remotely_ScreenCast.Core\Remotely_ScreenCast.Core.csproj">
+    <ProjectReference Include="..\ScreenCast.Core\ScreenCast.Core.csproj">
       <Project>{b04a1728-2e87-491e-bc7f-f575a1754def}</Project>
-      <Name>Remotely_ScreenCast.Core</Name>
+      <Name>ScreenCast.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj">
+    <ProjectReference Include="..\Shared\Shared.csproj">
       <Project>{3b1b36ae-7a60-4974-a868-1e24894d4149}</Project>
-      <Name>Remotely_Shared</Name>
+      <Name>Shared</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -179,8 +179,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Debug (
-  md "$(SolutionDir)Remotely_Agent\bin\Debug\netcoreapp2.2\ScreenCast\"
-  copy /y "$(TargetDir)\*" "$(SolutionDir)Remotely_Agent\bin\Debug\netcoreapp2.2\ScreenCast\"
+  md "$(SolutionDir)Agent\bin\Debug\netcoreapp2.2\ScreenCast\"
+  copy /y "$(TargetDir)\*" "$(SolutionDir)Agent\bin\Debug\netcoreapp2.2\ScreenCast\"
 )</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Remotely_ScreenCast.Win/packages.config b/ScreenCast.Win/packages.config
similarity index 100%
rename from Remotely_ScreenCast.Win/packages.config
rename to ScreenCast.Win/packages.config
diff --git a/Remotely_Server/API/ClientDownloadsController.cs b/Server/API/ClientDownloadsController.cs
similarity index 98%
rename from Remotely_Server/API/ClientDownloadsController.cs
rename to Server/API/ClientDownloadsController.cs
index b9940995..9fe192de 100644
--- a/Remotely_Server/API/ClientDownloadsController.cs
+++ b/Server/API/ClientDownloadsController.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.AspNetCore.Http;
@@ -12,7 +12,7 @@ using Microsoft.Extensions.FileProviders;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Route("api/[controller]")]
     public class ClientDownloadsController : Controller
diff --git a/Remotely_Server/API/CommandsController.cs b/Server/API/CommandsController.cs
similarity index 98%
rename from Remotely_Server/API/CommandsController.cs
rename to Server/API/CommandsController.cs
index 70199157..ebc3bf20 100644
--- a/Remotely_Server/API/CommandsController.cs
+++ b/Server/API/CommandsController.cs
@@ -6,15 +6,15 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Route("api/[controller]")]
     public class CommandsController : Controller
diff --git a/Remotely_Server/API/CoreVersionController.cs b/Server/API/CoreVersionController.cs
similarity index 96%
rename from Remotely_Server/API/CoreVersionController.cs
rename to Server/API/CoreVersionController.cs
index 22a4fc5e..bf3ba171 100644
--- a/Remotely_Server/API/CoreVersionController.cs
+++ b/Server/API/CoreVersionController.cs
@@ -5,7 +5,7 @@ using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Route("api/[controller]")]
     public class CoreVersionController : Controller
diff --git a/Remotely_Server/API/DevicesController.cs b/Server/API/DevicesController.cs
similarity index 93%
rename from Remotely_Server/API/DevicesController.cs
rename to Server/API/DevicesController.cs
index 29df2f93..0e068923 100644
--- a/Remotely_Server/API/DevicesController.cs
+++ b/Server/API/DevicesController.cs
@@ -2,15 +2,15 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Authorize]
     [ApiController]
diff --git a/Remotely_Server/API/FileSharing.cs b/Server/API/FileSharing.cs
similarity index 95%
rename from Remotely_Server/API/FileSharing.cs
rename to Server/API/FileSharing.cs
index 6d10c700..62774d62 100644
--- a/Remotely_Server/API/FileSharing.cs
+++ b/Server/API/FileSharing.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -11,7 +11,7 @@ using Microsoft.Net.Http.Headers;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Route("api/[controller]")]
     public class FileSharing : Controller
diff --git a/Remotely_Server/API/LoginController.cs b/Server/API/LoginController.cs
similarity index 93%
rename from Remotely_Server/API/LoginController.cs
rename to Server/API/LoginController.cs
index de4aeba8..de082887 100644
--- a/Remotely_Server/API/LoginController.cs
+++ b/Server/API/LoginController.cs
@@ -6,14 +6,14 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
-using Remotely_Server.Models;
-using Remotely_Server.Services;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
+using Remotely.Server.Models;
+using Remotely.Server.Services;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Route("api/[controller]")]
     public class LoginController : Controller
diff --git a/Remotely_Server/API/OrganizationManagementController.cs b/Server/API/OrganizationManagementController.cs
similarity index 98%
rename from Remotely_Server/API/OrganizationManagementController.cs
rename to Server/API/OrganizationManagementController.cs
index c18d594f..82bcf8cf 100644
--- a/Remotely_Server/API/OrganizationManagementController.cs
+++ b/Server/API/OrganizationManagementController.cs
@@ -3,17 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Remotely_Shared.Models;
-using Remotely_Shared.ViewModels;
-using Remotely_Server.Data;
-using Remotely_Server.Services;
+using Remotely.Shared.Models;
+using Remotely.Shared.ViewModels;
+using Remotely.Server.Data;
+using Remotely.Server.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Route("api/[controller]")]
     [Authorize]
diff --git a/Remotely_Server/API/RemoteControlController.cs b/Server/API/RemoteControlController.cs
similarity index 97%
rename from Remotely_Server/API/RemoteControlController.cs
rename to Server/API/RemoteControlController.cs
index 8f0c7bea..f70fb2b5 100644
--- a/Remotely_Server/API/RemoteControlController.cs
+++ b/Server/API/RemoteControlController.cs
@@ -8,14 +8,14 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
-using Remotely_Server.Models;
-using Remotely_Server.Services;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
+using Remotely.Server.Models;
+using Remotely.Server.Services;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace Remotely_Server.API
+namespace Remotely.Server.API
 {
     [Route("api/[controller]")]
     public class RemoteControlController : Controller
diff --git a/Remotely_Server/Areas/Identity/IdentityHostingStartup.cs b/Server/Areas/Identity/IdentityHostingStartup.cs
similarity index 79%
rename from Remotely_Server/Areas/Identity/IdentityHostingStartup.cs
rename to Server/Areas/Identity/IdentityHostingStartup.cs
index d3b3af75..64f36145 100644
--- a/Remotely_Server/Areas/Identity/IdentityHostingStartup.cs
+++ b/Server/Areas/Identity/IdentityHostingStartup.cs
@@ -1,5 +1,5 @@
 using System;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI;
@@ -7,8 +7,8 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-[assembly: HostingStartup(typeof(Remotely_Server.Areas.Identity.IdentityHostingStartup))]
-namespace Remotely_Server.Areas.Identity
+[assembly: HostingStartup(typeof(Remotely.Server.Areas.Identity.IdentityHostingStartup))]
+namespace Remotely.Server.Areas.Identity
 {
     public class IdentityHostingStartup : IHostingStartup
     {
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml
rename to Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
similarity index 96%
rename from Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
rename to Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
index cc2883dd..617ca38d 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
@@ -4,13 +4,13 @@ using System.ComponentModel.DataAnnotations;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account
+namespace Remotely.Server.Areas.Identity.Pages.Account
 {
     [AllowAnonymous]
     public class ForgotPasswordModel : PageModel
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml b/Server/Areas/Identity/Pages/Account/Login.cshtml
similarity index 98%
rename from Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml
rename to Server/Areas/Identity/Pages/Account/Login.cshtml
index 5988a2e1..f40c6e3b 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml
+++ b/Server/Areas/Identity/Pages/Account/Login.cshtml
@@ -1,5 +1,5 @@
 @page
-@using Remotely_Shared.Models
+@using Remotely.Shared.Models
 @model LoginModel
 
 @{
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml.cs b/Server/Areas/Identity/Pages/Account/Login.cshtml.cs
similarity index 96%
rename from Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml.cs
rename to Server/Areas/Identity/Pages/Account/Login.cshtml.cs
index 35e5a7fa..7be3c92b 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Login.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Login.cshtml.cs
@@ -9,10 +9,10 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using Remotely_Server.Data;
-using Remotely_Shared.Models;
+using Remotely.Server.Data;
+using Remotely.Shared.Models;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account
+namespace Remotely.Server.Areas.Identity.Pages.Account
 {
     [AllowAnonymous]
     public class LoginModel : PageModel
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
rename to Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
similarity index 97%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
rename to Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
index 603477aa..ddcf0bc3 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
@@ -10,10 +10,10 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using Remotely_Server.Data;
-using Remotely_Shared.Models;
+using Remotely.Server.Data;
+using Remotely.Shared.Models;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account.Manage
+namespace Remotely.Server.Areas.Identity.Pages.Account.Manage
 {
     public class EnableAuthenticatorModel : PageModel
     {
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Index.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/Index.cshtml
rename to Server/Areas/Identity/Pages/Account/Manage/Index.cshtml
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
similarity index 97%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
rename to Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
index 17003307..b843d031 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
@@ -4,14 +4,14 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account.Manage
+namespace Remotely.Server.Areas.Identity.Pages.Account.Manage
 {
     public partial class IndexModel : PageModel
     {
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
similarity index 97%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
rename to Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
index 7ee80392..b40cd990 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account.Manage
+namespace Remotely.Server.Areas.Identity.Pages.Account.Manage
 {
     public static class ManageNavPages
     {
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Options.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml
rename to Server/Areas/Identity/Pages/Account/Manage/Options.cshtml
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/Options.cshtml.cs
similarity index 89%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml.cs
rename to Server/Areas/Identity/Pages/Account/Manage/Options.cshtml.cs
index 09e9784e..610828ee 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Options.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/Options.cshtml.cs
@@ -2,13 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account.Manage
+namespace Remotely.Server.Areas.Identity.Pages.Account.Manage
 {
     public class OptionsModel : PageModel
     {
@@ -28,7 +28,7 @@ namespace Remotely_Server.Areas.Identity.Pages.Account.Manage
             Options = DataService.GetUserOptions(User.Identity.Name);
         }
 
-        public IActionResult OnPost(Remotely_Shared.Models.RemotelyUserOptions options)
+        public IActionResult OnPost(RemotelyUserOptions options)
         {
             if (!ModelState.IsValid)
             {
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
rename to Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
similarity index 94%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
rename to Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
index 31dfc2bb..b7180fc3 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Manage/Organization.cshtml.cs
@@ -1,13 +1,13 @@
-using Remotely_Shared.Models;
-using Remotely_Shared.ViewModels;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Shared.ViewModels;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account.Manage
+namespace Remotely.Server.Areas.Identity.Pages.Account.Manage
 {
     public class OrganizationModel : PageModel
     {
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
rename to Server/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
rename to Server/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
diff --git a/Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
new file mode 100644
index 00000000..106be22c
--- /dev/null
+++ b/Server/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
@@ -0,0 +1,3 @@
+@using Remotely.Server.Areas.Identity.Pages.Account.Manage
+@using Remotely.Server.Data;
+@using Remotely.Shared.Models
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml b/Server/Areas/Identity/Pages/Account/Register.cshtml
similarity index 96%
rename from Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml
rename to Server/Areas/Identity/Pages/Account/Register.cshtml
index 781f8fb5..4f48e90e 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml
+++ b/Server/Areas/Identity/Pages/Account/Register.cshtml
@@ -1,5 +1,5 @@
 @page
-@inject Remotely_Server.Services.ApplicationConfig AppConfig
+@inject Remotely.Server.Services.ApplicationConfig AppConfig
 @model RegisterModel
 @{
     ViewData["Title"] = "Register";
diff --git a/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml.cs b/Server/Areas/Identity/Pages/Account/Register.cshtml.cs
similarity index 96%
rename from Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml.cs
rename to Server/Areas/Identity/Pages/Account/Register.cshtml.cs
index 31b65c19..c6e5c8d5 100644
--- a/Remotely_Server/Areas/Identity/Pages/Account/Register.cshtml.cs
+++ b/Server/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -4,15 +4,15 @@ using System.ComponentModel.DataAnnotations;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using Remotely_Server.Services;
+using Remotely.Server.Services;
 
-namespace Remotely_Server.Areas.Identity.Pages.Account
+namespace Remotely.Server.Areas.Identity.Pages.Account
 {
     [AllowAnonymous]
     public class RegisterModel : PageModel
diff --git a/Server/Areas/Identity/Pages/Account/_ViewImports.cshtml b/Server/Areas/Identity/Pages/Account/_ViewImports.cshtml
new file mode 100644
index 00000000..434fdd4c
--- /dev/null
+++ b/Server/Areas/Identity/Pages/Account/_ViewImports.cshtml
@@ -0,0 +1,2 @@
+@using Remotely.Server.Areas.Identity.Pages.Account
+@using Remotely.Shared.Models
diff --git a/Remotely_Server/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/Server/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
rename to Server/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
diff --git a/Server/Areas/Identity/Pages/_ViewImports.cshtml b/Server/Areas/Identity/Pages/_ViewImports.cshtml
new file mode 100644
index 00000000..d94da4be
--- /dev/null
+++ b/Server/Areas/Identity/Pages/_ViewImports.cshtml
@@ -0,0 +1,5 @@
+@using Microsoft.AspNetCore.Identity
+@using Remotely.Server.Areas.Identity
+@using Remotely.Shared.Models
+@namespace Remotely.Server.Areas.Identity.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/Remotely_Server/Areas/Identity/Pages/_ViewStart.cshtml b/Server/Areas/Identity/Pages/_ViewStart.cshtml
similarity index 100%
rename from Remotely_Server/Areas/Identity/Pages/_ViewStart.cshtml
rename to Server/Areas/Identity/Pages/_ViewStart.cshtml
diff --git a/Server/CurrentVersion.txt b/Server/CurrentVersion.txt
new file mode 100644
index 00000000..9f5075a5
--- /dev/null
+++ b/Server/CurrentVersion.txt
@@ -0,0 +1 @@
+2019.06.15.1805
diff --git a/Remotely_Server/Data/ApplicationDbContext.cs b/Server/Data/ApplicationDbContext.cs
similarity index 98%
rename from Remotely_Server/Data/ApplicationDbContext.cs
rename to Server/Data/ApplicationDbContext.cs
index 6b70a757..2613b0cf 100644
--- a/Remotely_Server/Data/ApplicationDbContext.cs
+++ b/Server/Data/ApplicationDbContext.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 
-namespace Remotely_Server.Data
+namespace Remotely.Server.Data
 {
     public class ApplicationDbContext : IdentityDbContext
     {
diff --git a/Remotely_Server/Data/DataService.cs b/Server/Data/DataService.cs
similarity index 99%
rename from Remotely_Server/Data/DataService.cs
rename to Server/Data/DataService.cs
index 043fa326..9aa4505d 100644
--- a/Remotely_Server/Data/DataService.cs
+++ b/Server/Data/DataService.cs
@@ -1,6 +1,6 @@
-using Remotely_Shared.Models;
-using Remotely_Shared.ViewModels;
-using Remotely_Server.Services;
+using Remotely.Shared.Models;
+using Remotely.Shared.ViewModels;
+using Remotely.Server.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Remotely_Server.Data
+namespace Remotely.Server.Data
 {
     public class DataService
     {
diff --git a/Remotely_Server/Migrations/20190405052943_Initial.Designer.cs b/Server/Migrations/20190405052943_Initial.Designer.cs
similarity index 99%
rename from Remotely_Server/Migrations/20190405052943_Initial.Designer.cs
rename to Server/Migrations/20190405052943_Initial.Designer.cs
index 5cc1e3fe..b49682c1 100644
--- a/Remotely_Server/Migrations/20190405052943_Initial.Designer.cs
+++ b/Server/Migrations/20190405052943_Initial.Designer.cs
@@ -4,9 +4,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 
-namespace Remotely_Server.Migrations
+namespace Remotely.Server.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     [Migration("20190405052943_Initial")]
diff --git a/Remotely_Server/Migrations/20190405052943_Initial.cs b/Server/Migrations/20190405052943_Initial.cs
similarity index 99%
rename from Remotely_Server/Migrations/20190405052943_Initial.cs
rename to Server/Migrations/20190405052943_Initial.cs
index 874c820f..7b05b5a4 100644
--- a/Remotely_Server/Migrations/20190405052943_Initial.cs
+++ b/Server/Migrations/20190405052943_Initial.cs
@@ -1,7 +1,7 @@
 using System;
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Remotely_Server.Migrations
+namespace Remotely.Server.Migrations
 {
     public partial class Initial : Migration
     {
diff --git a/Remotely_Server/Migrations/ApplicationDbContextModelSnapshot.cs b/Server/Migrations/ApplicationDbContextModelSnapshot.cs
similarity index 99%
rename from Remotely_Server/Migrations/ApplicationDbContextModelSnapshot.cs
rename to Server/Migrations/ApplicationDbContextModelSnapshot.cs
index 239ce3a1..a342c1f2 100644
--- a/Remotely_Server/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Server/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -3,9 +3,9 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 
-namespace Remotely_Server.Migrations
+namespace Remotely.Server.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
     partial class ApplicationDbContextModelSnapshot : ModelSnapshot
diff --git a/Remotely_Server/Models/ApiLogin.cs b/Server/Models/ApiLogin.cs
similarity index 87%
rename from Remotely_Server/Models/ApiLogin.cs
rename to Server/Models/ApiLogin.cs
index 8bfc42f5..29667c18 100644
--- a/Remotely_Server/Models/ApiLogin.cs
+++ b/Server/Models/ApiLogin.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Models
+namespace Remotely.Server.Models
 {
     public class ApiLogin
     {
diff --git a/Remotely_Server/Models/RecordingSessionState.cs b/Server/Models/RecordingSessionState.cs
similarity index 90%
rename from Remotely_Server/Models/RecordingSessionState.cs
rename to Server/Models/RecordingSessionState.cs
index 76b49233..b9fc0e64 100644
--- a/Remotely_Server/Models/RecordingSessionState.cs
+++ b/Server/Models/RecordingSessionState.cs
@@ -5,7 +5,7 @@ using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Models
+namespace Remotely.Server.Models
 {
     public class RecordingSessionState
     {
diff --git a/Remotely_Server/Models/RemoteControlFrame.cs b/Server/Models/RemoteControlFrame.cs
similarity index 96%
rename from Remotely_Server/Models/RemoteControlFrame.cs
rename to Server/Models/RemoteControlFrame.cs
index cf782aed..e993a0c1 100644
--- a/Remotely_Server/Models/RemoteControlFrame.cs
+++ b/Server/Models/RemoteControlFrame.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Server.Models
+namespace Remotely.Server.Models
 {
     public class RemoteControlFrame
     {
diff --git a/Remotely_Server/Models/RemoteControlRequest.cs b/Server/Models/RemoteControlRequest.cs
similarity index 89%
rename from Remotely_Server/Models/RemoteControlRequest.cs
rename to Server/Models/RemoteControlRequest.cs
index 33e3f99f..b40cbfb4 100644
--- a/Remotely_Server/Models/RemoteControlRequest.cs
+++ b/Server/Models/RemoteControlRequest.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Models
+namespace Remotely.Server.Models
 {
     public class RemoteControlRequest
     {
diff --git a/Remotely_Server/Pages/About.cshtml b/Server/Pages/About.cshtml
similarity index 100%
rename from Remotely_Server/Pages/About.cshtml
rename to Server/Pages/About.cshtml
diff --git a/Remotely_Server/Pages/About.cshtml.cs b/Server/Pages/About.cshtml.cs
similarity index 88%
rename from Remotely_Server/Pages/About.cshtml.cs
rename to Server/Pages/About.cshtml.cs
index 12227603..21409418 100644
--- a/Remotely_Server/Pages/About.cshtml.cs
+++ b/Server/Pages/About.cshtml.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     public class AboutModel : PageModel
     {
diff --git a/Remotely_Server/Pages/Clients.cshtml b/Server/Pages/Clients.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Clients.cshtml
rename to Server/Pages/Clients.cshtml
diff --git a/Remotely_Server/Pages/Clients.cshtml.cs b/Server/Pages/Clients.cshtml.cs
similarity index 90%
rename from Remotely_Server/Pages/Clients.cshtml.cs
rename to Server/Pages/Clients.cshtml.cs
index 6a94fef7..3ef99276 100644
--- a/Remotely_Server/Pages/Clients.cshtml.cs
+++ b/Server/Pages/Clients.cshtml.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     public class ClientsModel : PageModel
     {
diff --git a/Remotely_Server/Pages/Credits.cshtml b/Server/Pages/Credits.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Credits.cshtml
rename to Server/Pages/Credits.cshtml
diff --git a/Remotely_Server/Pages/Credits.cshtml.cs b/Server/Pages/Credits.cshtml.cs
similarity index 89%
rename from Remotely_Server/Pages/Credits.cshtml.cs
rename to Server/Pages/Credits.cshtml.cs
index 02ffff94..6dad3e14 100644
--- a/Remotely_Server/Pages/Credits.cshtml.cs
+++ b/Server/Pages/Credits.cshtml.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     public class CreditsModel : PageModel
     {
diff --git a/Remotely_Server/Pages/Error.cshtml b/Server/Pages/Error.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Error.cshtml
rename to Server/Pages/Error.cshtml
diff --git a/Remotely_Server/Pages/Error.cshtml.cs b/Server/Pages/Error.cshtml.cs
similarity index 90%
rename from Remotely_Server/Pages/Error.cshtml.cs
rename to Server/Pages/Error.cshtml.cs
index efdda0da..407583ad 100644
--- a/Remotely_Server/Pages/Error.cshtml.cs
+++ b/Server/Pages/Error.cshtml.cs
@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel
@@ -36,9 +36,9 @@ namespace Remotely_Server.Pages
                     var error = feature.Error;
                     while (error != null)
                     {
-                        var logEntry = new Remotely_Shared.Models.EventLog()
+                        var logEntry = new Remotely.Shared.Models.EventLog()
                         {
-                            EventType = Remotely_Shared.Models.EventTypes.Error,
+                            EventType = Remotely.Shared.Models.EventTypes.Error,
                             Message = error.Message,
                             Source = error.Source,
                             StackTrace = error.StackTrace,
diff --git a/Remotely_Server/Pages/Index.cshtml b/Server/Pages/Index.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Index.cshtml
rename to Server/Pages/Index.cshtml
diff --git a/Remotely_Server/Pages/Index.cshtml.cs b/Server/Pages/Index.cshtml.cs
similarity index 89%
rename from Remotely_Server/Pages/Index.cshtml.cs
rename to Server/Pages/Index.cshtml.cs
index 964d0c1e..d4d7c98f 100644
--- a/Remotely_Server/Pages/Index.cshtml.cs
+++ b/Server/Pages/Index.cshtml.cs
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     public class IndexModel : PageModel
     {
diff --git a/Remotely_Server/Pages/Invite.cshtml b/Server/Pages/Invite.cshtml
similarity index 91%
rename from Remotely_Server/Pages/Invite.cshtml
rename to Server/Pages/Invite.cshtml
index b83fcd42..08201c93 100644
--- a/Remotely_Server/Pages/Invite.cshtml
+++ b/Server/Pages/Invite.cshtml
@@ -1,5 +1,5 @@
 @page
-@model Remotely_Server.Pages.InviteModel
+@model Remotely.Server.Pages.InviteModel
 @{
     ViewData["Title"] = "Invite";
 }
diff --git a/Remotely_Server/Pages/Invite.cshtml.cs b/Server/Pages/Invite.cshtml.cs
similarity index 95%
rename from Remotely_Server/Pages/Invite.cshtml.cs
rename to Server/Pages/Invite.cshtml.cs
index 243eac91..4f40183d 100644
--- a/Remotely_Server/Pages/Invite.cshtml.cs
+++ b/Server/Pages/Invite.cshtml.cs
@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     [Authorize]
     public class InviteModel : PageModel
diff --git a/Remotely_Server/Pages/Privacy.cshtml b/Server/Pages/Privacy.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Privacy.cshtml
rename to Server/Pages/Privacy.cshtml
diff --git a/Remotely_Server/Pages/Privacy.cshtml.cs b/Server/Pages/Privacy.cshtml.cs
similarity index 89%
rename from Remotely_Server/Pages/Privacy.cshtml.cs
rename to Server/Pages/Privacy.cshtml.cs
index 1d5c9ac6..61a4fdef 100644
--- a/Remotely_Server/Pages/Privacy.cshtml.cs
+++ b/Server/Pages/Privacy.cshtml.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     public class PrivacyModel : PageModel
     {
diff --git a/Remotely_Server/Pages/RemoteControl.cshtml b/Server/Pages/RemoteControl.cshtml
similarity index 98%
rename from Remotely_Server/Pages/RemoteControl.cshtml
rename to Server/Pages/RemoteControl.cshtml
index 970376e5..7313f790 100644
--- a/Remotely_Server/Pages/RemoteControl.cshtml
+++ b/Server/Pages/RemoteControl.cshtml
@@ -1,5 +1,5 @@
 @page
-@model Remotely_Server.Pages.RemoteControlModel
+@model Remotely.Server.Pages.RemoteControlModel
 @{
     Layout = null;
 }
diff --git a/Remotely_Server/Pages/RemoteControl.cshtml.cs b/Server/Pages/RemoteControl.cshtml.cs
similarity index 89%
rename from Remotely_Server/Pages/RemoteControl.cshtml.cs
rename to Server/Pages/RemoteControl.cshtml.cs
index c5af4b3d..e3afc3c2 100644
--- a/Remotely_Server/Pages/RemoteControl.cshtml.cs
+++ b/Server/Pages/RemoteControl.cshtml.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Remotely_Server.Pages
+namespace Remotely.Server.Pages
 {
     public class RemoteControlModel : PageModel
     {
diff --git a/Remotely_Server/Pages/Shared/_CookieConsentPartial.cshtml b/Server/Pages/Shared/_CookieConsentPartial.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Shared/_CookieConsentPartial.cshtml
rename to Server/Pages/Shared/_CookieConsentPartial.cshtml
diff --git a/Remotely_Server/Pages/Shared/_Layout.cshtml b/Server/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Shared/_Layout.cshtml
rename to Server/Pages/Shared/_Layout.cshtml
diff --git a/Remotely_Server/Pages/Shared/_LoginPartial.cshtml b/Server/Pages/Shared/_LoginPartial.cshtml
similarity index 89%
rename from Remotely_Server/Pages/Shared/_LoginPartial.cshtml
rename to Server/Pages/Shared/_LoginPartial.cshtml
index 4f127a8f..aa06ab6d 100644
--- a/Remotely_Server/Pages/Shared/_LoginPartial.cshtml
+++ b/Server/Pages/Shared/_LoginPartial.cshtml
@@ -1,7 +1,7 @@
-@inject Remotely_Server.Services.ApplicationConfig AppConfig
+@inject Remotely.Server.Services.ApplicationConfig AppConfig
 @using Microsoft.AspNetCore.Identity
-@using Remotely_Shared.Models
-@using Remotely_Server.Data;
+@using Remotely.Shared.Models
+@using Remotely.Server.Data;
 
 @inject SignInManager<RemotelyUser> SignInManager
 @inject UserManager<RemotelyUser> UserManager
diff --git a/Remotely_Server/Pages/Shared/_ValidationScriptsPartial.cshtml b/Server/Pages/Shared/_ValidationScriptsPartial.cshtml
similarity index 100%
rename from Remotely_Server/Pages/Shared/_ValidationScriptsPartial.cshtml
rename to Server/Pages/Shared/_ValidationScriptsPartial.cshtml
diff --git a/Remotely_Server/Pages/_DataGrid.cshtml b/Server/Pages/_DataGrid.cshtml
similarity index 100%
rename from Remotely_Server/Pages/_DataGrid.cshtml
rename to Server/Pages/_DataGrid.cshtml
diff --git a/Remotely_Server/Pages/_IndexLoggedIn.cshtml b/Server/Pages/_IndexLoggedIn.cshtml
similarity index 100%
rename from Remotely_Server/Pages/_IndexLoggedIn.cshtml
rename to Server/Pages/_IndexLoggedIn.cshtml
diff --git a/Remotely_Server/Pages/_IndexNotLoggedIn.cshtml b/Server/Pages/_IndexNotLoggedIn.cshtml
similarity index 93%
rename from Remotely_Server/Pages/_IndexNotLoggedIn.cshtml
rename to Server/Pages/_IndexNotLoggedIn.cshtml
index ca02fb1d..b9bee985 100644
--- a/Remotely_Server/Pages/_IndexNotLoggedIn.cshtml
+++ b/Server/Pages/_IndexNotLoggedIn.cshtml
@@ -1,4 +1,4 @@
-@inject Remotely_Server.Services.ApplicationConfig AppConfig
+@inject Remotely.Server.Services.ApplicationConfig AppConfig
 @model IndexModel
 
 <div class="console">
diff --git a/Remotely_Server/Pages/_LoadingWheel.cshtml b/Server/Pages/_LoadingWheel.cshtml
similarity index 100%
rename from Remotely_Server/Pages/_LoadingWheel.cshtml
rename to Server/Pages/_LoadingWheel.cshtml
diff --git a/Remotely_Server/Pages/_OSK.cshtml b/Server/Pages/_OSK.cshtml
similarity index 100%
rename from Remotely_Server/Pages/_OSK.cshtml
rename to Server/Pages/_OSK.cshtml
diff --git a/Remotely_Server/Pages/_ViewImports.cshtml b/Server/Pages/_ViewImports.cshtml
similarity index 51%
rename from Remotely_Server/Pages/_ViewImports.cshtml
rename to Server/Pages/_ViewImports.cshtml
index d167fa19..e872f413 100644
--- a/Remotely_Server/Pages/_ViewImports.cshtml
+++ b/Server/Pages/_ViewImports.cshtml
@@ -1,5 +1,5 @@
 @using Microsoft.AspNetCore.Identity
-@using Remotely_Server
-@using Remotely_Server.Data
-@namespace Remotely_Server.Pages
+@using Remotely.Server
+@using Remotely.Server.Data
+@namespace Remotely.Server.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/Remotely_Server/Pages/_ViewStart.cshtml b/Server/Pages/_ViewStart.cshtml
similarity index 100%
rename from Remotely_Server/Pages/_ViewStart.cshtml
rename to Server/Pages/_ViewStart.cshtml
diff --git a/Remotely_Server/Program.cs b/Server/Program.cs
similarity index 95%
rename from Remotely_Server/Program.cs
rename to Server/Program.cs
index 302aff3a..33b06015 100644
--- a/Remotely_Server/Program.cs
+++ b/Server/Program.cs
@@ -7,9 +7,9 @@ using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using Remotely_Shared.Services;
+using Remotely.Shared.Services;
 
-namespace Remotely_Server
+namespace Remotely.Server
 {
     public class Program
     {
diff --git a/Remotely_Server/Properties/launchSettings.json b/Server/Properties/launchSettings.json
similarity index 100%
rename from Remotely_Server/Properties/launchSettings.json
rename to Server/Properties/launchSettings.json
diff --git a/Remotely_Server/Remotely_Server.csproj b/Server/Server.csproj
similarity index 98%
rename from Remotely_Server/Remotely_Server.csproj
rename to Server/Server.csproj
index 8907deaa..a9ef6699 100644
--- a/Remotely_Server/Remotely_Server.csproj
+++ b/Server/Server.csproj
@@ -9,6 +9,8 @@
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
     <FileVersion>1.0.0.0</FileVersion>
     <Platforms>AnyCPU;x86;x64</Platforms>
+    <RootNamespace>Remotely.Server</RootNamespace>
+    <AssemblyName>Remotely_Server</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -176,7 +178,7 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj" />
+    <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Remotely_Server/Services/ApplicationConfig.cs b/Server/Services/ApplicationConfig.cs
similarity index 96%
rename from Remotely_Server/Services/ApplicationConfig.cs
rename to Server/Services/ApplicationConfig.cs
index 268ece25..2c1e2407 100644
--- a/Remotely_Server/Services/ApplicationConfig.cs
+++ b/Server/Services/ApplicationConfig.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using System;
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Services
+namespace Remotely.Server.Services
 {
     public class ApplicationConfig
     {
diff --git a/Remotely_Server/Services/BrowserSocketHub.cs b/Server/Services/BrowserSocketHub.cs
similarity index 98%
rename from Remotely_Server/Services/BrowserSocketHub.cs
rename to Server/Services/BrowserSocketHub.cs
index 9b95895d..b4cc9c17 100644
--- a/Remotely_Server/Services/BrowserSocketHub.cs
+++ b/Server/Services/BrowserSocketHub.cs
@@ -1,5 +1,5 @@
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
@@ -15,7 +15,7 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Services
+namespace Remotely.Server.Services
 {
     [Authorize]
     public class BrowserSocketHub : Hub
diff --git a/Remotely_Server/Services/DeviceSocketHub.cs b/Server/Services/DeviceSocketHub.cs
similarity index 98%
rename from Remotely_Server/Services/DeviceSocketHub.cs
rename to Server/Services/DeviceSocketHub.cs
index e8f8d078..a94d047e 100644
--- a/Remotely_Server/Services/DeviceSocketHub.cs
+++ b/Server/Services/DeviceSocketHub.cs
@@ -1,5 +1,5 @@
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.SignalR;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Services
+namespace Remotely.Server.Services
 {
     public class DeviceSocketHub : Hub
     {
diff --git a/Remotely_Server/Services/EmailSender.cs b/Server/Services/EmailSender.cs
similarity index 96%
rename from Remotely_Server/Services/EmailSender.cs
rename to Server/Services/EmailSender.cs
index 5986d58a..866474b6 100644
--- a/Remotely_Server/Services/EmailSender.cs
+++ b/Server/Services/EmailSender.cs
@@ -1,4 +1,4 @@
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using Newtonsoft.Json;
 using System;
@@ -9,7 +9,7 @@ using System.Net;
 using System.Net.Mail;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Services
+namespace Remotely.Server.Services
 {
     public class EmailSender : IEmailSender
     {
diff --git a/Remotely_Server/Services/RCBrowserSocketHub.cs b/Server/Services/RCBrowserSocketHub.cs
similarity index 98%
rename from Remotely_Server/Services/RCBrowserSocketHub.cs
rename to Server/Services/RCBrowserSocketHub.cs
index bd503a1e..13a57026 100644
--- a/Remotely_Server/Services/RCBrowserSocketHub.cs
+++ b/Server/Services/RCBrowserSocketHub.cs
@@ -1,14 +1,14 @@
-using Remotely_Shared.Models;
-using Remotely_Server.Data;
+using Remotely.Shared.Models;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.SignalR;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Remotely_Shared.Enums;
+using Remotely.Shared.Enums;
 
-namespace Remotely_Server.Services
+namespace Remotely.Server.Services
 {
     public class RCBrowserSocketHub : Hub
     {
diff --git a/Remotely_Server/Services/RCDeviceSocketHub.cs b/Server/Services/RCDeviceSocketHub.cs
similarity index 98%
rename from Remotely_Server/Services/RCDeviceSocketHub.cs
rename to Server/Services/RCDeviceSocketHub.cs
index 49c78439..ba18a0b9 100644
--- a/Remotely_Server/Services/RCDeviceSocketHub.cs
+++ b/Server/Services/RCDeviceSocketHub.cs
@@ -1,4 +1,4 @@
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.AspNetCore.SignalR;
 using System;
 using System.Collections.Concurrent;
@@ -8,9 +8,9 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using System.IO;
 using System.Drawing;
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 
-namespace Remotely_Server.Services
+namespace Remotely.Server.Services
 {
     public class RCDeviceSocketHub : Hub
     {
diff --git a/Remotely_Server/Services/RemoteControlSessionRecorder.cs b/Server/Services/RemoteControlSessionRecorder.cs
similarity index 98%
rename from Remotely_Server/Services/RemoteControlSessionRecorder.cs
rename to Server/Services/RemoteControlSessionRecorder.cs
index 2b36adb2..1f6ffd94 100644
--- a/Remotely_Server/Services/RemoteControlSessionRecorder.cs
+++ b/Server/Services/RemoteControlSessionRecorder.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
-using Remotely_Server.Data;
-using Remotely_Server.Models;
+using Remotely.Server.Data;
+using Remotely.Server.Models;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -11,7 +11,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_Server.Services
+namespace Remotely.Server.Services
 {
     public class RemoteControlSessionRecorder
     {
diff --git a/Remotely_Server/Startup.cs b/Server/Startup.cs
similarity index 98%
rename from Remotely_Server/Startup.cs
rename to Server/Startup.cs
index b9b02dbc..ead216e5 100644
--- a/Remotely_Server/Startup.cs
+++ b/Server/Startup.cs
@@ -9,18 +9,18 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.HttpsPolicy;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Remotely_Server.Data;
+using Remotely.Server.Data;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Identity.UI.Services;
 using System.IO;
-using Remotely_Server.Services;
+using Remotely.Server.Services;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.AspNetCore.SignalR;
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using Microsoft.AspNetCore.Http.Connections;
-using Remotely_Shared.Services;
+using Remotely.Shared.Services;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.AspNetCore.Identity.UI;
 using Microsoft.AspNetCore.Cors.Infrastructure;
@@ -28,7 +28,7 @@ using Swashbuckle.AspNetCore.Swagger;
 using Newtonsoft.Json;
 using System.Net;
 
-namespace Remotely_Server
+namespace Remotely.Server
 {
     public class Startup
     {
diff --git a/Remotely_Server/appsettings.Development.json b/Server/appsettings.Development.json
similarity index 100%
rename from Remotely_Server/appsettings.Development.json
rename to Server/appsettings.Development.json
diff --git a/Remotely_Server/appsettings.json b/Server/appsettings.json
similarity index 100%
rename from Remotely_Server/appsettings.json
rename to Server/appsettings.json
diff --git a/Remotely_Server/bundleconfig.json b/Server/bundleconfig.json
similarity index 100%
rename from Remotely_Server/bundleconfig.json
rename to Server/bundleconfig.json
diff --git a/Remotely_Server/package-lock.json b/Server/package-lock.json
similarity index 100%
rename from Remotely_Server/package-lock.json
rename to Server/package-lock.json
diff --git a/Remotely_Server/tsconfig.json b/Server/tsconfig.json
similarity index 100%
rename from Remotely_Server/tsconfig.json
rename to Server/tsconfig.json
diff --git a/Remotely_Server/web.config b/Server/web.config
similarity index 100%
rename from Remotely_Server/web.config
rename to Server/web.config
diff --git a/Remotely_Server/wwwroot/Downloads/Install-Linux-x64.sh b/Server/wwwroot/Downloads/Install-Linux-x64.sh
similarity index 100%
rename from Remotely_Server/wwwroot/Downloads/Install-Linux-x64.sh
rename to Server/wwwroot/Downloads/Install-Linux-x64.sh
diff --git a/Remotely_Server/wwwroot/Downloads/Install-Win10-x64.ps1 b/Server/wwwroot/Downloads/Install-Win10-x64.ps1
similarity index 100%
rename from Remotely_Server/wwwroot/Downloads/Install-Win10-x64.ps1
rename to Server/wwwroot/Downloads/Install-Win10-x64.ps1
diff --git a/Remotely_Server/wwwroot/Downloads/Install-Win10-x86.ps1 b/Server/wwwroot/Downloads/Install-Win10-x86.ps1
similarity index 100%
rename from Remotely_Server/wwwroot/Downloads/Install-Win10-x86.ps1
rename to Server/wwwroot/Downloads/Install-Win10-x86.ps1
diff --git a/Remotely_Server/wwwroot/css/Themes/cyborg.custom.css b/Server/wwwroot/css/Themes/cyborg.custom.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/Themes/cyborg.custom.css
rename to Server/wwwroot/css/Themes/cyborg.custom.css
diff --git a/Remotely_Server/wwwroot/css/Themes/cyborg.min.css b/Server/wwwroot/css/Themes/cyborg.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/Themes/cyborg.min.css
rename to Server/wwwroot/css/Themes/cyborg.min.css
diff --git a/Remotely_Server/wwwroot/css/Themes/darkly.min.css b/Server/wwwroot/css/Themes/darkly.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/Themes/darkly.min.css
rename to Server/wwwroot/css/Themes/darkly.min.css
diff --git a/Remotely_Server/wwwroot/css/loading-wheel.css b/Server/wwwroot/css/loading-wheel.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/loading-wheel.css
rename to Server/wwwroot/css/loading-wheel.css
diff --git a/Remotely_Server/wwwroot/css/osk.css b/Server/wwwroot/css/osk.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/osk.css
rename to Server/wwwroot/css/osk.css
diff --git a/Remotely_Server/wwwroot/css/remote-control.css b/Server/wwwroot/css/remote-control.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/remote-control.css
rename to Server/wwwroot/css/remote-control.css
diff --git a/Remotely_Server/wwwroot/css/site.css b/Server/wwwroot/css/site.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/site.css
rename to Server/wwwroot/css/site.css
diff --git a/Remotely_Server/wwwroot/css/site.min.css b/Server/wwwroot/css/site.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/css/site.min.css
rename to Server/wwwroot/css/site.min.css
diff --git a/Remotely_Server/wwwroot/favicon.ico b/Server/wwwroot/favicon.ico
similarity index 100%
rename from Remotely_Server/wwwroot/favicon.ico
rename to Server/wwwroot/favicon.ico
diff --git a/Remotely_Server/wwwroot/images/Loading_16x.svg b/Server/wwwroot/images/Loading_16x.svg
similarity index 100%
rename from Remotely_Server/wwwroot/images/Loading_16x.svg
rename to Server/wwwroot/images/Loading_16x.svg
diff --git a/Remotely_Server/wwwroot/images/Loading_blueNoHalo_16x.svg b/Server/wwwroot/images/Loading_blueNoHalo_16x.svg
similarity index 100%
rename from Remotely_Server/wwwroot/images/Loading_blueNoHalo_16x.svg
rename to Server/wwwroot/images/Loading_blueNoHalo_16x.svg
diff --git a/Remotely_Server/wwwroot/images/Remotely_Icon.pdn b/Server/wwwroot/images/Remotely_Icon.pdn
similarity index 100%
rename from Remotely_Server/wwwroot/images/Remotely_Icon.pdn
rename to Server/wwwroot/images/Remotely_Icon.pdn
diff --git a/Remotely_Server/wwwroot/images/Remotely_Icon.png b/Server/wwwroot/images/Remotely_Icon.png
similarity index 100%
rename from Remotely_Server/wwwroot/images/Remotely_Icon.png
rename to Server/wwwroot/images/Remotely_Icon.png
diff --git a/Remotely_Server/wwwroot/images/Remotely_Icon_128.png b/Server/wwwroot/images/Remotely_Icon_128.png
similarity index 100%
rename from Remotely_Server/wwwroot/images/Remotely_Icon_128.png
rename to Server/wwwroot/images/Remotely_Icon_128.png
diff --git a/Remotely_Server/wwwroot/images/Remotely_Icon_512.png b/Server/wwwroot/images/Remotely_Icon_512.png
similarity index 100%
rename from Remotely_Server/wwwroot/images/Remotely_Icon_512.png
rename to Server/wwwroot/images/Remotely_Icon_512.png
diff --git a/Remotely_Server/wwwroot/images/Remotely_Icon_Transparent.png b/Server/wwwroot/images/Remotely_Icon_Transparent.png
similarity index 100%
rename from Remotely_Server/wwwroot/images/Remotely_Icon_Transparent.png
rename to Server/wwwroot/images/Remotely_Icon_Transparent.png
diff --git a/Remotely_Server/wwwroot/images/Remotely_Logo.png b/Server/wwwroot/images/Remotely_Logo.png
similarity index 100%
rename from Remotely_Server/wwwroot/images/Remotely_Logo.png
rename to Server/wwwroot/images/Remotely_Logo.png
diff --git a/Remotely_Server/wwwroot/images/banner1.svg b/Server/wwwroot/images/banner1.svg
similarity index 100%
rename from Remotely_Server/wwwroot/images/banner1.svg
rename to Server/wwwroot/images/banner1.svg
diff --git a/Remotely_Server/wwwroot/images/banner2.svg b/Server/wwwroot/images/banner2.svg
similarity index 100%
rename from Remotely_Server/wwwroot/images/banner2.svg
rename to Server/wwwroot/images/banner2.svg
diff --git a/Remotely_Server/wwwroot/images/banner3.svg b/Server/wwwroot/images/banner3.svg
similarity index 100%
rename from Remotely_Server/wwwroot/images/banner3.svg
rename to Server/wwwroot/images/banner3.svg
diff --git a/Remotely_Server/wwwroot/images/banner4.svg b/Server/wwwroot/images/banner4.svg
similarity index 100%
rename from Remotely_Server/wwwroot/images/banner4.svg
rename to Server/wwwroot/images/banner4.svg
diff --git a/Remotely_Server/wwwroot/lib/adapter.js b/Server/wwwroot/lib/adapter.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/adapter.js
rename to Server/wwwroot/lib/adapter.js
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/LICENSE b/Server/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/LICENSE
rename to Server/wwwroot/lib/bootstrap/LICENSE
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to Server/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to Server/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/LICENSE.txt b/Server/wwwroot/lib/fontawesome/LICENSE.txt
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/LICENSE.txt
rename to Server/wwwroot/lib/fontawesome/LICENSE.txt
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/all.css b/Server/wwwroot/lib/fontawesome/css/all.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/all.css
rename to Server/wwwroot/lib/fontawesome/css/all.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/all.min.css b/Server/wwwroot/lib/fontawesome/css/all.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/all.min.css
rename to Server/wwwroot/lib/fontawesome/css/all.min.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/brands.css b/Server/wwwroot/lib/fontawesome/css/brands.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/brands.css
rename to Server/wwwroot/lib/fontawesome/css/brands.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/brands.min.css b/Server/wwwroot/lib/fontawesome/css/brands.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/brands.min.css
rename to Server/wwwroot/lib/fontawesome/css/brands.min.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/fontawesome.css b/Server/wwwroot/lib/fontawesome/css/fontawesome.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/fontawesome.css
rename to Server/wwwroot/lib/fontawesome/css/fontawesome.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/fontawesome.min.css b/Server/wwwroot/lib/fontawesome/css/fontawesome.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/fontawesome.min.css
rename to Server/wwwroot/lib/fontawesome/css/fontawesome.min.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/regular.css b/Server/wwwroot/lib/fontawesome/css/regular.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/regular.css
rename to Server/wwwroot/lib/fontawesome/css/regular.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/regular.min.css b/Server/wwwroot/lib/fontawesome/css/regular.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/regular.min.css
rename to Server/wwwroot/lib/fontawesome/css/regular.min.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/solid.css b/Server/wwwroot/lib/fontawesome/css/solid.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/solid.css
rename to Server/wwwroot/lib/fontawesome/css/solid.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/solid.min.css b/Server/wwwroot/lib/fontawesome/css/solid.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/solid.min.css
rename to Server/wwwroot/lib/fontawesome/css/solid.min.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/svg-with-js.css b/Server/wwwroot/lib/fontawesome/css/svg-with-js.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/svg-with-js.css
rename to Server/wwwroot/lib/fontawesome/css/svg-with-js.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/svg-with-js.min.css b/Server/wwwroot/lib/fontawesome/css/svg-with-js.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/svg-with-js.min.css
rename to Server/wwwroot/lib/fontawesome/css/svg-with-js.min.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/v4-shims.css b/Server/wwwroot/lib/fontawesome/css/v4-shims.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/v4-shims.css
rename to Server/wwwroot/lib/fontawesome/css/v4-shims.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/css/v4-shims.min.css b/Server/wwwroot/lib/fontawesome/css/v4-shims.min.css
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/css/v4-shims.min.css
rename to Server/wwwroot/lib/fontawesome/css/v4-shims.min.css
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.eot b/Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.eot
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.eot
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.eot
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.svg b/Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.svg
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.svg
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.svg
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.ttf b/Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.ttf
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.ttf
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.ttf
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff b/Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff2 b/Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff2
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff2
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-brands-400.woff2
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.eot b/Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.eot
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.eot
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.eot
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.svg b/Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.svg
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.svg
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.svg
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.ttf b/Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.ttf
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.ttf
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.ttf
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff b/Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff2 b/Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff2
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff2
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-regular-400.woff2
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.eot b/Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.eot
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.eot
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.eot
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.svg b/Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.svg
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.svg
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.svg
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.ttf b/Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.ttf
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.ttf
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.ttf
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff b/Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff
diff --git a/Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff2 b/Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff2
similarity index 100%
rename from Remotely_Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff2
rename to Server/wwwroot/lib/fontawesome/webfonts/fa-solid-900.woff2
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/Server/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
rename to Server/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
rename to Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to Server/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation/LICENSE.md b/Server/wwwroot/lib/jquery-validation/LICENSE.md
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation/LICENSE.md
rename to Server/wwwroot/lib/jquery-validation/LICENSE.md
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation/dist/additional-methods.js b/Server/wwwroot/lib/jquery-validation/dist/additional-methods.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation/dist/additional-methods.js
rename to Server/wwwroot/lib/jquery-validation/dist/additional-methods.js
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/Server/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
rename to Server/wwwroot/lib/jquery-validation/dist/additional-methods.min.js
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/Server/wwwroot/lib/jquery-validation/dist/jquery.validate.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation/dist/jquery.validate.js
rename to Server/wwwroot/lib/jquery-validation/dist/jquery.validate.js
diff --git a/Remotely_Server/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/Server/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
rename to Server/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js
diff --git a/Remotely_Server/wwwroot/lib/jquery/LICENSE.txt b/Server/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery/LICENSE.txt
rename to Server/wwwroot/lib/jquery/LICENSE.txt
diff --git a/Remotely_Server/wwwroot/lib/jquery/dist/jquery.js b/Server/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery/dist/jquery.js
rename to Server/wwwroot/lib/jquery/dist/jquery.js
diff --git a/Remotely_Server/wwwroot/lib/jquery/dist/jquery.min.js b/Server/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery/dist/jquery.min.js
rename to Server/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/Remotely_Server/wwwroot/lib/jquery/dist/jquery.min.map b/Server/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/jquery/dist/jquery.min.map
rename to Server/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/Remotely_Server/wwwroot/lib/qr/LICENSE b/Server/wwwroot/lib/qr/LICENSE
similarity index 100%
rename from Remotely_Server/wwwroot/lib/qr/LICENSE
rename to Server/wwwroot/lib/qr/LICENSE
diff --git a/Remotely_Server/wwwroot/lib/qr/qrcode.js b/Server/wwwroot/lib/qr/qrcode.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/qr/qrcode.js
rename to Server/wwwroot/lib/qr/qrcode.js
diff --git a/Remotely_Server/wwwroot/lib/qr/qrcode.min.js b/Server/wwwroot/lib/qr/qrcode.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/qr/qrcode.min.js
rename to Server/wwwroot/lib/qr/qrcode.min.js
diff --git a/Remotely_Server/wwwroot/lib/signalr/msgpack5.js b/Server/wwwroot/lib/signalr/msgpack5.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/msgpack5.js
rename to Server/wwwroot/lib/signalr/msgpack5.js
diff --git a/Remotely_Server/wwwroot/lib/signalr/msgpack5.min.js b/Server/wwwroot/lib/signalr/msgpack5.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/msgpack5.min.js
rename to Server/wwwroot/lib/signalr/msgpack5.min.js
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js b/Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js
rename to Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js.map b/Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js.map
rename to Server/wwwroot/lib/signalr/signalr-protocol-msgpack.js.map
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js b/Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js
rename to Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js.map b/Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js.map
rename to Server/wwwroot/lib/signalr/signalr-protocol-msgpack.min.js.map
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr.js b/Server/wwwroot/lib/signalr/signalr.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr.js
rename to Server/wwwroot/lib/signalr/signalr.js
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr.js.map b/Server/wwwroot/lib/signalr/signalr.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr.js.map
rename to Server/wwwroot/lib/signalr/signalr.js.map
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr.min.js b/Server/wwwroot/lib/signalr/signalr.min.js
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr.min.js
rename to Server/wwwroot/lib/signalr/signalr.min.js
diff --git a/Remotely_Server/wwwroot/lib/signalr/signalr.min.js.map b/Server/wwwroot/lib/signalr/signalr.min.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/lib/signalr/signalr.min.js.map
rename to Server/wwwroot/lib/signalr/signalr.min.js.map
diff --git a/Remotely_Server/wwwroot/lib/types/jquery/LICENSE b/Server/wwwroot/lib/types/jquery/LICENSE
similarity index 100%
rename from Remotely_Server/wwwroot/lib/types/jquery/LICENSE
rename to Server/wwwroot/lib/types/jquery/LICENSE
diff --git a/Remotely_Server/wwwroot/lib/types/jquery/README.md b/Server/wwwroot/lib/types/jquery/README.md
similarity index 100%
rename from Remotely_Server/wwwroot/lib/types/jquery/README.md
rename to Server/wwwroot/lib/types/jquery/README.md
diff --git a/Remotely_Server/wwwroot/lib/types/jquery/index.d.ts b/Server/wwwroot/lib/types/jquery/index.d.ts
similarity index 100%
rename from Remotely_Server/wwwroot/lib/types/jquery/index.d.ts
rename to Server/wwwroot/lib/types/jquery/index.d.ts
diff --git a/Remotely_Server/wwwroot/lib/types/jquery/package.json b/Server/wwwroot/lib/types/jquery/package.json
similarity index 100%
rename from Remotely_Server/wwwroot/lib/types/jquery/package.json
rename to Server/wwwroot/lib/types/jquery/package.json
diff --git a/Remotely_Server/wwwroot/manifest-rc.json b/Server/wwwroot/manifest-rc.json
similarity index 100%
rename from Remotely_Server/wwwroot/manifest-rc.json
rename to Server/wwwroot/manifest-rc.json
diff --git a/Remotely_Server/wwwroot/manifest.json b/Server/wwwroot/manifest.json
similarity index 100%
rename from Remotely_Server/wwwroot/manifest.json
rename to Server/wwwroot/manifest.json
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.js b/Server/wwwroot/scripts/BrowserSockets.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/BrowserSockets.js
rename to Server/wwwroot/scripts/BrowserSockets.js
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.js.map b/Server/wwwroot/scripts/BrowserSockets.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/BrowserSockets.js.map
rename to Server/wwwroot/scripts/BrowserSockets.js.map
diff --git a/Remotely_Server/wwwroot/scripts/BrowserSockets.ts b/Server/wwwroot/scripts/BrowserSockets.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/BrowserSockets.ts
rename to Server/wwwroot/scripts/BrowserSockets.ts
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.js b/Server/wwwroot/scripts/CommandCompletion.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/CommandCompletion.js
rename to Server/wwwroot/scripts/CommandCompletion.js
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.js.map b/Server/wwwroot/scripts/CommandCompletion.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/CommandCompletion.js.map
rename to Server/wwwroot/scripts/CommandCompletion.js.map
diff --git a/Remotely_Server/wwwroot/scripts/CommandCompletion.ts b/Server/wwwroot/scripts/CommandCompletion.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/CommandCompletion.ts
rename to Server/wwwroot/scripts/CommandCompletion.ts
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.js b/Server/wwwroot/scripts/CommandProcessor.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/CommandProcessor.js
rename to Server/wwwroot/scripts/CommandProcessor.js
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.js.map b/Server/wwwroot/scripts/CommandProcessor.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/CommandProcessor.js.map
rename to Server/wwwroot/scripts/CommandProcessor.js.map
diff --git a/Remotely_Server/wwwroot/scripts/CommandProcessor.ts b/Server/wwwroot/scripts/CommandProcessor.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/CommandProcessor.ts
rename to Server/wwwroot/scripts/CommandProcessor.ts
diff --git a/Remotely_Server/wwwroot/scripts/Commands/BashCommands.js b/Server/wwwroot/scripts/Commands/BashCommands.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/BashCommands.js
rename to Server/wwwroot/scripts/Commands/BashCommands.js
diff --git a/Remotely_Server/wwwroot/scripts/Commands/BashCommands.js.map b/Server/wwwroot/scripts/Commands/BashCommands.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/BashCommands.js.map
rename to Server/wwwroot/scripts/Commands/BashCommands.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Commands/BashCommands.ts b/Server/wwwroot/scripts/Commands/BashCommands.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/BashCommands.ts
rename to Server/wwwroot/scripts/Commands/BashCommands.ts
diff --git a/Remotely_Server/wwwroot/scripts/Commands/CMDCommands.js b/Server/wwwroot/scripts/Commands/CMDCommands.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/CMDCommands.js
rename to Server/wwwroot/scripts/Commands/CMDCommands.js
diff --git a/Remotely_Server/wwwroot/scripts/Commands/CMDCommands.js.map b/Server/wwwroot/scripts/Commands/CMDCommands.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/CMDCommands.js.map
rename to Server/wwwroot/scripts/Commands/CMDCommands.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Commands/CMDCommands.ts b/Server/wwwroot/scripts/Commands/CMDCommands.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/CMDCommands.ts
rename to Server/wwwroot/scripts/Commands/CMDCommands.ts
diff --git a/Remotely_Server/wwwroot/scripts/Commands/PSCoreCommands.js b/Server/wwwroot/scripts/Commands/PSCoreCommands.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/PSCoreCommands.js
rename to Server/wwwroot/scripts/Commands/PSCoreCommands.js
diff --git a/Remotely_Server/wwwroot/scripts/Commands/PSCoreCommands.js.map b/Server/wwwroot/scripts/Commands/PSCoreCommands.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/PSCoreCommands.js.map
rename to Server/wwwroot/scripts/Commands/PSCoreCommands.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Commands/PSCoreCommands.ts b/Server/wwwroot/scripts/Commands/PSCoreCommands.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/PSCoreCommands.ts
rename to Server/wwwroot/scripts/Commands/PSCoreCommands.ts
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js b/Server/wwwroot/scripts/Commands/WebCommands.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/WebCommands.js
rename to Server/wwwroot/scripts/Commands/WebCommands.js
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map b/Server/wwwroot/scripts/Commands/WebCommands.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map
rename to Server/wwwroot/scripts/Commands/WebCommands.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts b/Server/wwwroot/scripts/Commands/WebCommands.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts
rename to Server/wwwroot/scripts/Commands/WebCommands.ts
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WinPSCommands.js b/Server/wwwroot/scripts/Commands/WinPSCommands.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/WinPSCommands.js
rename to Server/wwwroot/scripts/Commands/WinPSCommands.js
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WinPSCommands.js.map b/Server/wwwroot/scripts/Commands/WinPSCommands.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/WinPSCommands.js.map
rename to Server/wwwroot/scripts/Commands/WinPSCommands.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WinPSCommands.ts b/Server/wwwroot/scripts/Commands/WinPSCommands.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Commands/WinPSCommands.ts
rename to Server/wwwroot/scripts/Commands/WinPSCommands.ts
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.js b/Server/wwwroot/scripts/DataGrid.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/DataGrid.js
rename to Server/wwwroot/scripts/DataGrid.js
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.js.map b/Server/wwwroot/scripts/DataGrid.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/DataGrid.js.map
rename to Server/wwwroot/scripts/DataGrid.js.map
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.ts b/Server/wwwroot/scripts/DataGrid.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/DataGrid.ts
rename to Server/wwwroot/scripts/DataGrid.ts
diff --git a/Remotely_Server/wwwroot/scripts/Enums/RemoteControlMode.js b/Server/wwwroot/scripts/Enums/RemoteControlMode.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Enums/RemoteControlMode.js
rename to Server/wwwroot/scripts/Enums/RemoteControlMode.js
diff --git a/Remotely_Server/wwwroot/scripts/Enums/RemoteControlMode.js.map b/Server/wwwroot/scripts/Enums/RemoteControlMode.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Enums/RemoteControlMode.js.map
rename to Server/wwwroot/scripts/Enums/RemoteControlMode.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Enums/RemoteControlMode.ts b/Server/wwwroot/scripts/Enums/RemoteControlMode.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Enums/RemoteControlMode.ts
rename to Server/wwwroot/scripts/Enums/RemoteControlMode.ts
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js b/Server/wwwroot/scripts/InputEventHandlers.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/InputEventHandlers.js
rename to Server/wwwroot/scripts/InputEventHandlers.js
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map b/Server/wwwroot/scripts/InputEventHandlers.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/InputEventHandlers.js.map
rename to Server/wwwroot/scripts/InputEventHandlers.js.map
diff --git a/Remotely_Server/wwwroot/scripts/InputEventHandlers.ts b/Server/wwwroot/scripts/InputEventHandlers.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/InputEventHandlers.ts
rename to Server/wwwroot/scripts/InputEventHandlers.ts
diff --git a/Remotely_Server/wwwroot/scripts/Main.js b/Server/wwwroot/scripts/Main.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Main.js
rename to Server/wwwroot/scripts/Main.js
diff --git a/Remotely_Server/wwwroot/scripts/Main.js.map b/Server/wwwroot/scripts/Main.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Main.js.map
rename to Server/wwwroot/scripts/Main.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Main.ts b/Server/wwwroot/scripts/Main.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Main.ts
rename to Server/wwwroot/scripts/Main.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/CommandContext.js b/Server/wwwroot/scripts/Models/CommandContext.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CommandContext.js
rename to Server/wwwroot/scripts/Models/CommandContext.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/CommandContext.js.map b/Server/wwwroot/scripts/Models/CommandContext.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CommandContext.js.map
rename to Server/wwwroot/scripts/Models/CommandContext.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/CommandContext.ts b/Server/wwwroot/scripts/Models/CommandContext.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CommandContext.ts
rename to Server/wwwroot/scripts/Models/CommandContext.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/CommandLineParameter.js b/Server/wwwroot/scripts/Models/CommandLineParameter.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CommandLineParameter.js
rename to Server/wwwroot/scripts/Models/CommandLineParameter.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/CommandLineParameter.js.map b/Server/wwwroot/scripts/Models/CommandLineParameter.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CommandLineParameter.js.map
rename to Server/wwwroot/scripts/Models/CommandLineParameter.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/CommandLineParameter.ts b/Server/wwwroot/scripts/Models/CommandLineParameter.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CommandLineParameter.ts
rename to Server/wwwroot/scripts/Models/CommandLineParameter.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/ConsoleCommand.js b/Server/wwwroot/scripts/Models/ConsoleCommand.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/ConsoleCommand.js
rename to Server/wwwroot/scripts/Models/ConsoleCommand.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/ConsoleCommand.js.map b/Server/wwwroot/scripts/Models/ConsoleCommand.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/ConsoleCommand.js.map
rename to Server/wwwroot/scripts/Models/ConsoleCommand.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/ConsoleCommand.ts b/Server/wwwroot/scripts/Models/ConsoleCommand.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/ConsoleCommand.ts
rename to Server/wwwroot/scripts/Models/ConsoleCommand.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/CursorInfo.js b/Server/wwwroot/scripts/Models/CursorInfo.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CursorInfo.js
rename to Server/wwwroot/scripts/Models/CursorInfo.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/CursorInfo.js.map b/Server/wwwroot/scripts/Models/CursorInfo.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CursorInfo.js.map
rename to Server/wwwroot/scripts/Models/CursorInfo.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/CursorInfo.ts b/Server/wwwroot/scripts/Models/CursorInfo.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/CursorInfo.ts
rename to Server/wwwroot/scripts/Models/CursorInfo.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/Device.js b/Server/wwwroot/scripts/Models/Device.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Device.js
rename to Server/wwwroot/scripts/Models/Device.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/Device.js.map b/Server/wwwroot/scripts/Models/Device.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Device.js.map
rename to Server/wwwroot/scripts/Models/Device.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/Device.ts b/Server/wwwroot/scripts/Models/Device.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Device.ts
rename to Server/wwwroot/scripts/Models/Device.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/DevicePermissionLink.js b/Server/wwwroot/scripts/Models/DevicePermissionLink.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/DevicePermissionLink.js
rename to Server/wwwroot/scripts/Models/DevicePermissionLink.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/DevicePermissionLink.js.map b/Server/wwwroot/scripts/Models/DevicePermissionLink.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/DevicePermissionLink.js.map
rename to Server/wwwroot/scripts/Models/DevicePermissionLink.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/DevicePermissionLink.ts b/Server/wwwroot/scripts/Models/DevicePermissionLink.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/DevicePermissionLink.ts
rename to Server/wwwroot/scripts/Models/DevicePermissionLink.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.js b/Server/wwwroot/scripts/Models/GenericCommandResult.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.js
rename to Server/wwwroot/scripts/Models/GenericCommandResult.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.js.map b/Server/wwwroot/scripts/Models/GenericCommandResult.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.js.map
rename to Server/wwwroot/scripts/Models/GenericCommandResult.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.ts b/Server/wwwroot/scripts/Models/GenericCommandResult.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/GenericCommandResult.ts
rename to Server/wwwroot/scripts/Models/GenericCommandResult.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.js b/Server/wwwroot/scripts/Models/PSCoreCommandResult.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.js
rename to Server/wwwroot/scripts/Models/PSCoreCommandResult.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.js.map b/Server/wwwroot/scripts/Models/PSCoreCommandResult.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.js.map
rename to Server/wwwroot/scripts/Models/PSCoreCommandResult.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.ts b/Server/wwwroot/scripts/Models/PSCoreCommandResult.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/PSCoreCommandResult.ts
rename to Server/wwwroot/scripts/Models/PSCoreCommandResult.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/Parameter.js b/Server/wwwroot/scripts/Models/Parameter.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Parameter.js
rename to Server/wwwroot/scripts/Models/Parameter.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/Parameter.js.map b/Server/wwwroot/scripts/Models/Parameter.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Parameter.js.map
rename to Server/wwwroot/scripts/Models/Parameter.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/Parameter.ts b/Server/wwwroot/scripts/Models/Parameter.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Parameter.ts
rename to Server/wwwroot/scripts/Models/Parameter.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/Point.js b/Server/wwwroot/scripts/Models/Point.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Point.js
rename to Server/wwwroot/scripts/Models/Point.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/Point.js.map b/Server/wwwroot/scripts/Models/Point.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Point.js.map
rename to Server/wwwroot/scripts/Models/Point.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/Point.ts b/Server/wwwroot/scripts/Models/Point.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/Point.ts
rename to Server/wwwroot/scripts/Models/Point.ts
diff --git a/Remotely_Server/wwwroot/scripts/Models/UserOptions.js b/Server/wwwroot/scripts/Models/UserOptions.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/UserOptions.js
rename to Server/wwwroot/scripts/Models/UserOptions.js
diff --git a/Remotely_Server/wwwroot/scripts/Models/UserOptions.js.map b/Server/wwwroot/scripts/Models/UserOptions.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/UserOptions.js.map
rename to Server/wwwroot/scripts/Models/UserOptions.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Models/UserOptions.ts b/Server/wwwroot/scripts/Models/UserOptions.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Models/UserOptions.ts
rename to Server/wwwroot/scripts/Models/UserOptions.ts
diff --git a/Remotely_Server/wwwroot/scripts/Pages/OrganizationManagement.js b/Server/wwwroot/scripts/Pages/OrganizationManagement.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Pages/OrganizationManagement.js
rename to Server/wwwroot/scripts/Pages/OrganizationManagement.js
diff --git a/Remotely_Server/wwwroot/scripts/Pages/OrganizationManagement.js.map b/Server/wwwroot/scripts/Pages/OrganizationManagement.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Pages/OrganizationManagement.js.map
rename to Server/wwwroot/scripts/Pages/OrganizationManagement.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Pages/OrganizationManagement.ts b/Server/wwwroot/scripts/Pages/OrganizationManagement.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Pages/OrganizationManagement.ts
rename to Server/wwwroot/scripts/Pages/OrganizationManagement.ts
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/OSK.js b/Server/wwwroot/scripts/RemoteControl/OSK.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/OSK.js
rename to Server/wwwroot/scripts/RemoteControl/OSK.js
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/OSK.js.map b/Server/wwwroot/scripts/RemoteControl/OSK.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/OSK.js.map
rename to Server/wwwroot/scripts/RemoteControl/OSK.js.map
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/OSK.ts b/Server/wwwroot/scripts/RemoteControl/OSK.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/OSK.ts
rename to Server/wwwroot/scripts/RemoteControl/OSK.ts
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js b/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
rename to Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map b/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
rename to Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.js.map
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts b/Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
rename to Server/wwwroot/scripts/RemoteControl/RCBrowserSockets.ts
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RemoteControl.js b/Server/wwwroot/scripts/RemoteControl/RemoteControl.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/RemoteControl.js
rename to Server/wwwroot/scripts/RemoteControl/RemoteControl.js
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RemoteControl.js.map b/Server/wwwroot/scripts/RemoteControl/RemoteControl.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/RemoteControl.js.map
rename to Server/wwwroot/scripts/RemoteControl/RemoteControl.js.map
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/RemoteControl.ts b/Server/wwwroot/scripts/RemoteControl/RemoteControl.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/RemoteControl.ts
rename to Server/wwwroot/scripts/RemoteControl/RemoteControl.ts
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js b/Server/wwwroot/scripts/RemoteControl/UI.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/UI.js
rename to Server/wwwroot/scripts/RemoteControl/UI.js
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.js.map b/Server/wwwroot/scripts/RemoteControl/UI.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/UI.js.map
rename to Server/wwwroot/scripts/RemoteControl/UI.js.map
diff --git a/Remotely_Server/wwwroot/scripts/RemoteControl/UI.ts b/Server/wwwroot/scripts/RemoteControl/UI.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/RemoteControl/UI.ts
rename to Server/wwwroot/scripts/RemoteControl/UI.ts
diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.js b/Server/wwwroot/scripts/ResultsParser.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/ResultsParser.js
rename to Server/wwwroot/scripts/ResultsParser.js
diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.js.map b/Server/wwwroot/scripts/ResultsParser.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/ResultsParser.js.map
rename to Server/wwwroot/scripts/ResultsParser.js.map
diff --git a/Remotely_Server/wwwroot/scripts/ResultsParser.ts b/Server/wwwroot/scripts/ResultsParser.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/ResultsParser.ts
rename to Server/wwwroot/scripts/ResultsParser.ts
diff --git a/Remotely_Server/wwwroot/scripts/Sound.js b/Server/wwwroot/scripts/Sound.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Sound.js
rename to Server/wwwroot/scripts/Sound.js
diff --git a/Remotely_Server/wwwroot/scripts/Sound.js.map b/Server/wwwroot/scripts/Sound.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Sound.js.map
rename to Server/wwwroot/scripts/Sound.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Sound.ts b/Server/wwwroot/scripts/Sound.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Sound.ts
rename to Server/wwwroot/scripts/Sound.ts
diff --git a/Remotely_Server/wwwroot/scripts/Store.js b/Server/wwwroot/scripts/Store.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Store.js
rename to Server/wwwroot/scripts/Store.js
diff --git a/Remotely_Server/wwwroot/scripts/Store.js.map b/Server/wwwroot/scripts/Store.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Store.js.map
rename to Server/wwwroot/scripts/Store.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Store.ts b/Server/wwwroot/scripts/Store.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Store.ts
rename to Server/wwwroot/scripts/Store.ts
diff --git a/Remotely_Server/wwwroot/scripts/UI.js b/Server/wwwroot/scripts/UI.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/UI.js
rename to Server/wwwroot/scripts/UI.js
diff --git a/Remotely_Server/wwwroot/scripts/UI.js.map b/Server/wwwroot/scripts/UI.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/UI.js.map
rename to Server/wwwroot/scripts/UI.js.map
diff --git a/Remotely_Server/wwwroot/scripts/UI.ts b/Server/wwwroot/scripts/UI.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/UI.ts
rename to Server/wwwroot/scripts/UI.ts
diff --git a/Remotely_Server/wwwroot/scripts/UserSettings.js b/Server/wwwroot/scripts/UserSettings.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/UserSettings.js
rename to Server/wwwroot/scripts/UserSettings.js
diff --git a/Remotely_Server/wwwroot/scripts/UserSettings.js.map b/Server/wwwroot/scripts/UserSettings.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/UserSettings.js.map
rename to Server/wwwroot/scripts/UserSettings.js.map
diff --git a/Remotely_Server/wwwroot/scripts/UserSettings.ts b/Server/wwwroot/scripts/UserSettings.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/UserSettings.ts
rename to Server/wwwroot/scripts/UserSettings.ts
diff --git a/Remotely_Server/wwwroot/scripts/Utilities.js b/Server/wwwroot/scripts/Utilities.js
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Utilities.js
rename to Server/wwwroot/scripts/Utilities.js
diff --git a/Remotely_Server/wwwroot/scripts/Utilities.js.map b/Server/wwwroot/scripts/Utilities.js.map
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Utilities.js.map
rename to Server/wwwroot/scripts/Utilities.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Utilities.ts b/Server/wwwroot/scripts/Utilities.ts
similarity index 100%
rename from Remotely_Server/wwwroot/scripts/Utilities.ts
rename to Server/wwwroot/scripts/Utilities.ts
diff --git a/Remotely_Shared/Enums/RemoteControlMode.cs b/Shared/Enums/RemoteControlMode.cs
similarity index 82%
rename from Remotely_Shared/Enums/RemoteControlMode.cs
rename to Shared/Enums/RemoteControlMode.cs
index 78b22c62..eb83b71d 100644
--- a/Remotely_Shared/Enums/RemoteControlMode.cs
+++ b/Shared/Enums/RemoteControlMode.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Enums
+namespace Remotely.Shared.Enums
 {
     public enum RemoteControlMode
     {
diff --git a/Remotely_Shared/Models/CommandContext.cs b/Shared/Models/CommandContext.cs
similarity index 96%
rename from Remotely_Shared/Models/CommandContext.cs
rename to Shared/Models/CommandContext.cs
index 0eee855c..33095d74 100644
--- a/Remotely_Shared/Models/CommandContext.cs
+++ b/Shared/Models/CommandContext.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class CommandContext
     {
diff --git a/Shared/Models/CommandContext.cs.d.ts b/Shared/Models/CommandContext.cs.d.ts
new file mode 100644
index 00000000..b0b340fb
--- /dev/null
+++ b/Shared/Models/CommandContext.cs.d.ts
@@ -0,0 +1,14 @@
+declare module server {
+	interface commandContext {
+		iD: string;
+		commandMode: string;
+		commandText: string;
+		senderUserID: string;
+		senderConnectionID: string;
+		targetDeviceIDs: string[];
+		pSCoreResults: any[];
+		commandResults: any[];
+		timeStamp: Date;
+		organizationID: string;
+	}
+}
diff --git a/Remotely_Shared/Models/ConnectionInfo.cs b/Shared/Models/ConnectionInfo.cs
similarity index 95%
rename from Remotely_Shared/Models/ConnectionInfo.cs
rename to Shared/Models/ConnectionInfo.cs
index 40464b8a..669533b0 100644
--- a/Remotely_Shared/Models/ConnectionInfo.cs
+++ b/Shared/Models/ConnectionInfo.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class ConnectionInfo
     {
diff --git a/Remotely_Shared/Models/CursorInfo.cs b/Shared/Models/CursorInfo.cs
similarity index 94%
rename from Remotely_Shared/Models/CursorInfo.cs
rename to Shared/Models/CursorInfo.cs
index da8dbbcc..22c517fc 100644
--- a/Remotely_Shared/Models/CursorInfo.cs
+++ b/Shared/Models/CursorInfo.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class CursorInfo
     {
diff --git a/Remotely_Shared/Models/Device.cs b/Shared/Models/Device.cs
similarity index 99%
rename from Remotely_Shared/Models/Device.cs
rename to Shared/Models/Device.cs
index 1054965f..c8857390 100644
--- a/Remotely_Shared/Models/Device.cs
+++ b/Shared/Models/Device.cs
@@ -1,4 +1,4 @@
-using Remotely_Shared.Services;
+using Remotely.Shared.Services;
 using Microsoft.Management.Infrastructure;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class Device
     {
diff --git a/Remotely_Shared/Models/DevicePermissionLink.cs b/Shared/Models/DevicePermissionLink.cs
similarity index 90%
rename from Remotely_Shared/Models/DevicePermissionLink.cs
rename to Shared/Models/DevicePermissionLink.cs
index 08788d31..a66fac42 100644
--- a/Remotely_Shared/Models/DevicePermissionLink.cs
+++ b/Shared/Models/DevicePermissionLink.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class DevicePermissionLink
     {
diff --git a/Remotely_Shared/Models/Drive.cs b/Shared/Models/Drive.cs
similarity index 93%
rename from Remotely_Shared/Models/Drive.cs
rename to Shared/Models/Drive.cs
index fb9ce73a..5740665f 100644
--- a/Remotely_Shared/Models/Drive.cs
+++ b/Shared/Models/Drive.cs
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class Drive
     {
diff --git a/Remotely_Shared/Models/EventLog.cs b/Shared/Models/EventLog.cs
similarity index 95%
rename from Remotely_Shared/Models/EventLog.cs
rename to Shared/Models/EventLog.cs
index 78d74a7b..ac7b6c28 100644
--- a/Remotely_Shared/Models/EventLog.cs
+++ b/Shared/Models/EventLog.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class EventLog
     {
diff --git a/Remotely_Shared/Models/GenericCommandResult.cs b/Shared/Models/GenericCommandResult.cs
similarity index 92%
rename from Remotely_Shared/Models/GenericCommandResult.cs
rename to Shared/Models/GenericCommandResult.cs
index 3c5a5ba5..0b160b6d 100644
--- a/Remotely_Shared/Models/GenericCommandResult.cs
+++ b/Shared/Models/GenericCommandResult.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class GenericCommandResult
     {
diff --git a/Shared/Models/GenericCommandResult.cs.d.ts b/Shared/Models/GenericCommandResult.cs.d.ts
new file mode 100644
index 00000000..24e510b8
--- /dev/null
+++ b/Shared/Models/GenericCommandResult.cs.d.ts
@@ -0,0 +1,10 @@
+declare module server {
+	interface genericCommandResult {
+		deviceID: string;
+		commandContextID: string;
+		commandType: string;
+		standardOutput: string;
+		errorOutput: string;
+		timeStamp: Date;
+	}
+}
diff --git a/Remotely_Shared/Models/InviteLink.cs b/Shared/Models/InviteLink.cs
similarity index 93%
rename from Remotely_Shared/Models/InviteLink.cs
rename to Shared/Models/InviteLink.cs
index 83ad5074..c3e1a282 100644
--- a/Remotely_Shared/Models/InviteLink.cs
+++ b/Shared/Models/InviteLink.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class InviteLink
     {
diff --git a/Remotely_Shared/Models/Organization.cs b/Shared/Models/Organization.cs
similarity index 92%
rename from Remotely_Shared/Models/Organization.cs
rename to Shared/Models/Organization.cs
index d53dfa0a..0def80ff 100644
--- a/Remotely_Shared/Models/Organization.cs
+++ b/Shared/Models/Organization.cs
@@ -1,9 +1,9 @@
-using Remotely_Shared.Models;
+using Remotely.Shared.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class Organization
     {
diff --git a/Remotely_Shared/Models/PSCoreCommandResult.cs b/Shared/Models/PSCoreCommandResult.cs
similarity index 94%
rename from Remotely_Shared/Models/PSCoreCommandResult.cs
rename to Shared/Models/PSCoreCommandResult.cs
index da3ced0c..b874ef0d 100644
--- a/Remotely_Shared/Models/PSCoreCommandResult.cs
+++ b/Shared/Models/PSCoreCommandResult.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class PSCoreCommandResult
     {
diff --git a/Remotely_Shared/Models/PSError.cs b/Shared/Models/PSError.cs
similarity index 86%
rename from Remotely_Shared/Models/PSError.cs
rename to Shared/Models/PSError.cs
index 26314367..c6b152ed 100644
--- a/Remotely_Shared/Models/PSError.cs
+++ b/Shared/Models/PSError.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class PSError
     {
diff --git a/Remotely_Shared/Models/PermissionGroup.cs b/Shared/Models/PermissionGroup.cs
similarity index 95%
rename from Remotely_Shared/Models/PermissionGroup.cs
rename to Shared/Models/PermissionGroup.cs
index 69acf145..82a71491 100644
--- a/Remotely_Shared/Models/PermissionGroup.cs
+++ b/Shared/Models/PermissionGroup.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class PermissionGroup
     {
diff --git a/Remotely_Shared/Models/RemotelyUser.cs b/Shared/Models/RemotelyUser.cs
similarity index 95%
rename from Remotely_Shared/Models/RemotelyUser.cs
rename to Shared/Models/RemotelyUser.cs
index bf192293..8a1c9e4e 100644
--- a/Remotely_Shared/Models/RemotelyUser.cs
+++ b/Shared/Models/RemotelyUser.cs
@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class RemotelyUser : IdentityUser
     {
diff --git a/Remotely_Shared/Models/RemotelyUserOptions.cs b/Shared/Models/RemotelyUserOptions.cs
similarity index 96%
rename from Remotely_Shared/Models/RemotelyUserOptions.cs
rename to Shared/Models/RemotelyUserOptions.cs
index 8c1d133a..1c51f03a 100644
--- a/Remotely_Shared/Models/RemotelyUserOptions.cs
+++ b/Shared/Models/RemotelyUserOptions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class RemotelyUserOptions
     {
diff --git a/Shared/Models/RemotelyUserOptions.cs.d.ts b/Shared/Models/RemotelyUserOptions.cs.d.ts
new file mode 100644
index 00000000..52a49c9c
--- /dev/null
+++ b/Shared/Models/RemotelyUserOptions.cs.d.ts
@@ -0,0 +1,10 @@
+declare module server {
+	interface remotelyUserOptions {
+		consolePrompt: string;
+		commandModeShortcutWeb: string;
+		commandModeShortcutPSCore: string;
+		commandModeShortcutWinPS: string;
+		commandModeShortcutCMD: string;
+		commandModeShortcutBash: string;
+	}
+}
diff --git a/Remotely_Shared/Models/ScreenCastRequest.cs b/Shared/Models/ScreenCastRequest.cs
similarity index 86%
rename from Remotely_Shared/Models/ScreenCastRequest.cs
rename to Shared/Models/ScreenCastRequest.cs
index bf0c7f2b..15b93dba 100644
--- a/Remotely_Shared/Models/ScreenCastRequest.cs
+++ b/Shared/Models/ScreenCastRequest.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class ScreenCastRequest
     {
diff --git a/Remotely_Shared/Models/SharedFile.cs b/Shared/Models/SharedFile.cs
similarity index 93%
rename from Remotely_Shared/Models/SharedFile.cs
rename to Shared/Models/SharedFile.cs
index 7bc26ff2..5a4c7910 100644
--- a/Remotely_Shared/Models/SharedFile.cs
+++ b/Shared/Models/SharedFile.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class SharedFile
     {
diff --git a/Remotely_Shared/Models/UserPermissionLink.cs b/Shared/Models/UserPermissionLink.cs
similarity index 91%
rename from Remotely_Shared/Models/UserPermissionLink.cs
rename to Shared/Models/UserPermissionLink.cs
index d37b932a..b68c9147 100644
--- a/Remotely_Shared/Models/UserPermissionLink.cs
+++ b/Shared/Models/UserPermissionLink.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Remotely_Shared.Models
+namespace Remotely.Shared.Models
 {
     public class UserPermissionLink
     {
diff --git a/Remotely_Shared/Services/OSUtils.cs b/Shared/Services/OSUtils.cs
similarity index 98%
rename from Remotely_Shared/Services/OSUtils.cs
rename to Shared/Services/OSUtils.cs
index 4657653c..c9f86097 100644
--- a/Remotely_Shared/Services/OSUtils.cs
+++ b/Shared/Services/OSUtils.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace Remotely_Shared.Services
+namespace Remotely.Shared.Services
 {
     public static class OSUtils
     {
diff --git a/Remotely_Shared/Services/RandomGenerator.cs b/Shared/Services/RandomGenerator.cs
similarity index 94%
rename from Remotely_Shared/Services/RandomGenerator.cs
rename to Shared/Services/RandomGenerator.cs
index 1518aa60..850bc61d 100644
--- a/Remotely_Shared/Services/RandomGenerator.cs
+++ b/Shared/Services/RandomGenerator.cs
@@ -4,7 +4,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Linq;
 
-namespace Remotely_Shared.Services
+namespace Remotely.Shared.Services
 {
     public class RandomGenerator
     {
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
new file mode 100644
index 00000000..dd72a11a
--- /dev/null
+++ b/Shared/Shared.csproj
@@ -0,0 +1,59 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Remotely_Shared</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Models\CommandContext.cs">
+      <LastGenOutput>CommandContext.cs.d.ts</LastGenOutput>
+      <Generator>DtsGenerator</Generator>
+    </Compile>
+    <Compile Update="Models\CursorInfo.cs">
+      <Generator></Generator>
+    </Compile>
+    <Compile Update="Models\Device.cs">
+      <Generator></Generator>
+    </Compile>
+    <Compile Update="Models\DevicePermissionLink.cs">
+      <Generator></Generator>
+    </Compile>
+    <Compile Update="Models\GenericCommandResult.cs">
+      <LastGenOutput>GenericCommandResult.cs.d.ts</LastGenOutput>
+      <Generator>DtsGenerator</Generator>
+    </Compile>
+    <Compile Update="Models\PSCoreCommandResult.cs">
+      <Generator></Generator>
+    </Compile>
+    <Compile Update="Models\RemotelyUserOptions.cs">
+      <LastGenOutput>RemotelyUserOptions.cs.d.ts</LastGenOutput>
+      <Generator>DtsGenerator</Generator>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Models\CommandContext.cs.d.ts">
+      <DependentUpon>CommandContext.cs</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </None>
+    <None Update="Models\GenericCommandResult.cs.d.ts">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>GenericCommandResult.cs</DependentUpon>
+    </None>
+    <None Update="Models\RemotelyUserOptions.cs.d.ts">
+      <DependentUpon>RemotelyUserOptions.cs</DependentUpon>
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/Remotely_Shared/ViewModels/OrganizationViewModels.cs b/Shared/ViewModels/OrganizationViewModels.cs
similarity index 95%
rename from Remotely_Shared/ViewModels/OrganizationViewModels.cs
rename to Shared/ViewModels/OrganizationViewModels.cs
index 61cd632f..223e8ade 100644
--- a/Remotely_Shared/ViewModels/OrganizationViewModels.cs
+++ b/Shared/ViewModels/OrganizationViewModels.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
 
-namespace Remotely_Shared.ViewModels
+namespace Remotely.Shared.ViewModels
 {
     public class Permission
     {
diff --git a/Remotely_Shared/Win32/ADVAPI32.cs b/Shared/Win32/ADVAPI32.cs
similarity index 99%
rename from Remotely_Shared/Win32/ADVAPI32.cs
rename to Shared/Win32/ADVAPI32.cs
index f92649ef..e13953c9 100644
--- a/Remotely_Shared/Win32/ADVAPI32.cs
+++ b/Shared/Win32/ADVAPI32.cs
@@ -4,7 +4,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Security;
 
-namespace Remotely_Shared.Win32
+namespace Remotely.Shared.Win32
 {
     public static class ADVAPI32
     {
diff --git a/Remotely_Shared/Win32/GDI32.cs b/Shared/Win32/GDI32.cs
similarity index 99%
rename from Remotely_Shared/Win32/GDI32.cs
rename to Shared/Win32/GDI32.cs
index 385e83f1..3729b2f1 100644
--- a/Remotely_Shared/Win32/GDI32.cs
+++ b/Shared/Win32/GDI32.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Remotely_Shared.Win32
+namespace Remotely.Shared.Win32
 {
     public static class GDI32
     {
diff --git a/Remotely_Shared/Win32/Kernel32.cs b/Shared/Win32/Kernel32.cs
similarity index 95%
rename from Remotely_Shared/Win32/Kernel32.cs
rename to Shared/Win32/Kernel32.cs
index 8f8a45db..dd4cca28 100644
--- a/Remotely_Shared/Win32/Kernel32.cs
+++ b/Shared/Win32/Kernel32.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Remotely_Shared.Win32
+namespace Remotely.Shared.Win32
 {
     public static class Kernel32
     {
diff --git a/Remotely_Shared/Win32/SECUR32.cs b/Shared/Win32/SECUR32.cs
similarity index 99%
rename from Remotely_Shared/Win32/SECUR32.cs
rename to Shared/Win32/SECUR32.cs
index 120a1d85..334bd0d6 100644
--- a/Remotely_Shared/Win32/SECUR32.cs
+++ b/Shared/Win32/SECUR32.cs
@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using Microsoft.Win32.SafeHandles;
 using System.Runtime.ConstrainedExecution;
-using Remotely_Shared.Win32;
+using Remotely.Shared.Win32;
 
 public static class SECUR32
 {
diff --git a/Remotely_Shared/Win32/User32.cs b/Shared/Win32/User32.cs
similarity index 99%
rename from Remotely_Shared/Win32/User32.cs
rename to Shared/Win32/User32.cs
index f1b9c482..e4698ca3 100644
--- a/Remotely_Shared/Win32/User32.cs
+++ b/Shared/Win32/User32.cs
@@ -5,7 +5,7 @@ using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Remotely_Shared.Win32
+namespace Remotely.Shared.Win32
 {
     public static class User32
     {
diff --git a/Remotely_Shared/Win32/WTSAPI32.cs b/Shared/Win32/WTSAPI32.cs
similarity index 97%
rename from Remotely_Shared/Win32/WTSAPI32.cs
rename to Shared/Win32/WTSAPI32.cs
index 42defa67..22550ee8 100644
--- a/Remotely_Shared/Win32/WTSAPI32.cs
+++ b/Shared/Win32/WTSAPI32.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Remotely_Shared.Win32
+namespace Remotely.Shared.Win32
 {
     public static class WTSAPI32
     {
diff --git a/Remotely_Shared/Win32/Win32Interop.cs b/Shared/Win32/Win32Interop.cs
similarity index 97%
rename from Remotely_Shared/Win32/Win32Interop.cs
rename to Shared/Win32/Win32Interop.cs
index c0eb32bc..3ab54a78 100644
--- a/Remotely_Shared/Win32/Win32Interop.cs
+++ b/Shared/Win32/Win32Interop.cs
@@ -1,14 +1,14 @@
-using Remotely_Shared.Win32;
+using Remotely.Shared.Win32;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using static Remotely_Shared.Win32.ADVAPI32;
-using static Remotely_Shared.Win32.User32;
+using static Remotely.Shared.Win32.ADVAPI32;
+using static Remotely.Shared.Win32.User32;
 
-namespace Remotely_Shared.Win32
+namespace Remotely.Shared.Win32
 {
     public class Win32Interop
     {
diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1
index b9163983..e1684822 100644
--- a/Utilities/Publish.ps1
+++ b/Utilities/Publish.ps1
@@ -20,6 +20,7 @@ $CurrentVersion = "$Year.$Month.$Day.$Hour$Minute"
 $OutDir = ""
 # RIDs are described here: https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
 $RID = ""
+$MSBuildPath = (Get-ChildItem -Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\" -Recurse -Filter "MSBuild.exe" -File)[0].FullName
 
 for ($i = 0; $i -lt $args.Count; $i++)
 { 
@@ -37,92 +38,90 @@ $Root = (Get-Item -Path $PSScriptRoot).Parent.FullName
 Set-Location -Path $Root
 
 # Add Current Version file to root content folder for client update checks.
-Set-Content -Path ".\Remotely_Server\CurrentVersion.txt" -Value $CurrentVersion.Trim() -Encoding UTF8 -Force
+Set-Content -Path ".\Server\CurrentVersion.txt" -Value $CurrentVersion.Trim() -Encoding UTF8 -Force
 
     
 # Clear publish folders.
-if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish") -eq $true) {
-	Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish") -eq $true) {
+	Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish" | Remove-Item -Force -Recurse
 }
-if ((Test-Path -Path  ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish" ) -eq $true) {
-	Get-ChildItem -Path  ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path  ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish" ) -eq $true) {
+	Get-ChildItem -Path  ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish" | Remove-Item -Force -Recurse
 }
-if ((Test-Path -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish") -eq $true) {
-	Get-ChildItem -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish" | Remove-Item -Force -Recurse
+if ((Test-Path -Path ".\Agent\bin\Release\netcoreapp2.2\linux-x64\publish") -eq $true) {
+	Get-ChildItem -Path ".\Agent\bin\Release\netcoreapp2.2\linux-x64\publish" | Remove-Item -Force -Recurse
 }
 
 
 # Publish Core clients.
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish" "$Root\Remotely_Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish" "$Root\Remotely_Agent"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish" "$Root\Remotely_Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\win10-x64\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime win10-x86 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\win10-x86\publish" "$Root\Agent"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64 --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\linux-x64\publish" "$Root\Agent"
 
-New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -ItemType Directory -Force
-New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -ItemType Directory -Force
-New-Item -Path ".\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" -ItemType Directory -Force
+New-Item -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -ItemType Directory -Force
+New-Item -Path ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -ItemType Directory -Force
+New-Item -Path ".\Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" -ItemType Directory -Force
 
 
 # Publish Linux ScreenCaster
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64  --configuration Release --output "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" "$Root\Remotely_ScreenCast.Linux\"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64  --configuration Release --output "$Root\Agent\bin\Release\netcoreapp2.2\linux-x64\publish\ScreenCast\" "$Root\ScreenCast.Linux\"
 
 # Publish Linux GUI App
-$PublishDir = "$Root\Remotely_Desktop.Unix\bin\Release\netcoreapp2.2\linux-x64\publish\"
-dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64  --configuration Release --output "$PublishDir" "$Root\Remotely_Desktop.Unix\"
+$PublishDir = "$Root\Desktop.Unix\bin\Release\netcoreapp2.2\linux-x64\publish\"
+dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime linux-x64  --configuration Release --output "$PublishDir" "$Root\Desktop.Unix\"
 # Compress Linux GUI App
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely_Desktop.Unix.zip" -CompressionLevel Optimal -Force
 while ((Test-Path -Path "$PublishDir\Remotely_Desktop.Unix.zip") -eq $false){
     Start-Sleep -Seconds 1
 }
-Move-Item -Path "$PublishDir\Remotely_Desktop.Unix.zip" -Destination "$Root\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.Unix.zip" -Force
+Move-Item -Path "$PublishDir\Remotely_Desktop.Unix.zip" -Destination "$Root\Server\wwwroot\Downloads\Remotely_Desktop.Unix.zip" -Force
+
+# Build .NET Framework Projects
+&"$MSBuildPath" "$Root\ScreenCast.Win" /t:Build /p:Configuration=Release
+&"$MSBuildPath" "$Root\Desktop.Win" /t:Build /p:Configuration=Release
 
 
 # Copy .NET Framework ScreenCaster to Agent output folder.
-if ((Test-Path -Path ".\Remotely_ScreenCast.Win\bin\Release\Remotely_ScreenCast.exe") -eq $true) {
-    Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Release\" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -Force -Recurse
-    Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Release\" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -Force -Recurse
-}
-elseif ((Test-Path -Path ".\Remotely_ScreenCast.Win\bin\Debug\Remotely_ScreenCast.exe") -eq $true) {
-    Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Debug\" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -Force -Recurse
-    Copy-Item -Path ".\Remotely_ScreenCast.Win\bin\Debug\" -Destination ".\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -Force -Recurse
-}
+Get-ChildItem -Path ".\ScreenCast.Win\bin\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp2.2\win10-x64\publish\ScreenCast\" -Force
+Get-ChildItem -Path ".\ScreenCast.Win\bin\Release\" -Exclude "*.xml" | Copy-Item -Destination ".\Agent\bin\Release\netcoreapp2.2\win10-x86\publish\ScreenCast\" -Force
 
 
 
 # Compress Core clients.
-$PublishDir =  "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x64\publish"
+$PublishDir =  "$Root\Agent\bin\Release\netcoreapp2.2\win10-x64\publish"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win10-x64.zip" -CompressionLevel Optimal -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Win10-x64.zip") -eq $false){
     Start-Sleep -Seconds 1
 }
-Move-Item -Path "$PublishDir\Remotely-Win10-x64.zip" -Destination "$Root\Remotely_Server\wwwroot\Downloads\Remotely-Win10-x64.zip" -Force
+Move-Item -Path "$PublishDir\Remotely-Win10-x64.zip" -Destination "$Root\Server\wwwroot\Downloads\Remotely-Win10-x64.zip" -Force
 
-$PublishDir =  "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\win10-x86\publish"
+$PublishDir =  "$Root\Agent\bin\Release\netcoreapp2.2\win10-x86\publish"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Win10-x86.zip" -CompressionLevel Optimal -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Win10-x86.zip") -eq $false){
     Start-Sleep -Seconds 1
 }
-Move-Item -Path "$PublishDir\Remotely-Win10-x86.zip" -Destination "$Root\Remotely_Server\wwwroot\Downloads\Remotely-Win10-x86.zip" -Force
+Move-Item -Path "$PublishDir\Remotely-Win10-x86.zip" -Destination "$Root\Server\wwwroot\Downloads\Remotely-Win10-x86.zip" -Force
 
-$PublishDir =  "$Root\Remotely_Agent\bin\Release\netcoreapp2.2\linux-x64\publish"
+$PublishDir =  "$Root\Agent\bin\Release\netcoreapp2.2\linux-x64\publish"
 Compress-Archive -Path "$PublishDir\*" -DestinationPath "$PublishDir\Remotely-Linux.zip" -CompressionLevel Optimal -Force
 while ((Test-Path -Path "$PublishDir\Remotely-Linux.zip") -eq $false){
     Start-Sleep -Seconds 1
 }
-Move-Item -Path "$PublishDir\Remotely-Linux.zip" -Destination "$Root\Remotely_Server\wwwroot\Downloads\Remotely-Linux.zip" -Force
+Move-Item -Path "$PublishDir\Remotely-Linux.zip" -Destination "$Root\Server\wwwroot\Downloads\Remotely-Linux.zip" -Force
 
 # Copy desktop app to Downloads folder.
-if ((Test-Path -Path ".\Remotely_Desktop.Win\bin\Release\Remotely_Desktop.exe") -eq $true) {
-    Copy-Item -Path ".\Remotely_Desktop.Win\bin\Release\Remotely_Desktop.exe" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
+if ((Test-Path -Path ".\Desktop.Win\bin\Release\Remotely_Desktop.exe") -eq $true) {
+    Copy-Item -Path ".\Desktop.Win\bin\Release\Remotely_Desktop.exe" -Destination ".\Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
 }
-elseif ((Test-Path -Path ".\Remotely_Desktop.Win\bin\Debug\Remotely_Desktop.exe") -eq $true) {
-    Copy-Item -Path ".\Remotely_Desktop.Win\bin\Debug\Remotely_Desktop.exe" -Destination ".\Remotely_Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
+elseif ((Test-Path -Path ".\Desktop.Win\bin\Debug\Remotely_Desktop.exe") -eq $true) {
+    Copy-Item -Path ".\Desktop.Win\bin\Debug\Remotely_Desktop.exe" -Destination ".\Server\wwwroot\Downloads\Remotely_Desktop.exe" -Force
 }
 
 if ($RID.Length -gt 0 -and $OutDir.Length -gt 0) {
     if ((Test-Path -Path $OutDir) -eq $false){
         New-Item -Path $OutDir -ItemType Directory
     }
-    dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime $RID --configuration Release --output $OutDir "$Root\Remotely_Server\"
+    dotnet publish /p:Version=$CurrentVersion /p:FileVersion=$CurrentVersion --runtime $RID --configuration Release --output $OutDir "$Root\Server\"
 }
 else {
     Write-Host "`r`nSkipping server deployment.  Params -outdir and -rid not specified." -ForegroundColor DarkYellow