From 28dc6049062a8c0a0dc997659ed0ed7cfa06a8f8 Mon Sep 17 00:00:00 2001
From: Luca Domenichini <luca.domenic@gmail.com>
Date: Thu, 14 Dec 2023 09:59:31 +0100
Subject: [PATCH 1/3] ADD reduce memory allocation for read/write operations
 (Snap7, SnapModBus). More work to be done on todo list.

---
 .../smartiot-config.json                      | 10 ++++-----
 .../Snap7Driver.cs                            | 15 ++++++-------
 .../SmartIOT.Connector.Plc.Snap7/Snap7Plc.cs  |  6 +++---
 .../SnapModBusDriver.cs                       | 21 ++++++++++---------
 .../SnapModBusNode.cs                         |  4 ++--
 LICENSE                                       |  2 +-
 README.md                                     |  3 +++
 .../MainWindow.xaml                           |  2 --
 .../MainWindow.xaml.cs                        | 12 ++---------
 9 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/Apps/SmartIOT.Connector.ConsoleApp/smartiot-config.json b/Apps/SmartIOT.Connector.ConsoleApp/smartiot-config.json
index f00f7da..f8da15a 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/smartiot-config.json
+++ b/Apps/SmartIOT.Connector.ConsoleApp/smartiot-config.json
@@ -1,11 +1,11 @@
 {
   "Configuration": {
     "ConnectorConnectionStrings": [
-      "tcpServer://port=1885"
+      "mqttServer://ServerId=MyServer;Port=1883;Serializer=json"
     ],
     "DeviceConfigurations": [
       {
-        "ConnectionString": "snap7://ip=localhost;rack=0;slot=2",
+        "ConnectionString": "snapmodbus://ip=127.0.0.1;SwapBytes=true",
         "DeviceId": "1",
         "Enabled": true,
         "Name": "Test Device",
@@ -16,14 +16,14 @@
             "TagId": "DB2",
             "TagType": "READ",
             "ByteOffset": 0,
-            "Size": 100,
+            "Size": 10,
             "Weight": 1
           },
           {
             "TagId": "DB3",
             "TagType": "WRITE",
             "ByteOffset": 0,
-            "Size": 100,
+            "Size": 20,
             "Weight": 1
           }
         ]
@@ -40,7 +40,7 @@
     }
   },
   "PrometheusConfiguration": {
-    "HostName": "+",
+    "HostName": "\u002B",
     "Port": 0,
     "Url": "metrics/",
     "MetricsPrefix": "smartiot_connector",
diff --git a/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Driver.cs b/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Driver.cs
index b04bf11..706208c 100644
--- a/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Driver.cs
+++ b/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Driver.cs
@@ -11,9 +11,13 @@ public class Snap7Driver : IDeviceDriver
     public string Name => $"{nameof(Snap7Driver)}.{Device.Name}";
     public Device Device { get; }
 
+    private byte[] _tmp;
+
     public Snap7Driver(Snap7Plc plc)
     {
         Device = plc;
+
+        _tmp = new byte[plc.Tags.Max(x => x.TagConfiguration.Size)];
     }
 
     public int StartInterface()
@@ -48,25 +52,22 @@ public int ReadTag(Device device, Tag tag, byte[] data, int startOffset, int len
     {
         Snap7Plc p = (Snap7Plc)device;
 
-        var bytes = new byte[length];
-
-        int ret = p.ReadBytes(tag.TagId, startOffset, bytes, length);
+        int ret = p.ReadBytes(tag.TagId, startOffset, _tmp, length);
         if (ret != 0)
             return ret;
 
-        Array.Copy(bytes, 0, data, startOffset - tag.ByteOffset, length);
+        Array.Copy(_tmp, 0, data, startOffset - tag.ByteOffset, length);
 
         return 0;
     }
 
     public int WriteTag(Device device, Tag tag, byte[] data, int startOffset, int length)
     {
-        byte[] bytes = new byte[length];
-        Array.Copy(data, startOffset - tag.ByteOffset, bytes, 0, length);
+        Array.Copy(data, startOffset - tag.ByteOffset, _tmp, 0, length);
 
         Snap7Plc p = (Snap7Plc)device;
 
-        return p.WriteBytes(tag.TagId, startOffset, bytes);
+        return p.WriteBytes(tag.TagId, startOffset, _tmp, length);
     }
 
     public string GetErrorMessage(int errorNumber)
diff --git a/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Plc.cs b/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Plc.cs
index eecbad3..fd6d3b2 100644
--- a/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Plc.cs
+++ b/Devices/SmartIOT.Connector.Plc.Snap7/Snap7Plc.cs
@@ -60,11 +60,11 @@ public int ReadBytes(string tagId, int startOffset, byte[] data, int length)
         }
     }
 
-    public int WriteBytes(string tagId, int startOffset, byte[] data)
+    public int WriteBytes(string tagId, int startOffset, byte[] data, int length)
     {
         if (int.TryParse(tagId, out int t))
         {
-            return S7Client.DBWrite(t, startOffset, data.Length, data);
+            return S7Client.DBWrite(t, startOffset, length, data);
         }
         else
         {
@@ -72,7 +72,7 @@ public int WriteBytes(string tagId, int startOffset, byte[] data)
             if (match.Success)
             {
                 t = int.Parse(match.Groups["tag"].Value);
-                return S7Client.DBWrite(t, startOffset, data.Length, data);
+                return S7Client.DBWrite(t, startOffset, length, data);
             }
 
             // other tag types can be supported here..
diff --git a/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusDriver.cs b/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusDriver.cs
index 82da63b..22373a4 100644
--- a/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusDriver.cs
+++ b/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusDriver.cs
@@ -10,9 +10,13 @@ public class SnapModBusDriver : IDeviceDriver
     public string Name => $"{nameof(SnapModBusDriver)}.{Device.Name}";
     public Device Device { get; }
 
+    private ushort[] _tmp;
+
     public SnapModBusDriver(SnapModBusNode node)
     {
         Device = node;
+
+        _tmp = new ushort[node.Tags.Max(x => x.TagConfiguration.Size / 2 + 1)]; // allocating words from bytes, +1 to handle odd sizes..
     }
 
     public int StartInterface()
@@ -68,17 +72,15 @@ public int ReadTag(Device device, Tag tag, byte[] data, int startOffset, int len
         int endAddress = (startOffset + length - 1) / 2;
         ushort amount = (ushort)(endAddress - address + 1);
 
-        var words = new ushort[amount];
-
         // address is 1-based
-        int ret = node.ReadRegisters((ushort)(address + 1), amount, words);
+        int ret = node.ReadRegisters((ushort)(address + 1), amount, _tmp);
         if (ret != 0)
             return ret;
 
         if (node.Configuration.SwapBytes)
-            CopyArrayAndSwapBytes(words, startOffset % 2, data, startOffset - tag.ByteOffset, length);
+            CopyArrayAndSwapBytes(_tmp, startOffset % 2, data, startOffset - tag.ByteOffset, length);
         else
-            Buffer.BlockCopy(words, startOffset % 2, data, startOffset - tag.ByteOffset, length);
+            Buffer.BlockCopy(_tmp, startOffset % 2, data, startOffset - tag.ByteOffset, length);
 
         return 0;
     }
@@ -111,21 +113,20 @@ public int WriteTag(Device device, Tag tag, byte[] data, int startOffset, int le
         int startRemainder = startOffset % 2;
         int endRemainder = (startOffset + length) % 2;
 
-        var words = new ushort[amount];
         if (node.Configuration.SwapBytes)
-            CopyArrayAndSwapBytes(data, startOffset - tag.ByteOffset - startRemainder, words, 0, length + startRemainder + endRemainder);
+            CopyArrayAndSwapBytes(data, startOffset - tag.ByteOffset - startRemainder, _tmp, 0, length + startRemainder + endRemainder);
         else
-            Buffer.BlockCopy(data, startOffset - tag.ByteOffset - startRemainder, words, 0, length + startRemainder + endRemainder);
+            Buffer.BlockCopy(data, startOffset - tag.ByteOffset - startRemainder, _tmp, 0, length + startRemainder + endRemainder);
 
         // address is 1-based
-        return node.WriteRegisters((ushort)(address + 1), words);
+        return node.WriteRegisters((ushort)(address + 1), _tmp, amount);
     }
 
     private void CopyArrayAndSwapBytes(byte[] source, int srcIndex, ushort[] target, int targetIndex, int length)
     {
         for (int i = 0; i < length; i += 2)
         {
-            target[targetIndex + i] = (ushort)((source[srcIndex + i] << 8) + source[srcIndex + i + 1]);
+            target[targetIndex + i / 2] = (ushort)((source[srcIndex + i] << 8) + source[srcIndex + i + 1]);
         }
     }
 
diff --git a/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusNode.cs b/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusNode.cs
index 9b7306d..d7fe4a2 100644
--- a/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusNode.cs
+++ b/Devices/SmartIOT.Connector.Plc.SnapModBus/SnapModBusNode.cs
@@ -43,8 +43,8 @@ public int ReadRegisters(ushort address, ushort amount, ushort[] data)
         return Client.ReadInputRegisters(Configuration.NodeId, address, amount, data);
     }
 
-    public int WriteRegisters(ushort address, ushort[] data)
+    public int WriteRegisters(ushort address, ushort[] data, ushort amount)
     {
-        return Client.WriteMultipleRegisters(Configuration.NodeId, address, (ushort)data.Length, data);
+        return Client.WriteMultipleRegisters(Configuration.NodeId, address, amount, data);
     }
 }
diff --git a/LICENSE b/LICENSE
index 82963b4..22f8648 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Luca Domenichini
+Copyright (c) 2022-2023 Luca Domenichini
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 095b3ad..8c7c431 100644
--- a/README.md
+++ b/README.md
@@ -151,3 +151,6 @@ I will do my best to keep the interfaces stable, but there are possibilities to
 - [ ] The proto files should be part of SmartIOT.Connector.Messages project
 - [ ] Build and push docker image with github workflow
 - [ ] Use ActivatorUtilities from DI container to create device factories instead of default constructor
+- [ ] Reduce memory allocation on read/write operations. The aim is to use the underlying byte[] as source or target directly, without further allocations.
+  - [ ] use existing ReadOnlySpan aware methods on S7Net
+  - [ ] introduce new method ReadOnlySpan aware on Snap7 and SnapModBus
diff --git a/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml b/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml
index d4e18c7..e3405ab 100644
--- a/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml
+++ b/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml
@@ -35,7 +35,5 @@
         <TextBox x:Name="TxtData" HorizontalAlignment="Left" Margin="56,189,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="252" />
         <Button x:Name="BtnRequestWrite" Content="Write" HorizontalAlignment="Left" Margin="314,167,0,0" VerticalAlignment="Top" Height="38" RenderTransformOrigin="0.519,0.545" Width="68" Click="BtnRequestWrite_Click" />
         <Button x:Name="BtnRequestRead" Content="Read" HorizontalAlignment="Left" Margin="388,167,0,0" VerticalAlignment="Top" Height="38" RenderTransformOrigin="0.519,0.545" Width="68" Click="BtnRequestRead_Click" />
-        <Label x:Name="label2_Copy4" Content="Length" HorizontalAlignment="Left" Margin="461,173,0,0" VerticalAlignment="Top" RenderTransformOrigin="0,0.052" />
-        <TextBox x:Name="TxtReadLength" HorizontalAlignment="Left" Margin="512,177,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="38" />
     </Grid>
 </Window>
diff --git a/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml.cs b/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml.cs
index 6cd408c..4cec941 100644
--- a/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml.cs
+++ b/Testers/SmartIOT.Connector.MqttClient.Tester/MainWindow.xaml.cs
@@ -74,11 +74,8 @@ private void BtnConnect_Click(object sender, RoutedEventArgs e)
 
                             if (msg?.Data is not null)
                             {
-                                _data.AddOrUpdate(msg.DeviceId + "_" + msg.TagId, msg.Data, (_, old) =>
-                                {
-                                    Array.Copy(msg.Data, 0, old, 0, msg.Data.Length);
-                                    return old;
-                                });
+                                var bytes = _data.GetOrAdd(msg.DeviceId + "_" + msg.TagId, _ => new byte[20]);
+                                Array.Copy(msg.Data, 0, bytes, msg.StartOffset, msg.Data.Length);
                             }
                         }
                         else if (IsTopicRoot(_tagWriteTopic, e.ApplicationMessage.Topic))
@@ -266,11 +263,6 @@ private void BtnRequestRead_Click(object sender, RoutedEventArgs e)
 
             string deviceId = TxtDeviceId.Text;
             string tagId = TxtTagId.Text;
-            var topic = txtTagWriteTopic.Text;
-            if (topic.Contains('/'))
-                topic = topic[..topic.IndexOf('/')];
-            int offset = int.Parse(TxtByteOffset.Text);
-            int length = int.Parse(TxtReadLength.Text);
 
             if (_data.TryGetValue(deviceId + "_" + tagId, out var data))
             {

From 01ca6d60cc88b7613597108f6ce8a7be319a12e2 Mon Sep 17 00:00:00 2001
From: Luca Domenichini <luca.domenic@gmail.com>
Date: Thu, 14 Dec 2023 10:49:35 +0100
Subject: [PATCH 2/3] ADD Support to run as a Windows Service

---
 .../.config/dotnet-tools.json                    | 12 ++++++++++++
 Apps/SmartIOT.Connector.ConsoleApp/Program.cs    | 16 +++++++++++-----
 Apps/SmartIOT.Connector.ConsoleApp/Runner.cs     |  3 ++-
 .../SmartIOT.Connector.ConsoleApp.csproj         |  1 +
 .../appsettings.json                             | 10 ++++++++++
 README.md                                        |  8 +++++++-
 6 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 Apps/SmartIOT.Connector.ConsoleApp/.config/dotnet-tools.json

diff --git a/Apps/SmartIOT.Connector.ConsoleApp/.config/dotnet-tools.json b/Apps/SmartIOT.Connector.ConsoleApp/.config/dotnet-tools.json
new file mode 100644
index 0000000..e3cadb9
--- /dev/null
+++ b/Apps/SmartIOT.Connector.ConsoleApp/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "8.0.0",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/Program.cs b/Apps/SmartIOT.Connector.ConsoleApp/Program.cs
index 2f36728..20f34ab 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/Program.cs
+++ b/Apps/SmartIOT.Connector.ConsoleApp/Program.cs
@@ -2,7 +2,6 @@
 using Serilog;
 using SmartIOT.Connector.RestApi;
 using System.Diagnostics;
-using System.Reflection;
 using System.Text.Json;
 
 namespace SmartIOT.Connector.ConsoleApp;
@@ -15,12 +14,13 @@ protected Program()
 
     public static void Main(string[] args)
     {
-        Assembly assembly = Assembly.GetExecutingAssembly();
-        FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
-        var version = fileVersionInfo.ProductVersion ?? "--Unknown";
+        FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(Process.GetCurrentProcess().MainModule?.FileName!);
+        var version = fileVersionInfo?.ProductVersion ?? "--Unknown";
+
+        Environment.CurrentDirectory = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName!)!;
 
         if (args.Length == 0)
-            args = new[] { "smartiot-config.json" };
+            args = ["smartiot-config.json"];
 
         string path = args[0];
         if (!File.Exists(path))
@@ -63,6 +63,12 @@ public static void Main(string[] args)
             options.LowercaseQueryStrings = true;
         });
 
+        // setup winservice
+        builder.Services.AddWindowsService(o =>
+        {
+            o.ServiceName = typeof(Program).Assembly.GetName().Name!;
+        });
+
         var app = builder.Build();
 
         // Configure the HTTP request pipeline.
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/Runner.cs b/Apps/SmartIOT.Connector.ConsoleApp/Runner.cs
index 1eb1c50..c8572d3 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/Runner.cs
+++ b/Apps/SmartIOT.Connector.ConsoleApp/Runner.cs
@@ -95,7 +95,8 @@ public Runner(AppConfiguration configuration, ILogger<Runner> logger)
 
         if (builder.AutoDiscoveryExceptions.Any())
         {
-            _logger.LogWarning($"Error autodiscoverying dll: [{Environment.NewLine}{string.Join($"{Environment.NewLine}\t", builder.AutoDiscoveryExceptions.Select(x => x.Message))}{Environment.NewLine}]");
+            if (_logger.IsEnabled(LogLevel.Debug))
+                _logger.LogDebug($"Error autodiscoverying dll: [{Environment.NewLine}{string.Join($"{Environment.NewLine}\t", builder.AutoDiscoveryExceptions.Select(x => x.Message))}{Environment.NewLine}]");
         }
     }
 
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj b/Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj
index 50fb3a8..35499db 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj
+++ b/Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj
@@ -21,6 +21,7 @@
 
   <ItemGroup>
     <!--<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />-->
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Enrichers.Context" Version="4.6.5" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/appsettings.json b/Apps/SmartIOT.Connector.ConsoleApp/appsettings.json
index 1c752e1..e1d9fb9 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/appsettings.json
+++ b/Apps/SmartIOT.Connector.ConsoleApp/appsettings.json
@@ -1,4 +1,14 @@
 {
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning"
+    },
+    "EventLog": {
+      "LogLevel": {
+        "Microsoft.Hosting.Lifetime": "Information"
+      }
+    }
+  },
   "Serilog": {
     "MinimumLevel": {
       "Default": "Information",
diff --git a/README.md b/README.md
index 8c7c431..c73c685 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,12 @@ If you want to run SmartIOT.Connector as a standalone application or as a Docker
 
 Here is a quick link to the Docker image repository: <https://hub.docker.com/repository/docker/lucadomenichini/smartiot-connector-consoleapp>
 
+## Run as a Windows Service
+
+The application [SmartIOT.Connector.ConsoleApp](./Apps/SmartIOT.Connector.ConsoleApp/README.md) supports being run as a WinService.
+All you need to do is install it and run.
+Follow [this guide](https://learn.microsoft.com/en-us/dotnet/core/extensions/windows-service?pivots=dotnet-8-0#create-the-windows-service) for further informations
+
 ## Nuget packages
 
 You can find SmartIOT.Connector packages on nuget.org site and on Visual Studio Package Manager:
@@ -133,7 +139,7 @@ I will do my best to keep the interfaces stable, but there are possibilities to
   - [X] Run SmartIOT.Connector as a console app
   - [X] Run SmartIOT.Connector as a Docker image
   - [ ] Run SmartIOT.Connector as a WPF app
-  - [ ] Run SmartIOT.Connector as a WinService
+  - [X] Run SmartIOT.Connector as a WinService
 - [ ] Testers: connector counterpart as WPF app
   - [ ] GRPC Client
   - [X] TCP client

From 7b640e5a6a628118662c7807d626a34239701fa0 Mon Sep 17 00:00:00 2001
From: Luca Domenichini <luca.domenic@gmail.com>
Date: Thu, 14 Dec 2023 11:01:49 +0100
Subject: [PATCH 3/3] CHG rename SmartIOT.Connector.ConsoleApp to
 SmartIOT.Connector.App

---
 .gitignore                                    |  2 +-
 .../.config/dotnet-tools.json                 |  0
 .../AppConfiguration.cs                       |  2 +-
 .../AspNetExtensions.cs                       | 12 ++--
 .../ConfigurationPersister.cs                 |  2 +-
 .../Dockerfile                                |  8 +--
 .../Program.cs                                |  2 +-
 .../Properties/launchSettings.json            |  2 +-
 .../README.md                                 | 12 ++--
 .../Runner.cs                                 |  2 +-
 .../SmartIOT.Connector.App.csproj}            |  0
 .../appsettings.json                          |  0
 .../smartiot-config.json                      |  0
 Core/SmartIOT.Connector.RestApi/README.md     |  2 +-
 README.md                                     | 15 ++---
 SmartIOT.Connector.ConsoleApp.sln             | 67 -------------------
 SmartIOT.Connector.sln                        | 20 +++---
 ...ild-consoleapp.bat => docker-build-app.bat |  6 +-
 ...push-consoleapp.bat => docker-push-app.bat |  2 +-
 docker-run-app.bat                            |  1 +
 docker-run-consoleapp.bat                     |  1 -
 dotnet-build-and-push.bat                     | 14 ++--
 22 files changed, 52 insertions(+), 120 deletions(-)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/.config/dotnet-tools.json (100%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/AppConfiguration.cs (86%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/AspNetExtensions.cs (57%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/ConfigurationPersister.cs (95%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/Dockerfile (57%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/Program.cs (98%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/Properties/launchSettings.json (95%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/README.md (87%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/Runner.cs (99%)
 rename Apps/{SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj => SmartIOT.Connector.App/SmartIOT.Connector.App.csproj} (100%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/appsettings.json (100%)
 rename Apps/{SmartIOT.Connector.ConsoleApp => SmartIOT.Connector.App}/smartiot-config.json (100%)
 delete mode 100644 SmartIOT.Connector.ConsoleApp.sln
 rename docker-build-consoleapp.bat => docker-build-app.bat (61%)
 rename docker-push-consoleapp.bat => docker-push-app.bat (71%)
 create mode 100644 docker-run-app.bat
 delete mode 100644 docker-run-consoleapp.bat

diff --git a/.gitignore b/.gitignore
index fd97acf..361293a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -348,4 +348,4 @@ MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
-/Apps/SmartIOT.Connector.ConsoleApp/log.txt
+/Apps/SmartIOT.Connector.App/log.txt
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/.config/dotnet-tools.json b/Apps/SmartIOT.Connector.App/.config/dotnet-tools.json
similarity index 100%
rename from Apps/SmartIOT.Connector.ConsoleApp/.config/dotnet-tools.json
rename to Apps/SmartIOT.Connector.App/.config/dotnet-tools.json
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/AppConfiguration.cs b/Apps/SmartIOT.Connector.App/AppConfiguration.cs
similarity index 86%
rename from Apps/SmartIOT.Connector.ConsoleApp/AppConfiguration.cs
rename to Apps/SmartIOT.Connector.App/AppConfiguration.cs
index 205e79a..1f00f38 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/AppConfiguration.cs
+++ b/Apps/SmartIOT.Connector.App/AppConfiguration.cs
@@ -1,7 +1,7 @@
 using SmartIOT.Connector.Core;
 using SmartIOT.Connector.Prometheus;
 
-namespace SmartIOT.Connector.ConsoleApp;
+namespace SmartIOT.Connector.App;
 
 public class AppConfiguration
 {
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/AspNetExtensions.cs b/Apps/SmartIOT.Connector.App/AspNetExtensions.cs
similarity index 57%
rename from Apps/SmartIOT.Connector.ConsoleApp/AspNetExtensions.cs
rename to Apps/SmartIOT.Connector.App/AspNetExtensions.cs
index 3f16e92..c9c8ce4 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/AspNetExtensions.cs
+++ b/Apps/SmartIOT.Connector.App/AspNetExtensions.cs
@@ -1,23 +1,23 @@
 using SmartIOT.Connector.Core;
 using SmartIOT.Connector.Core.Factory;
 
-namespace SmartIOT.Connector.ConsoleApp;
+namespace SmartIOT.Connector.App;
 
 public static class AspNetExtensions
 {
     public static IServiceCollection AddSmartIotConnectorRunner(this IServiceCollection services, AppConfiguration configuration)
     {
         // Add SmartIOT.Connector services to the container.
-        services.AddSingleton<AppConfiguration>(configuration);
-        services.AddSingleton<SmartIotConnector>(s => s.GetRequiredService<Runner>().SmartIotConnector);
+        services.AddSingleton(configuration);
+        services.AddSingleton(s => s.GetRequiredService<Runner>().SmartIotConnector);
         services.AddSingleton<IConnectorFactory>(s => s.GetRequiredService<Runner>().ConnectorFactory);
         services.AddSingleton<IDeviceDriverFactory>(s => s.GetRequiredService<Runner>().DeviceDriverFactory);
-        services.AddSingleton<ISchedulerFactory>(s => s.GetRequiredService<Runner>().SchedulerFactory);
-        services.AddSingleton<ITimeService>(s => s.GetRequiredService<Runner>().TimeService);
+        services.AddSingleton(s => s.GetRequiredService<Runner>().SchedulerFactory);
+        services.AddSingleton(s => s.GetRequiredService<Runner>().TimeService);
 
         // add custom Runner as a singleton and as a hosted service
         services.AddSingleton<Runner>();
-        services.AddHostedService<Runner>(sp => sp.GetRequiredService<Runner>());
+        services.AddHostedService(sp => sp.GetRequiredService<Runner>());
 
         return services;
     }
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/ConfigurationPersister.cs b/Apps/SmartIOT.Connector.App/ConfigurationPersister.cs
similarity index 95%
rename from Apps/SmartIOT.Connector.ConsoleApp/ConfigurationPersister.cs
rename to Apps/SmartIOT.Connector.App/ConfigurationPersister.cs
index b1207fe..1af82f1 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/ConfigurationPersister.cs
+++ b/Apps/SmartIOT.Connector.App/ConfigurationPersister.cs
@@ -2,7 +2,7 @@
 using SmartIOT.Connector.RestApi.Services;
 using System.Text.Json;
 
-namespace SmartIOT.Connector.ConsoleApp;
+namespace SmartIOT.Connector.App;
 
 internal class ConfigurationPersister : IConfigurationPersister
 {
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/Dockerfile b/Apps/SmartIOT.Connector.App/Dockerfile
similarity index 57%
rename from Apps/SmartIOT.Connector.ConsoleApp/Dockerfile
rename to Apps/SmartIOT.Connector.App/Dockerfile
index 706df3c..96c7033 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/Dockerfile
+++ b/Apps/SmartIOT.Connector.App/Dockerfile
@@ -7,14 +7,14 @@ ARG version
 # Copy everything
 COPY . ./
 # Restore as distinct layers
-RUN dotnet restore SmartIOT.Connector.ConsoleApp.sln
+RUN dotnet restore SmartIOT.Connector.App.sln
 
-RUN dotnet build --no-restore -c Release SmartIOT.Connector.ConsoleApp.sln
+RUN dotnet build --no-restore -c Release SmartIOT.Connector.App.sln
 
-RUN dotnet publish -c Release -o out /p:version=$version SmartIOT.Connector.ConsoleApp.sln
+RUN dotnet publish -c Release -o out /p:version=$version SmartIOT.Connector.App.sln
 
 # Build runtime image
 FROM mcr.microsoft.com/dotnet/aspnet:6.0
 WORKDIR /app
 COPY --from=build-env /build/out .
-ENTRYPOINT ["dotnet", "SmartIOT.Connector.ConsoleApp.dll", "/SmartIOT.Connector/smartiot-config.json"]
+ENTRYPOINT ["dotnet", "SmartIOT.Connector.App.dll", "/SmartIOT.Connector/smartiot-config.json"]
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/Program.cs b/Apps/SmartIOT.Connector.App/Program.cs
similarity index 98%
rename from Apps/SmartIOT.Connector.ConsoleApp/Program.cs
rename to Apps/SmartIOT.Connector.App/Program.cs
index 20f34ab..5d4f279 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/Program.cs
+++ b/Apps/SmartIOT.Connector.App/Program.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Text.Json;
 
-namespace SmartIOT.Connector.ConsoleApp;
+namespace SmartIOT.Connector.App;
 
 public class Program
 {
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/Properties/launchSettings.json b/Apps/SmartIOT.Connector.App/Properties/launchSettings.json
similarity index 95%
rename from Apps/SmartIOT.Connector.ConsoleApp/Properties/launchSettings.json
rename to Apps/SmartIOT.Connector.App/Properties/launchSettings.json
index c47edc4..3a1dc5a 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/Properties/launchSettings.json
+++ b/Apps/SmartIOT.Connector.App/Properties/launchSettings.json
@@ -9,7 +9,7 @@
     }
   },
   "profiles": {
-    "SmartIOT.Connector.ConsoleApp": {
+    "SmartIOT.Connector.App": {
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "swagger",
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/README.md b/Apps/SmartIOT.Connector.App/README.md
similarity index 87%
rename from Apps/SmartIOT.Connector.ConsoleApp/README.md
rename to Apps/SmartIOT.Connector.App/README.md
index f5a2c5d..2d96a42 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/README.md
+++ b/Apps/SmartIOT.Connector.App/README.md
@@ -1,4 +1,4 @@
-# SmartIOT.Connector.ConsoleApp
+# SmartIOT.Connector.App
 
 This project implements a simple SmartIOT.Connector runner able to run a SmartIOT.Connector instance as a console application.
 
@@ -11,15 +11,15 @@ The sample configuration will log to the console and to daily rolling file <code
 The Console runner can also be run on Docker. You just need to map a volume pointing the configuration folder <code>/SmartIOT.Connector</code> and expose the ports needed for external communications.<br>
 The container image will look for configuration file at <code>/SmartIOT.Connector/smartiot-config.json</code>
 
-A prebuilt Docker image is also available on Docker Hub. Use the following command to pull the latest image, or browse https://hub.docker.com/repository/docker/lucadomenichini/smartiot-connector-consoleapp for available tags.
+A prebuilt Docker image is also available on Docker Hub. Use the following command to pull the latest image, or browse https://hub.docker.com/repository/docker/lucadomenichini/smartiot-connector-app for available tags.
 
-<pre>docker pull lucadomenichini/smartiot-connector-consoleapp:latest</pre>
+<pre>docker pull lucadomenichini/smartiot-connector-app:latest</pre>
 
 ### Building the Docker image from source
 
 Provided you installed docker on your machine, go to SmartIOT.Connector root project folder and type:
 
-<pre>docker build -t smartiot-connector -f Apps/SmartIOT.Connector.ConsoleApp/Dockerfile .</pre>
+<pre>docker build -t smartiot-connector -f Apps/SmartIOT.Connector.App/Dockerfile .</pre>
 
 ### Running the container
 
@@ -32,6 +32,6 @@ Type this to run the container and expose ports on the host machine:
 docker run -it --rm -v /path/to/smartiot-connector/configuration/folder:/SmartIOT.Connector -p 9001:9001 -p 1883:1883 smartiot-connector
 </pre>
 
-Suppose you have downloaded the solution on Windows on folder C:\develop\SmartIOT.Connector. You will have an <code>smartiot-config.json</code> file under the <code>SmartIOT.Connector.ConsoleApp</code> project folder.<br>
+Suppose you have downloaded the solution on Windows on folder C:\develop\SmartIOT.Connector. You will have an <code>smartiot-config.json</code> file under the <code>SmartIOT.Connector.App</code> project folder.<br>
 Type this to use that configuration file:<pre>
-docker run -it --rm -v C:\develop\SmartIOT.Connector\Apps\SmartIOT.Connector.ConsoleApp:/SmartIOT.Connector -p 9001:9001 -p 1883:1883 smartiot-connector</pre>
+docker run -it --rm -v C:\develop\SmartIOT.Connector\Apps\SmartIOT.Connector.App:/SmartIOT.Connector -p 9001:9001 -p 1883:1883 smartiot-connector</pre>
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/Runner.cs b/Apps/SmartIOT.Connector.App/Runner.cs
similarity index 99%
rename from Apps/SmartIOT.Connector.ConsoleApp/Runner.cs
rename to Apps/SmartIOT.Connector.App/Runner.cs
index c8572d3..a314a19 100644
--- a/Apps/SmartIOT.Connector.ConsoleApp/Runner.cs
+++ b/Apps/SmartIOT.Connector.App/Runner.cs
@@ -2,7 +2,7 @@
 using SmartIOT.Connector.Core.Factory;
 using SmartIOT.Connector.Prometheus;
 
-namespace SmartIOT.Connector.ConsoleApp;
+namespace SmartIOT.Connector.App;
 
 public class Runner : IHostedService
 {
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj b/Apps/SmartIOT.Connector.App/SmartIOT.Connector.App.csproj
similarity index 100%
rename from Apps/SmartIOT.Connector.ConsoleApp/SmartIOT.Connector.ConsoleApp.csproj
rename to Apps/SmartIOT.Connector.App/SmartIOT.Connector.App.csproj
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/appsettings.json b/Apps/SmartIOT.Connector.App/appsettings.json
similarity index 100%
rename from Apps/SmartIOT.Connector.ConsoleApp/appsettings.json
rename to Apps/SmartIOT.Connector.App/appsettings.json
diff --git a/Apps/SmartIOT.Connector.ConsoleApp/smartiot-config.json b/Apps/SmartIOT.Connector.App/smartiot-config.json
similarity index 100%
rename from Apps/SmartIOT.Connector.ConsoleApp/smartiot-config.json
rename to Apps/SmartIOT.Connector.App/smartiot-config.json
diff --git a/Core/SmartIOT.Connector.RestApi/README.md b/Core/SmartIOT.Connector.RestApi/README.md
index c131aa1..7244a4c 100644
--- a/Core/SmartIOT.Connector.RestApi/README.md
+++ b/Core/SmartIOT.Connector.RestApi/README.md
@@ -13,7 +13,7 @@ To plug the controllers you just need to call an extension method to your AspNet
 	builder.Services.AddSmartIotConnectorRestApi(new ConfigurationPersister(configuration, path));
 ```
 
-See project [SmartIOT.Connector.ConsoleApp](../../Apps/SmartIOT.Connector.ConsoleApp/README.md) to see how that's done in details.
+See project [SmartIOT.Connector.App](../../Apps/SmartIOT.Connector.App/README.md) to see how that's done in details.
 
 You can then use the Swagger API page to test your API calls:
 
diff --git a/README.md b/README.md
index c73c685..ff720a4 100644
--- a/README.md
+++ b/README.md
@@ -96,15 +96,15 @@ smartiot.Stop();
 - [REST API guide](./Core/SmartIOT.Connector.RestApi/README.md)
 - [Customization guide](./Docs/Customize.md)
 
-## SmartIOT.Connector.ConsoleApp and Docker integration
+## SmartIOT.Connector.App and Docker integration
 
-If you want to run SmartIOT.Connector as a standalone application or as a Docker container, see project [SmartIOT.Connector.ConsoleApp](./Apps/SmartIOT.Connector.ConsoleApp/README.md) for further details.
+If you want to run SmartIOT.Connector as a standalone application or as a Docker container, see project [SmartIOT.Connector.App](./Apps/SmartIOT.Connector.App/README.md) for further details.
 
-Here is a quick link to the Docker image repository: <https://hub.docker.com/repository/docker/lucadomenichini/smartiot-connector-consoleapp>
+Here is a quick link to the Docker image repository: <https://hub.docker.com/repository/docker/lucadomenichini/smartiot-connector-app>
 
 ## Run as a Windows Service
 
-The application [SmartIOT.Connector.ConsoleApp](./Apps/SmartIOT.Connector.ConsoleApp/README.md) supports being run as a WinService.
+The application [SmartIOT.Connector.App](./Apps/SmartIOT.Connector.App/README.md) supports being run as a WinService.
 All you need to do is install it and run.
 Follow [this guide](https://learn.microsoft.com/en-us/dotnet/core/extensions/windows-service?pivots=dotnet-8-0#create-the-windows-service) for further informations
 
@@ -132,13 +132,12 @@ I will do my best to keep the interfaces stable, but there are possibilities to
 - [ ] GRPC Server Connector
 - [X] TCP Server Connector
 - [X] TCP Client Connector
-- [ ] Web app with monitoring capabilities (included in default ConsoleApp project)
+- [ ] Web app with monitoring capabilities (included in default App project)
 - [X] Nuget packages on nuget.org - <https://www.nuget.org/packages?q=SmartIOT.Connector>
-- [X] Docker runner image on dockerhub - <https://hub.docker.com/repository/docker/lucadomenichini/smartiot-connector-consoleapp>
-- [ ] Apps
+- [X] Docker runner image on dockerhub - <https://hub.docker.com/repository/docker/lucadomenichini/smartiot-connector-app>
+- [X] Apps
   - [X] Run SmartIOT.Connector as a console app
   - [X] Run SmartIOT.Connector as a Docker image
-  - [ ] Run SmartIOT.Connector as a WPF app
   - [X] Run SmartIOT.Connector as a WinService
 - [ ] Testers: connector counterpart as WPF app
   - [ ] GRPC Client
diff --git a/SmartIOT.Connector.ConsoleApp.sln b/SmartIOT.Connector.ConsoleApp.sln
deleted file mode 100644
index cf93bd1..0000000
--- a/SmartIOT.Connector.ConsoleApp.sln
+++ /dev/null
@@ -1,67 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32421.90
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00225731-BE18-495B-9FDA-DEC2D79868B1}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Core", "Core\SmartIOT.Connector.Core\SmartIOT.Connector.Core.csproj", "{67692621-B9D3-4A00-9BE9-E33E52D34023}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Messages", "Core\SmartIOT.Connector.Messages\SmartIOT.Connector.Messages.csproj", "{99D8C382-530F-4303-83E3-91FD101B2CD1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Prometheus", "Core\SmartIOT.Connector.Prometheus\SmartIOT.Connector.Prometheus.csproj", "{AF349F89-07B6-4C40-812F-638AFB0B9FB1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Mqtt", "Connectors\SmartIOT.Connector.Mqtt\SmartIOT.Connector.Mqtt.csproj", "{CFF12774-4E60-4986-9727-F43506CE6463}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Plc.S7Net", "Devices\SmartIOT.Connector.Plc.S7Net\SmartIOT.Connector.Plc.S7Net.csproj", "{871384BC-0F85-4C9A-A734-376CEC54BE00}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Plc.Snap7", "Devices\SmartIOT.Connector.Plc.Snap7\SmartIOT.Connector.Plc.Snap7.csproj", "{4F1C83CF-6500-4480-8075-26F3CD5CA10E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.ConsoleApp", "Apps\SmartIOT.Connector.ConsoleApp\SmartIOT.Connector.ConsoleApp.csproj", "{4B85DB85-E09C-4AB6-BF85-3E23A8414973}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{67692621-B9D3-4A00-9BE9-E33E52D34023}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{67692621-B9D3-4A00-9BE9-E33E52D34023}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67692621-B9D3-4A00-9BE9-E33E52D34023}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{67692621-B9D3-4A00-9BE9-E33E52D34023}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99D8C382-530F-4303-83E3-91FD101B2CD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99D8C382-530F-4303-83E3-91FD101B2CD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99D8C382-530F-4303-83E3-91FD101B2CD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99D8C382-530F-4303-83E3-91FD101B2CD1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF349F89-07B6-4C40-812F-638AFB0B9FB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF349F89-07B6-4C40-812F-638AFB0B9FB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF349F89-07B6-4C40-812F-638AFB0B9FB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF349F89-07B6-4C40-812F-638AFB0B9FB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFF12774-4E60-4986-9727-F43506CE6463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFF12774-4E60-4986-9727-F43506CE6463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFF12774-4E60-4986-9727-F43506CE6463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFF12774-4E60-4986-9727-F43506CE6463}.Release|Any CPU.Build.0 = Release|Any CPU
-		{871384BC-0F85-4C9A-A734-376CEC54BE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{871384BC-0F85-4C9A-A734-376CEC54BE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{871384BC-0F85-4C9A-A734-376CEC54BE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{871384BC-0F85-4C9A-A734-376CEC54BE00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F1C83CF-6500-4480-8075-26F3CD5CA10E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F1C83CF-6500-4480-8075-26F3CD5CA10E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F1C83CF-6500-4480-8075-26F3CD5CA10E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F1C83CF-6500-4480-8075-26F3CD5CA10E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B85DB85-E09C-4AB6-BF85-3E23A8414973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B85DB85-E09C-4AB6-BF85-3E23A8414973}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B85DB85-E09C-4AB6-BF85-3E23A8414973}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B85DB85-E09C-4AB6-BF85-3E23A8414973}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {72862639-80E2-4903-910B-7FC4EC818672}
-	EndGlobalSection
-EndGlobal
diff --git a/SmartIOT.Connector.sln b/SmartIOT.Connector.sln
index a6c0683..4b84305 100644
--- a/SmartIOT.Connector.sln
+++ b/SmartIOT.Connector.sln
@@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.dockerignore = .dockerignore
 		.editorconfig = .editorconfig
-		docker-build-consoleapp.bat = docker-build-consoleapp.bat
-		docker-push-consoleapp.bat = docker-push-consoleapp.bat
-		docker-run-consoleapp.bat = docker-run-consoleapp.bat
+		docker-build-app.bat = docker-build-app.bat
+		docker-push-app.bat = docker-push-app.bat
+		docker-run-app.bat = docker-run-app.bat
 		dotnet-build-and-push.bat = dotnet-build-and-push.bat
 		.github\workflows\dotnet-develop.yml = .github\workflows\dotnet-develop.yml
 		.github\workflows\dotnet-master.yml = .github\workflows\dotnet-master.yml
@@ -55,8 +55,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.TcpServe
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{56D33DD2-28C6-45C5-B994-54FA4D8055F5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.ConsoleApp", "Apps\SmartIOT.Connector.ConsoleApp\SmartIOT.Connector.ConsoleApp.csproj", "{B6B46E61-F57A-4843-BEF6-180C82382E15}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Mocks", "Tests\SmartIOT.Connector.Mocks\SmartIOT.Connector.Mocks.csproj", "{442D217B-E924-4A67-BE4F-FE68D8471C11}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.RestApi", "Core\SmartIOT.Connector.RestApi\SmartIOT.Connector.RestApi.csproj", "{E39654FA-5AA3-4C69-94B8-0BEF1272349C}"
@@ -65,6 +63,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.RestApi.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.Plc.SnapModBus", "Devices\SmartIOT.Connector.Plc.SnapModBus\SmartIOT.Connector.Plc.SnapModBus.csproj", "{BA4F5CF9-A2F9-4CA4-BAE1-27AEF1EC2800}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SmartIOT.Connector.App", "Apps\SmartIOT.Connector.App\SmartIOT.Connector.App.csproj", "{2943C3E6-C95D-4D9F-A3DE-FCA2B6AB3349}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -131,10 +131,6 @@ Global
 		{AEA92EE6-91CC-4D88-AF51-2B5A2714B328}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AEA92EE6-91CC-4D88-AF51-2B5A2714B328}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AEA92EE6-91CC-4D88-AF51-2B5A2714B328}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6B46E61-F57A-4843-BEF6-180C82382E15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6B46E61-F57A-4843-BEF6-180C82382E15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6B46E61-F57A-4843-BEF6-180C82382E15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6B46E61-F57A-4843-BEF6-180C82382E15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{442D217B-E924-4A67-BE4F-FE68D8471C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{442D217B-E924-4A67-BE4F-FE68D8471C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{442D217B-E924-4A67-BE4F-FE68D8471C11}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -151,6 +147,10 @@ Global
 		{BA4F5CF9-A2F9-4CA4-BAE1-27AEF1EC2800}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BA4F5CF9-A2F9-4CA4-BAE1-27AEF1EC2800}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA4F5CF9-A2F9-4CA4-BAE1-27AEF1EC2800}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2943C3E6-C95D-4D9F-A3DE-FCA2B6AB3349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2943C3E6-C95D-4D9F-A3DE-FCA2B6AB3349}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2943C3E6-C95D-4D9F-A3DE-FCA2B6AB3349}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2943C3E6-C95D-4D9F-A3DE-FCA2B6AB3349}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -164,9 +164,9 @@ Global
 		{58E07F42-929C-40B0-A61B-C9AC8B88855C} = {E8D19B9A-719C-4FCF-931B-2492F32063D4}
 		{57778892-A6E7-410D-86C8-5CF061F40DF6} = {805C2ECD-B0EB-4021-B040-DB1C487D132A}
 		{AEA92EE6-91CC-4D88-AF51-2B5A2714B328} = {805C2ECD-B0EB-4021-B040-DB1C487D132A}
-		{B6B46E61-F57A-4843-BEF6-180C82382E15} = {56D33DD2-28C6-45C5-B994-54FA4D8055F5}
 		{442D217B-E924-4A67-BE4F-FE68D8471C11} = {E8D19B9A-719C-4FCF-931B-2492F32063D4}
 		{4EC87D61-7FC7-413A-9B35-7D15AAB2308F} = {E8D19B9A-719C-4FCF-931B-2492F32063D4}
+		{2943C3E6-C95D-4D9F-A3DE-FCA2B6AB3349} = {56D33DD2-28C6-45C5-B994-54FA4D8055F5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {72862639-80E2-4903-910B-7FC4EC818672}
diff --git a/docker-build-consoleapp.bat b/docker-build-app.bat
similarity index 61%
rename from docker-build-consoleapp.bat
rename to docker-build-app.bat
index 727d5e3..69cfc9d 100644
--- a/docker-build-consoleapp.bat
+++ b/docker-build-app.bat
@@ -1,10 +1,10 @@
 echo off
 
-set LOCAL_IMAGE=smartiot-connector-consoleapp
-set REMOTE_IMAGE=lucadomenichini/smartiot-connector-consoleapp
+set LOCAL_IMAGE=smartiot-connector-app
+set REMOTE_IMAGE=lucadomenichini/smartiot-connector-app
 set /P TAG_NAME="Enter the tag name to assign to image %REMOTE_IMAGE%: "
 
-docker build --build-arg version=%TAG_NAME% -t %LOCAL_IMAGE%:latest -f Apps/SmartIOT.Connector.ConsoleApp/Dockerfile .
+docker build --build-arg version=%TAG_NAME% -t %LOCAL_IMAGE%:latest -f Apps/SmartIOT.Connector.App/Dockerfile .
 
 docker tag %LOCAL_IMAGE%:latest %REMOTE_IMAGE%:latest
 docker tag %LOCAL_IMAGE%:latest %REMOTE_IMAGE%:%TAG_NAME%
diff --git a/docker-push-consoleapp.bat b/docker-push-app.bat
similarity index 71%
rename from docker-push-consoleapp.bat
rename to docker-push-app.bat
index 6ca6d94..cb20464 100644
--- a/docker-push-consoleapp.bat
+++ b/docker-push-app.bat
@@ -1,6 +1,6 @@
 echo off
 
-set REMOTE_IMAGE=lucadomenichini/smartiot-connector-consoleapp
+set REMOTE_IMAGE=lucadomenichini/smartiot-connector-app
 set /P TAG_NAME="Enter the tag name to push for image %REMOTE_IMAGE%: "
 
 docker push %REMOTE_IMAGE%:%TAG_NAME%
diff --git a/docker-run-app.bat b/docker-run-app.bat
new file mode 100644
index 0000000..4f8f887
--- /dev/null
+++ b/docker-run-app.bat
@@ -0,0 +1 @@
+docker run -it --rm -v C:\develop\SmartIOT.Connector\Apps\SmartIOT.Connector.App:/SmartIOT.Connector -p 1883:1883 smartiot-connector-app:latest
diff --git a/docker-run-consoleapp.bat b/docker-run-consoleapp.bat
deleted file mode 100644
index ec00b17..0000000
--- a/docker-run-consoleapp.bat
+++ /dev/null
@@ -1 +0,0 @@
-docker run -it --rm -v C:\develop\SmartIOT.Connector\Apps\SmartIOT.Connector.ConsoleApp:/SmartIOT.Connector -p 1883:1883 smartiot-connector-consoleapp:latest
diff --git a/dotnet-build-and-push.bat b/dotnet-build-and-push.bat
index 3d811de..4e36b5e 100644
--- a/dotnet-build-and-push.bat
+++ b/dotnet-build-and-push.bat
@@ -10,7 +10,7 @@ set /P PUSH_NUGET_PACKAGES="Do you want to push the nuget packages to nuget.org?
 if /I "%PUSH_NUGET_PACKAGES%"=="y" (
     set /P API_KEY="Enter to API Key to use to push the packages: "
 )
-set /P PUSH_DOCKER_IMAGE="Do you want to build and publish the SmartIOT.Connector.ConsoleApp Docker Image? [y|n]: "
+set /P PUSH_DOCKER_IMAGE="Do you want to build and publish the SmartIOT.Connector.App Docker Image? [y|n]: "
 
 set VERSION=%VERSION_PREFIX%%VERSION_SUFFIX%
 
@@ -67,19 +67,19 @@ if /I "%PUSH_NUGET_PACKAGES%" == "y" (
     nuget push -Source nuget.org Core\SmartIOT.Connector.Prometheus\bin\%RELEASE%\SmartIOT.Connector.Prometheus.%VERSION%.nupkg %API_KEY%
     nuget push -Source nuget.org Devices\SmartIOT.Connector.Plc.S7Net\bin\%RELEASE%\SmartIOT.Connector.Plc.S7Net.%VERSION%.nupkg %API_KEY%
     nuget push -Source nuget.org Devices\SmartIOT.Connector.Plc.Snap7\bin\%RELEASE%\SmartIOT.Connector.Plc.Snap7.%VERSION%.nupkg %API_KEY%
-    nuget push -Source nuget.org Apps\SmartIOT.Connector.ConsoleApp\bin\%RELEASE%\SmartIOT.Connector.ConsoleApp.%VERSION%.nupkg %API_KEY%
+    nuget push -Source nuget.org Apps\SmartIOT.Connector.App\bin\%RELEASE%\SmartIOT.Connector.App.%VERSION%.nupkg %API_KEY%
 )
 
 if /I "%PUSH_DOCKER_IMAGE%" == "y" (
 
     echo -------------------------------------------------------
-    echo Building SmartIOT.Connector.ConsoleApp Docker Image
+    echo Building SmartIOT.Connector.App Docker Image
     echo -------------------------------------------------------
 
-    set LOCAL_IMAGE=smartiot-connector-consoleapp
-    set REMOTE_IMAGE=lucadomenichini/smartiot-connector-consoleapp
+    set LOCAL_IMAGE=smartiot-connector-app
+    set REMOTE_IMAGE=lucadomenichini/smartiot-connector-app
 
-    docker build -t %LOCAL_IMAGE%:latest -f Apps/SmartIOT.Connector.ConsoleApp/Dockerfile .
+    docker build -t %LOCAL_IMAGE%:latest -f Apps/SmartIOT.Connector.App/Dockerfile .
     if errorlevel 1 (
         echo Error building Docker Image: %errorlevel%
         exit /b %errorlevel%
@@ -90,7 +90,7 @@ if /I "%PUSH_DOCKER_IMAGE%" == "y" (
 
 
     echo ------------------------------------------------------
-    echo Pushing SmartIOT.Connector.ConsoleApp Docker Image
+    echo Pushing SmartIOT.Connector.App Docker Image
     echo ------------------------------------------------------
 
     docker push %REMOTE_IMAGE%:%VERSION%