Ken98045 · MikeFarrington · Jan 14, 2021 · Jan 13, 2021
diff --git a/App1.config b/App1.config
diff --git a/OnGuard.sln → On-Guard.sln b/OnGuard.sln → On-Guard.sln
@@ -3,14 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30011.22
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIDisplay", "AIDisplay.csproj", "{CD227D1A-D84D-4442-8B99-DD1788EFF241}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIDisplay", "src\AIDisplay\AIDisplay.csproj", "{CD227D1A-D84D-4442-8B99-DD1788EFF241}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{34C959FD-189B-46E0-A7BD-ED5724DD8C2A}"
 	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
+		src\.editorconfig = src\.editorconfig
 	EndProjectSection
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer.vdproj", "{F9C871D2-65C2-4AD4-A9EC-42E5032762FD}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "src\Installer\Installer.vdproj", "{F9C871D2-65C2-4AD4-A9EC-42E5032762FD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/arrow-down.png b/arrow-down.png
diff --git a/arrow-left.png b/arrow-left.png
diff --git a/arrow-right.png b/arrow-right.png
diff --git a/arrow-up.png b/arrow-up.png
diff --git a/OnGuard-ReadMe.docx → docs/OnGuard-ReadMe.docx b/OnGuard-ReadMe.docx → docs/OnGuard-ReadMe.docx
diff --git a/.editorconfig → src/.editorconfig b/.editorconfig → src/.editorconfig
diff --git a/AIAnalyzer.cs → src/AIDisplay/AIAnalyzer.cs b/AIAnalyzer.cs → src/AIDisplay/AIAnalyzer.cs
diff --git a/AIDisplay.csproj → src/AIDisplay/AIDisplay.csproj b/AIDisplay.csproj → src/AIDisplay/AIDisplay.csproj
diff --git a/AISettings.cs → src/AIDisplay/AISettings.cs b/AISettings.cs → src/AIDisplay/AISettings.cs
diff --git a/App.config → src/AIDisplay/App.config b/App.config → src/AIDisplay/App.config
diff --git a/AreaNotificationOption.cs → src/AIDisplay/AreaNotificationOption.cs b/AreaNotificationOption.cs → src/AIDisplay/AreaNotificationOption.cs
diff --git a/AreaOfInterest.cs → src/AIDisplay/AreaOfInterest.cs b/AreaOfInterest.cs → src/AIDisplay/AreaOfInterest.cs
diff --git a/AreasOfInterestCollection.cs → src/AIDisplay/AreasOfInterestCollection.cs b/AreasOfInterestCollection.cs → src/AIDisplay/AreasOfInterestCollection.cs
diff --git a/BitmapResolution.cs → src/AIDisplay/BitmapResolution.cs b/BitmapResolution.cs → src/AIDisplay/BitmapResolution.cs
diff --git a/CameraCollection.cs → src/AIDisplay/CameraCollection.cs b/CameraCollection.cs → src/AIDisplay/CameraCollection.cs
diff --git a/CameraContactData.cs → src/AIDisplay/CameraContactData.cs b/CameraContactData.cs → src/AIDisplay/CameraContactData.cs
diff --git a/CameraData.cs → src/AIDisplay/CameraData.cs b/CameraData.cs → src/AIDisplay/CameraData.cs
diff --git a/Resizer.cs → src/AIDisplay/Controls/Resizer.cs b/Resizer.cs → src/AIDisplay/Controls/Resizer.cs
diff --git a/ScaledPictureBox.cs → src/AIDisplay/Controls/ScaledPictureBox.cs b/ScaledPictureBox.cs → src/AIDisplay/Controls/ScaledPictureBox.cs
diff --git a/ZoneBox.cs → src/AIDisplay/Controls/ZoneBox.cs b/ZoneBox.cs → src/AIDisplay/Controls/ZoneBox.cs
diff --git a/ZoneBox.resx → src/AIDisplay/Controls/ZoneBox.resx b/ZoneBox.resx → src/AIDisplay/Controls/ZoneBox.resx
diff --git a/Cooldowns.cs → src/AIDisplay/Cooldowns.cs b/Cooldowns.cs → src/AIDisplay/Cooldowns.cs
diff --git a/DataBackup/CameraData.bin → src/AIDisplay/DataBackup/CameraData.bin b/DataBackup/CameraData.bin → src/AIDisplay/DataBackup/CameraData.bin
diff --git a/DataBackup/EmailAddresses.bin → src/AIDisplay/DataBackup/EmailAddresses.bin b/DataBackup/EmailAddresses.bin → src/AIDisplay/DataBackup/EmailAddresses.bin
diff --git a/DataBackup/aiBack-AreasOfInterest.bin → ...lay/DataBackup/aiBack-AreasOfInterest.bin b/DataBackup/aiBack-AreasOfInterest.bin → ...lay/DataBackup/aiBack-AreasOfInterest.bin
diff --git a/DataBackup/aiFront-AreasOfInterest.bin → ...ay/DataBackup/aiFront-AreasOfInterest.bin b/DataBackup/aiFront-AreasOfInterest.bin → ...ay/DataBackup/aiFront-AreasOfInterest.bin
diff --git a/Dbg.cs → src/AIDisplay/Dbg.cs b/Dbg.cs → src/AIDisplay/Dbg.cs
diff --git a/DirectoryMonitor.cs → src/AIDisplay/DirectoryMonitor.cs b/DirectoryMonitor.cs → src/AIDisplay/DirectoryMonitor.cs
diff --git a/EmailAccumulator.cs → src/AIDisplay/EmailAccumulator.cs b/EmailAccumulator.cs → src/AIDisplay/EmailAccumulator.cs
diff --git a/EmailAddresses.cs → src/AIDisplay/EmailAddresses.cs b/EmailAddresses.cs → src/AIDisplay/EmailAddresses.cs
diff --git a/AboutDlg.Designer.cs → src/AIDisplay/Forms/AboutDialog.Designer.cs b/AboutDlg.Designer.cs → src/AIDisplay/Forms/AboutDialog.Designer.cs
diff --git a/AboutDlg.cs → src/AIDisplay/Forms/AboutDialog.cs b/AboutDlg.cs → src/AIDisplay/Forms/AboutDialog.cs
@@ -13,9 +13,9 @@
 
 namespace SAAI
 {
-  public partial class AboutDlg : Form
+  public partial class AboutDialog : Form
   {
-    public AboutDlg()
+    public AboutDialog()
     {
       InitializeComponent();
       //assemblyLabel.Text = String.Format("Version {0}", AssemblyVersion);

diff --git a/AboutDlg.resx → src/AIDisplay/Forms/AboutDialog.resx b/AboutDlg.resx → src/AIDisplay/Forms/AboutDialog.resx
diff --git a/AddCameraDialog.Designer.cs → ...Display/Forms/AddCameraDialog.Designer.cs b/AddCameraDialog.Designer.cs → ...Display/Forms/AddCameraDialog.Designer.cs
diff --git a/AddCameraDialog.cs → src/AIDisplay/Forms/AddCameraDialog.cs b/AddCameraDialog.cs → src/AIDisplay/Forms/AddCameraDialog.cs
diff --git a/AddCameraDialog.resx → src/AIDisplay/Forms/AddCameraDialog.resx b/AddCameraDialog.resx → src/AIDisplay/Forms/AddCameraDialog.resx
diff --git a/AddEmailDlg.Designer.cs → ...IDisplay/Forms/AddEmailDialog.Designer.cs b/AddEmailDlg.Designer.cs → ...IDisplay/Forms/AddEmailDialog.Designer.cs
diff --git a/AddEmailDlg.cs → src/AIDisplay/Forms/AddEmailDialog.cs b/AddEmailDlg.cs → src/AIDisplay/Forms/AddEmailDialog.cs
@@ -7,10 +7,10 @@ namespace SAAI
 /// <summary>
 /// A simple dialog to add email addresses to the AOI notifications dialog
 /// </summary>
-  public partial class AddEmailDlg : Form
+  public partial class AddEmailDialog : Form
   {
     public string EmailAddress { get; set; }
-    public AddEmailDlg()
+    public AddEmailDialog()
     {
       InitializeComponent();
       foreach (var options in EmailAddresses.EmailAddressList)

diff --git a/AddEmailDlg.resx → src/AIDisplay/Forms/AddEmailDialog.resx b/AddEmailDlg.resx → src/AIDisplay/Forms/AddEmailDialog.resx
diff --git a/AddUrlDlialog.Designer.cs → src/AIDisplay/Forms/AddUrlDialog.Designer.cs b/AddUrlDlialog.Designer.cs → src/AIDisplay/Forms/AddUrlDialog.Designer.cs
diff --git a/AddUrlDlialog.cs → src/AIDisplay/Forms/AddUrlDialog.cs b/AddUrlDlialog.cs → src/AIDisplay/Forms/AddUrlDialog.cs
diff --git a/AddUrlDlialog.resx → src/AIDisplay/Forms/AddUrlDialog.resx b/AddUrlDlialog.resx → src/AIDisplay/Forms/AddUrlDialog.resx
diff --git a/CameraConfigurationDialog.Designer.cs → ...rms/CameraConfigurationDialog.Designer.cs b/CameraConfigurationDialog.Designer.cs → ...rms/CameraConfigurationDialog.Designer.cs
diff --git a/CameraConfigurationDialog.cs → ...isplay/Forms/CameraConfigurationDialog.cs b/CameraConfigurationDialog.cs → ...isplay/Forms/CameraConfigurationDialog.cs
diff --git a/CameraConfigurationDialog.resx → ...play/Forms/CameraConfigurationDialog.resx b/CameraConfigurationDialog.resx → ...play/Forms/CameraConfigurationDialog.resx
diff --git a/CameraContactDialog.Designer.cs → ...lay/Forms/CameraContactDialog.Designer.cs b/CameraContactDialog.Designer.cs → ...lay/Forms/CameraContactDialog.Designer.cs
diff --git a/CameraContactDialog.cs → src/AIDisplay/Forms/CameraContactDialog.cs b/CameraContactDialog.cs → src/AIDisplay/Forms/CameraContactDialog.cs
@@ -7,6 +7,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SAAI;
+
 
 namespace DeepStackDisplay
 {

diff --git a/CameraContactDialog.resx → src/AIDisplay/Forms/CameraContactDialog.resx b/CameraContactDialog.resx → src/AIDisplay/Forms/CameraContactDialog.resx
diff --git a/CleanupDialog.Designer.cs → ...AIDisplay/Forms/CleanupDialog.Designer.cs b/CleanupDialog.Designer.cs → ...AIDisplay/Forms/CleanupDialog.Designer.cs
diff --git a/CleanupDialog.cs → src/AIDisplay/Forms/CleanupDialog.cs b/CleanupDialog.cs → src/AIDisplay/Forms/CleanupDialog.cs
diff --git a/CleanupDialog.resx → src/AIDisplay/Forms/CleanupDialog.resx b/CleanupDialog.resx → src/AIDisplay/Forms/CleanupDialog.resx
diff --git a/CreateAOI.Designer.cs → src/AIDisplay/Forms/CreateAOI.Designer.cs b/CreateAOI.Designer.cs → src/AIDisplay/Forms/CreateAOI.Designer.cs
diff --git a/CreateAOI.cs → src/AIDisplay/Forms/CreateAOI.cs b/CreateAOI.cs → src/AIDisplay/Forms/CreateAOI.cs
diff --git a/CreateAOI.resx → src/AIDisplay/Forms/CreateAOI.resx b/CreateAOI.resx → src/AIDisplay/Forms/CreateAOI.resx
diff --git a/CreateEmailAddressDialog.Designer.cs → ...orms/CreateEmailAddressDialog.Designer.cs b/CreateEmailAddressDialog.Designer.cs → ...orms/CreateEmailAddressDialog.Designer.cs
diff --git a/CreateEmailAddressDialog.cs → ...Display/Forms/CreateEmailAddressDialog.cs b/CreateEmailAddressDialog.cs → ...Display/Forms/CreateEmailAddressDialog.cs
diff --git a/CreateEmailAddressDialog.resx → ...splay/Forms/CreateEmailAddressDialog.resx b/CreateEmailAddressDialog.resx → ...splay/Forms/CreateEmailAddressDialog.resx
diff --git a/EditAreasOfInterest.Designer.cs → ...lay/Forms/EditAreasOfInterest.Designer.cs b/EditAreasOfInterest.Designer.cs → ...lay/Forms/EditAreasOfInterest.Designer.cs
diff --git a/EditAreasOfInterest.cs → src/AIDisplay/Forms/EditAreasOfInterest.cs b/EditAreasOfInterest.cs → src/AIDisplay/Forms/EditAreasOfInterest.cs
diff --git a/EditAreasOfInterest.resx → src/AIDisplay/Forms/EditAreasOfInterest.resx b/EditAreasOfInterest.resx → src/AIDisplay/Forms/EditAreasOfInterest.resx
diff --git a/EmailAddressesDialog.Designer.cs → ...ay/Forms/EmailAddressesDialog.Designer.cs b/EmailAddressesDialog.Designer.cs → ...ay/Forms/EmailAddressesDialog.Designer.cs
diff --git a/EmailAddressesDialog.cs → src/AIDisplay/Forms/EmailAddressesDialog.cs b/EmailAddressesDialog.cs → src/AIDisplay/Forms/EmailAddressesDialog.cs
diff --git a/EmailAddressesDialog.resx → ...AIDisplay/Forms/EmailAddressesDialog.resx b/EmailAddressesDialog.resx → ...AIDisplay/Forms/EmailAddressesDialog.resx
diff --git a/InterestingItemsDialog.Designer.cs → .../Forms/InterestingItemsDialog.Designer.cs b/InterestingItemsDialog.Designer.cs → .../Forms/InterestingItemsDialog.Designer.cs
diff --git a/InterestingItemsDialog.cs → ...AIDisplay/Forms/InterestingItemsDialog.cs b/InterestingItemsDialog.cs → ...AIDisplay/Forms/InterestingItemsDialog.cs
diff --git a/InterestingItemsDialog.resx → ...Display/Forms/InterestingItemsDialog.resx b/InterestingItemsDialog.resx → ...Display/Forms/InterestingItemsDialog.resx
diff --git a/MMS-Helper.Designer.cs → src/AIDisplay/Forms/MMS-Helper.Designer.cs b/MMS-Helper.Designer.cs → src/AIDisplay/Forms/MMS-Helper.Designer.cs
diff --git a/MMS-Helper.cs → src/AIDisplay/Forms/MMS-Helper.cs b/MMS-Helper.cs → src/AIDisplay/Forms/MMS-Helper.cs
diff --git a/MMS-Helper.resx → src/AIDisplay/Forms/MMS-Helper.resx b/MMS-Helper.resx → src/AIDisplay/Forms/MMS-Helper.resx
diff --git a/MQTTSettings.Designer.cs → src/AIDisplay/Forms/MQTTSettings.Designer.cs b/MQTTSettings.Designer.cs → src/AIDisplay/Forms/MQTTSettings.Designer.cs
diff --git a/MQTTSettings.cs → src/AIDisplay/Forms/MQTTSettings.cs b/MQTTSettings.cs → src/AIDisplay/Forms/MQTTSettings.cs
diff --git a/MQTTSettings.resx → src/AIDisplay/Forms/MQTTSettings.resx b/MQTTSettings.resx → src/AIDisplay/Forms/MQTTSettings.resx
diff --git a/MainWindow.Designer.cs → src/AIDisplay/Forms/MainWindow.Designer.cs b/MainWindow.Designer.cs → src/AIDisplay/Forms/MainWindow.Designer.cs
diff --git a/MainWindow.cs → src/AIDisplay/Forms/MainWindow.cs b/MainWindow.cs → src/AIDisplay/Forms/MainWindow.cs
@@ -1621,7 +1621,7 @@ private void Refresh_Click(object sender, EventArgs e)
 
     private void AboutToolStripMenuItem_Click(object sender, EventArgs e)
     {
-      using (AboutDlg dlg = new AboutDlg())
+      using (AboutDialog dlg = new AboutDialog())
       {
         dlg.ShowDialog();
       }

diff --git a/MainWindow.resx → src/AIDisplay/Forms/MainWindow.resx b/MainWindow.resx → src/AIDisplay/Forms/MainWindow.resx
diff --git a/MonitorCameraDialog.Designer.cs → ...lay/Forms/MonitorCameraDialog.Designer.cs b/MonitorCameraDialog.Designer.cs → ...lay/Forms/MonitorCameraDialog.Designer.cs
diff --git a/MonitorCameraDialog.cs → src/AIDisplay/Forms/MonitorCameraDialog.cs b/MonitorCameraDialog.cs → src/AIDisplay/Forms/MonitorCameraDialog.cs
diff --git a/MonitorCameraDialog.resx → src/AIDisplay/Forms/MonitorCameraDialog.resx b/MonitorCameraDialog.resx → src/AIDisplay/Forms/MonitorCameraDialog.resx
diff --git a/NotificationOptionsDialog.Designer.cs → ...rms/NotificationOptionsDialog.Designer.cs b/NotificationOptionsDialog.Designer.cs → ...rms/NotificationOptionsDialog.Designer.cs
diff --git a/NotificationOptionsDialog.cs → ...isplay/Forms/NotificationOptionsDialog.cs b/NotificationOptionsDialog.cs → ...isplay/Forms/NotificationOptionsDialog.cs
@@ -166,7 +166,7 @@ private void RemoveUrlButton_Click(object sender, EventArgs e)
 
     private void AddEmailButton_Click(object sender, EventArgs e)
     {
-      using (AddEmailDlg dlg = new AddEmailDlg())
+      using (AddEmailDialog dlg = new AddEmailDialog())
       {
         if (dlg.ShowDialog() == DialogResult.OK)
         {

diff --git a/NotificationOptionsDialog.resx → ...play/Forms/NotificationOptionsDialog.resx b/NotificationOptionsDialog.resx → ...play/Forms/NotificationOptionsDialog.resx
diff --git a/OutgoingEmailDialog.Designer.cs → ...lay/Forms/OutgoingEmailDialog.Designer.cs b/OutgoingEmailDialog.Designer.cs → ...lay/Forms/OutgoingEmailDialog.Designer.cs
diff --git a/OutgoingEmailDialog.cs → src/AIDisplay/Forms/OutgoingEmailDialog.cs b/OutgoingEmailDialog.cs → src/AIDisplay/Forms/OutgoingEmailDialog.cs
diff --git a/OutgoingEmailDialog.resx → src/AIDisplay/Forms/OutgoingEmailDialog.resx b/OutgoingEmailDialog.resx → src/AIDisplay/Forms/OutgoingEmailDialog.resx
diff --git a/PerAreaNotificationOptionsDialog.Designer.cs → ...AreaNotificationOptionsDialog.Designer.cs b/PerAreaNotificationOptionsDialog.Designer.cs → ...AreaNotificationOptionsDialog.Designer.cs
diff --git a/PerAreaNotificationOptionsDialog.cs → ...Forms/PerAreaNotificationOptionsDialog.cs b/PerAreaNotificationOptionsDialog.cs → ...Forms/PerAreaNotificationOptionsDialog.cs
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using SAAI;
 
 namespace DeepStackDisplay
 {
@@ -128,7 +129,7 @@ private void RemoveUrlButton_Click(object sender, EventArgs e)
 
     private void AddEmailButton_Click(object sender, EventArgs e)
     {
-      using (AddEmailDlg dlg = new AddEmailDlg())
+      using (AddEmailDialog dlg = new AddEmailDialog())
       {
         if (dlg.ShowDialog() == DialogResult.OK)
         {

diff --git a/PerAreaNotificationOptionsDialog.resx → ...rms/PerAreaNotificationOptionsDialog.resx b/PerAreaNotificationOptionsDialog.resx → ...rms/PerAreaNotificationOptionsDialog.resx
diff --git a/SettingsDialog.Designer.cs → ...IDisplay/Forms/SettingsDialog.Designer.cs b/SettingsDialog.Designer.cs → ...IDisplay/Forms/SettingsDialog.Designer.cs
diff --git a/SettingsDialog.cs → src/AIDisplay/Forms/SettingsDialog.cs b/SettingsDialog.cs → src/AIDisplay/Forms/SettingsDialog.cs
diff --git a/SettingsDialog.resx → src/AIDisplay/Forms/SettingsDialog.resx b/SettingsDialog.resx → src/AIDisplay/Forms/SettingsDialog.resx
diff --git a/Test Email Address.Designer.cs → ...play/Forms/Test Email Address.Designer.cs b/Test Email Address.Designer.cs → ...play/Forms/Test Email Address.Designer.cs
diff --git a/Test Email Address.cs → src/AIDisplay/Forms/Test Email Address.cs b/Test Email Address.cs → src/AIDisplay/Forms/Test Email Address.cs
diff --git a/Test Email Address.resx → src/AIDisplay/Forms/Test Email Address.resx b/Test Email Address.resx → src/AIDisplay/Forms/Test Email Address.resx
diff --git a/FrameAccumulator.cs → src/AIDisplay/FrameAccumulator.cs b/FrameAccumulator.cs → src/AIDisplay/FrameAccumulator.cs
diff --git a/FrameAnalyzer.cs → src/AIDisplay/FrameAnalyzer.cs b/FrameAnalyzer.cs → src/AIDisplay/FrameAnalyzer.cs
diff --git a/GlobalSuppressions.cs → src/AIDisplay/GlobalSuppressions.cs b/GlobalSuppressions.cs → src/AIDisplay/GlobalSuppressions.cs
diff --git a/HIstory.cs → src/AIDisplay/History.cs b/HIstory.cs → src/AIDisplay/History.cs
diff --git a/MQTTPublish.cs → src/AIDisplay/MQTTPublish.cs b/MQTTPublish.cs → src/AIDisplay/MQTTPublish.cs
diff --git a/MostRecentCollection.cs → src/AIDisplay/MostRecentCollection.cs b/MostRecentCollection.cs → src/AIDisplay/MostRecentCollection.cs
diff --git a/ObjectCharacteristics.cs → src/AIDisplay/ObjectCharacteristics.cs b/ObjectCharacteristics.cs → src/AIDisplay/ObjectCharacteristics.cs
diff --git a/PendingItem.cs → src/AIDisplay/PendingItem.cs b/PendingItem.cs → src/AIDisplay/PendingItem.cs
diff --git a/Program.cs → src/AIDisplay/Program.cs b/Program.cs → src/AIDisplay/Program.cs
diff --git a/Properties/AssemblyInfo.cs → src/AIDisplay/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs → src/AIDisplay/Properties/AssemblyInfo.cs
diff --git a/Properties/Resources.Designer.cs → ...IDisplay/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs → ...IDisplay/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx → src/AIDisplay/Properties/Resources.resx b/Properties/Resources.resx → src/AIDisplay/Properties/Resources.resx
@@ -119,48 +119,48 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="arrow-down" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\ButtonImages\Selected\arrow-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\arrow-down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow-right" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\ButtonImages\Selected\arrow-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\arrow-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="zoom-in" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\ButtonImages\Selected\zoom-in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\zoom-in.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow-left" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\ButtonImages\Selected\arrow-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\arrow-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow-up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\ButtonImages\Selected\arrow-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\arrow-up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="zoom-out" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\ButtonImages\Selected\zoom-out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Icons\zoom-out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="OnGuard" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\OnGuard.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\OnGuard.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Street1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\street1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Samples\Street1.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Street2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Street2.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Samples\Street2.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Street3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Street3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Samples\Street3.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Street4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Street4.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Samples\Street4.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Street5" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Street5.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Samples\Street5.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Street6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Street6.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Samples\Street6.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Street7" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Street7.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Samples\Street7.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="OnGuardNoPIctures" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\OnGuardNoPIctures.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Images\OnGuardNoPictures.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/Properties/Settings.Designer.cs → ...AIDisplay/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs → ...AIDisplay/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings → src/AIDisplay/Properties/Settings.settings b/Properties/Settings.settings → src/AIDisplay/Properties/Settings.settings
diff --git a/Properties/app.manifest → src/AIDisplay/Properties/app.manifest b/Properties/app.manifest → src/AIDisplay/Properties/app.manifest
diff --git a/Guardian.ico → src/AIDisplay/Resources/Icons/Guardian.ico b/Guardian.ico → src/AIDisplay/Resources/Icons/Guardian.ico
diff --git a/ButtonImages/Selected/arrow-down.png → src/AIDisplay/Resources/Icons/arrow-down.png b/ButtonImages/Selected/arrow-down.png → src/AIDisplay/Resources/Icons/arrow-down.png
diff --git a/ButtonImages/Selected/arrow-left.png → src/AIDisplay/Resources/Icons/arrow-left.png b/ButtonImages/Selected/arrow-left.png → src/AIDisplay/Resources/Icons/arrow-left.png
diff --git a/ButtonImages/Selected/arrow-right.png → ...AIDisplay/Resources/Icons/arrow-right.png b/ButtonImages/Selected/arrow-right.png → ...AIDisplay/Resources/Icons/arrow-right.png
diff --git a/ButtonImages/Selected/arrow-up.png → src/AIDisplay/Resources/Icons/arrow-up.png b/ButtonImages/Selected/arrow-up.png → src/AIDisplay/Resources/Icons/arrow-up.png
diff --git a/ButtonImages/Selected/zoom-in.png → src/AIDisplay/Resources/Icons/zoom-in.png b/ButtonImages/Selected/zoom-in.png → src/AIDisplay/Resources/Icons/zoom-in.png
diff --git a/ButtonImages/Selected/zoom-out.png → src/AIDisplay/Resources/Icons/zoom-out.png b/ButtonImages/Selected/zoom-out.png → src/AIDisplay/Resources/Icons/zoom-out.png
diff --git a/OnGuard.jpg → src/AIDisplay/Resources/Images/OnGuard.jpg b/OnGuard.jpg → src/AIDisplay/Resources/Images/OnGuard.jpg
diff --git a/OnGuardNoPIctures.jpg → ...ay/Resources/Images/OnGuardNoPictures.jpg b/OnGuardNoPIctures.jpg → ...ay/Resources/Images/OnGuardNoPictures.jpg
diff --git a/street1.jpg → src/AIDisplay/Resources/Samples/Street1.jpg b/street1.jpg → src/AIDisplay/Resources/Samples/Street1.jpg
diff --git a/Street2.jpg → src/AIDisplay/Resources/Samples/Street2.jpg b/Street2.jpg → src/AIDisplay/Resources/Samples/Street2.jpg
diff --git a/Street3.jpg → src/AIDisplay/Resources/Samples/Street3.jpg b/Street3.jpg → src/AIDisplay/Resources/Samples/Street3.jpg
diff --git a/Street4.jpg → src/AIDisplay/Resources/Samples/Street4.jpg b/Street4.jpg → src/AIDisplay/Resources/Samples/Street4.jpg
diff --git a/Street5.jpg → src/AIDisplay/Resources/Samples/Street5.jpg b/Street5.jpg → src/AIDisplay/Resources/Samples/Street5.jpg
diff --git a/Street6.jpg → src/AIDisplay/Resources/Samples/Street6.jpg b/Street6.jpg → src/AIDisplay/Resources/Samples/Street6.jpg
diff --git a/Street7.jpg → src/AIDisplay/Resources/Samples/Street7.jpg b/Street7.jpg → src/AIDisplay/Resources/Samples/Street7.jpg
diff --git a/Storage.cs → src/AIDisplay/Storage.cs b/Storage.cs → src/AIDisplay/Storage.cs
diff --git a/TimerPlus.cs → src/AIDisplay/TimerPlus.cs b/TimerPlus.cs → src/AIDisplay/TimerPlus.cs
diff --git a/WaitCursor.cs → src/AIDisplay/WaitCursor.cs b/WaitCursor.cs → src/AIDisplay/WaitCursor.cs
diff --git a/packages.config → src/AIDisplay/packages.config b/packages.config → src/AIDisplay/packages.config
@@ -5,5 +5,5 @@
   <package id="Microsoft.CodeQuality.Analyzers" version="2.9.6" targetFramework="net48" developmentDependency="true" />
   <package id="Microsoft.NetCore.Analyzers" version="2.9.6" targetFramework="net48" developmentDependency="true" />
   <package id="Microsoft.NetFramework.Analyzers" version="2.9.6" targetFramework="net48" developmentDependency="true" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
 </packages>
diff --git a/MQTTnet.dll → src/AIDisplay/redist/MQTTnet.dll b/MQTTnet.dll → src/AIDisplay/redist/MQTTnet.dll
diff --git a/Installer.vdproj → src/Installer/Installer.vdproj b/Installer.vdproj → src/Installer/Installer.vdproj
@@ -287,7 +287,7 @@
             }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_55B0BE71F8494529B2660899785424E2"
             {
-            "SourcePath" = "8:bin\\Release\\DBMotionFrames_log.ldf"
+            "SourcePath" = "8:..\\AIDisplay\\bin\\Release\\DBMotionFrames_log.ldf"
             "TargetName" = "8:DBMotionFrames_log.ldf"
             "Tag" = "8:"
             "Folder" = "8:_C6F4FA510D784BD39DD9EC2DCB479E32"
@@ -307,7 +307,7 @@
             }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_62C36CBD57C048CF9B079FFBF2784D51"
             {
-            "SourcePath" = "8:bin\\Release\\DBMotionFrames.mdf"
+            "SourcePath" = "8:..\\AIDisplay\\bin\\Release\\DBMotionFrames.mdf"
             "TargetName" = "8:DBMotionFrames.mdf"
             "Tag" = "8:"
             "Folder" = "8:_C6F4FA510D784BD39DD9EC2DCB479E32"

diff --git a/Setup/Installer.msi → src/Installer/Setup/Installer.msi b/Setup/Installer.msi → src/Installer/Setup/Installer.msi
diff --git a/Setup/setup.exe → src/Installer/Setup/setup.exe b/Setup/setup.exe → src/Installer/Setup/setup.exe
diff --git a/Test Version 1/Installer.msi → src/Installer/Test Version 1/Installer.msi b/Test Version 1/Installer.msi → src/Installer/Test Version 1/Installer.msi
diff --git a/Test Version 1/setup.exe → src/Installer/Test Version 1/setup.exe b/Test Version 1/setup.exe → src/Installer/Test Version 1/setup.exe
diff --git a/zoom-in.png b/zoom-in.png
diff --git a/zoom-out.png b/zoom-out.png