diff --git a/csharp/app/Backend/Backend.csproj b/csharp/App/Backend/Backend.csproj
similarity index 93%
rename from csharp/app/Backend/Backend.csproj
rename to csharp/App/Backend/Backend.csproj
index eebe0dae8..6be32dee4 100644
--- a/csharp/app/Backend/Backend.csproj
+++ b/csharp/App/Backend/Backend.csproj
@@ -1,5 +1,5 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/csharp/app/Backend/Controllers/Controller.cs b/csharp/App/Backend/Controllers/Controller.cs
similarity index 100%
rename from csharp/app/Backend/Controllers/Controller.cs
rename to csharp/App/Backend/Controllers/Controller.cs
diff --git a/csharp/app/Backend/Controllers/Credentials.cs b/csharp/App/Backend/Controllers/Credentials.cs
similarity index 100%
rename from csharp/app/Backend/Controllers/Credentials.cs
rename to csharp/App/Backend/Controllers/Credentials.cs
diff --git a/csharp/app/Backend/Controllers/ReturnsAttribute.cs b/csharp/App/Backend/Controllers/ReturnsAttribute.cs
similarity index 100%
rename from csharp/app/Backend/Controllers/ReturnsAttribute.cs
rename to csharp/App/Backend/Controllers/ReturnsAttribute.cs
diff --git a/csharp/app/Backend/Database/Db.cs b/csharp/App/Backend/Database/Db.cs
similarity index 100%
rename from csharp/app/Backend/Database/Db.cs
rename to csharp/App/Backend/Database/Db.cs
diff --git a/csharp/app/Backend/Database/Fake.cs b/csharp/App/Backend/Database/Fake.cs
similarity index 100%
rename from csharp/app/Backend/Database/Fake.cs
rename to csharp/App/Backend/Database/Fake.cs
diff --git a/csharp/app/Backend/Database/Folder.cs b/csharp/App/Backend/Database/Folder.cs
similarity index 100%
rename from csharp/app/Backend/Database/Folder.cs
rename to csharp/App/Backend/Database/Folder.cs
diff --git a/csharp/app/Backend/Database/Installation.cs b/csharp/App/Backend/Database/Installation.cs
similarity index 100%
rename from csharp/app/Backend/Database/Installation.cs
rename to csharp/App/Backend/Database/Installation.cs
diff --git a/csharp/app/Backend/Database/User.cs b/csharp/App/Backend/Database/User.cs
similarity index 100%
rename from csharp/app/Backend/Database/User.cs
rename to csharp/App/Backend/Database/User.cs
diff --git a/csharp/app/Backend/Database/User2Folder.cs b/csharp/App/Backend/Database/User2Folder.cs
similarity index 100%
rename from csharp/app/Backend/Database/User2Folder.cs
rename to csharp/App/Backend/Database/User2Folder.cs
diff --git a/csharp/app/Backend/Database/User2Installation.cs b/csharp/App/Backend/Database/User2Installation.cs
similarity index 100%
rename from csharp/app/Backend/Database/User2Installation.cs
rename to csharp/App/Backend/Database/User2Installation.cs
diff --git a/csharp/app/Backend/FakeFolders.csv b/csharp/App/Backend/FakeFolders.csv
similarity index 100%
rename from csharp/app/Backend/FakeFolders.csv
rename to csharp/App/Backend/FakeFolders.csv
diff --git a/csharp/app/Backend/FakeInstallations.csv b/csharp/App/Backend/FakeInstallations.csv
similarity index 100%
rename from csharp/app/Backend/FakeInstallations.csv
rename to csharp/App/Backend/FakeInstallations.csv
diff --git a/csharp/app/Backend/FakePasswords.csv b/csharp/App/Backend/FakePasswords.csv
similarity index 100%
rename from csharp/app/Backend/FakePasswords.csv
rename to csharp/App/Backend/FakePasswords.csv
diff --git a/csharp/app/Backend/FakeUsers.csv b/csharp/App/Backend/FakeUsers.csv
similarity index 100%
rename from csharp/app/Backend/FakeUsers.csv
rename to csharp/App/Backend/FakeUsers.csv
diff --git a/csharp/app/Backend/HeaderFilter.cs b/csharp/App/Backend/HeaderFilter.cs
similarity index 100%
rename from csharp/app/Backend/HeaderFilter.cs
rename to csharp/App/Backend/HeaderFilter.cs
diff --git a/csharp/app/Backend/Model/Folder.cs b/csharp/App/Backend/Model/Folder.cs
similarity index 100%
rename from csharp/app/Backend/Model/Folder.cs
rename to csharp/App/Backend/Model/Folder.cs
diff --git a/csharp/app/Backend/Model/Installation.cs b/csharp/App/Backend/Model/Installation.cs
similarity index 100%
rename from csharp/app/Backend/Model/Installation.cs
rename to csharp/App/Backend/Model/Installation.cs
diff --git a/csharp/app/Backend/Model/Relations/Relation.cs b/csharp/App/Backend/Model/Relations/Relation.cs
similarity index 100%
rename from csharp/app/Backend/Model/Relations/Relation.cs
rename to csharp/App/Backend/Model/Relations/Relation.cs
diff --git a/csharp/app/Backend/Model/Relations/Session.cs b/csharp/App/Backend/Model/Relations/Session.cs
similarity index 100%
rename from csharp/app/Backend/Model/Relations/Session.cs
rename to csharp/App/Backend/Model/Relations/Session.cs
diff --git a/csharp/app/Backend/Model/Relations/User2Folder.cs b/csharp/App/Backend/Model/Relations/User2Folder.cs
similarity index 100%
rename from csharp/app/Backend/Model/Relations/User2Folder.cs
rename to csharp/App/Backend/Model/Relations/User2Folder.cs
diff --git a/csharp/app/Backend/Model/Relations/User2Installation.cs b/csharp/App/Backend/Model/Relations/User2Installation.cs
similarity index 100%
rename from csharp/app/Backend/Model/Relations/User2Installation.cs
rename to csharp/App/Backend/Model/Relations/User2Installation.cs
diff --git a/csharp/app/Backend/Model/TreeNode.Equality.cs b/csharp/App/Backend/Model/TreeNode.Equality.cs
similarity index 100%
rename from csharp/app/Backend/Model/TreeNode.Equality.cs
rename to csharp/App/Backend/Model/TreeNode.Equality.cs
diff --git a/csharp/app/Backend/Model/TreeNode.cs b/csharp/App/Backend/Model/TreeNode.cs
similarity index 100%
rename from csharp/app/Backend/Model/TreeNode.cs
rename to csharp/App/Backend/Model/TreeNode.cs
diff --git a/csharp/app/Backend/Model/User.cs b/csharp/App/Backend/Model/User.cs
similarity index 100%
rename from csharp/app/Backend/Model/User.cs
rename to csharp/App/Backend/Model/User.cs
diff --git a/csharp/app/Backend/Program.cs b/csharp/App/Backend/Program.cs
similarity index 100%
rename from csharp/app/Backend/Program.cs
rename to csharp/App/Backend/Program.cs
diff --git a/csharp/app/Backend/Properties/launchSettings.json b/csharp/App/Backend/Properties/launchSettings.json
similarity index 100%
rename from csharp/app/Backend/Properties/launchSettings.json
rename to csharp/App/Backend/Properties/launchSettings.json
diff --git a/csharp/app/Backend/Utils/Crypto.cs b/csharp/App/Backend/Utils/Crypto.cs
similarity index 100%
rename from csharp/app/Backend/Utils/Crypto.cs
rename to csharp/App/Backend/Utils/Crypto.cs
diff --git a/csharp/app/Backend/Utils/Result.cs b/csharp/App/Backend/Utils/Result.cs
similarity index 100%
rename from csharp/app/Backend/Utils/Result.cs
rename to csharp/App/Backend/Utils/Result.cs
diff --git a/csharp/App/Backend/db.sqlite b/csharp/App/Backend/db.sqlite
new file mode 100644
index 000000000..982a3ab91
Binary files /dev/null and b/csharp/App/Backend/db.sqlite differ
diff --git a/csharp/app/BmsTunnel/BatteryConnection.cs b/csharp/App/BmsTunnel/BatteryConnection.cs
similarity index 100%
rename from csharp/app/BmsTunnel/BatteryConnection.cs
rename to csharp/App/BmsTunnel/BatteryConnection.cs
diff --git a/csharp/app/BmsTunnel/BmsTunnel.cs b/csharp/App/BmsTunnel/BmsTunnel.cs
similarity index 100%
rename from csharp/app/BmsTunnel/BmsTunnel.cs
rename to csharp/App/BmsTunnel/BmsTunnel.cs
diff --git a/csharp/app/BmsTunnel/BmsTunnel.csproj b/csharp/App/BmsTunnel/BmsTunnel.csproj
similarity index 68%
rename from csharp/app/BmsTunnel/BmsTunnel.csproj
rename to csharp/App/BmsTunnel/BmsTunnel.csproj
index 9fe1fc75d..0466a4173 100644
--- a/csharp/app/BmsTunnel/BmsTunnel.csproj
+++ b/csharp/App/BmsTunnel/BmsTunnel.csproj
@@ -1,5 +1,5 @@
-
+
@@ -7,7 +7,7 @@
-
+
diff --git a/csharp/app/BmsTunnel/CliPrograms.cs b/csharp/App/BmsTunnel/CliPrograms.cs
similarity index 100%
rename from csharp/app/BmsTunnel/CliPrograms.cs
rename to csharp/App/BmsTunnel/CliPrograms.cs
diff --git a/csharp/app/BmsTunnel/Program.cs b/csharp/App/BmsTunnel/Program.cs
similarity index 100%
rename from csharp/app/BmsTunnel/Program.cs
rename to csharp/App/BmsTunnel/Program.cs
diff --git a/csharp/app/BmsTunnel/debug.sh b/csharp/App/BmsTunnel/debug.sh
similarity index 100%
rename from csharp/app/BmsTunnel/debug.sh
rename to csharp/App/BmsTunnel/debug.sh
diff --git a/csharp/app/BmsTunnel/parameters.txt b/csharp/App/BmsTunnel/parameters.txt
similarity index 100%
rename from csharp/app/BmsTunnel/parameters.txt
rename to csharp/App/BmsTunnel/parameters.txt
diff --git a/csharp/app/Collector/Collector.csproj b/csharp/App/Collector/Collector.csproj
similarity index 52%
rename from csharp/app/Collector/Collector.csproj
rename to csharp/App/Collector/Collector.csproj
index b2e28418b..27b560c8d 100644
--- a/csharp/app/Collector/Collector.csproj
+++ b/csharp/App/Collector/Collector.csproj
@@ -1,9 +1,9 @@
-
+
-
-
+
+
diff --git a/csharp/app/Collector/Collector.sln b/csharp/App/Collector/Collector.sln
similarity index 100%
rename from csharp/app/Collector/Collector.sln
rename to csharp/App/Collector/Collector.sln
diff --git a/csharp/app/Collector/src/BatteryDataParser.cs b/csharp/App/Collector/src/BatteryDataParser.cs
similarity index 100%
rename from csharp/app/Collector/src/BatteryDataParser.cs
rename to csharp/App/Collector/src/BatteryDataParser.cs
diff --git a/csharp/app/Collector/src/BatteryDataParserV4.cs b/csharp/App/Collector/src/BatteryDataParserV4.cs
similarity index 100%
rename from csharp/app/Collector/src/BatteryDataParserV4.cs
rename to csharp/App/Collector/src/BatteryDataParserV4.cs
diff --git a/csharp/app/Collector/src/Influx/FieldAttribute.cs b/csharp/App/Collector/src/Influx/FieldAttribute.cs
similarity index 100%
rename from csharp/app/Collector/src/Influx/FieldAttribute.cs
rename to csharp/App/Collector/src/Influx/FieldAttribute.cs
diff --git a/csharp/app/Collector/src/Influx/InfluxRecord.cs b/csharp/App/Collector/src/Influx/InfluxRecord.cs
similarity index 100%
rename from csharp/app/Collector/src/Influx/InfluxRecord.cs
rename to csharp/App/Collector/src/Influx/InfluxRecord.cs
diff --git a/csharp/app/Collector/src/Influx/LineProtocolSyntax.cs b/csharp/App/Collector/src/Influx/LineProtocolSyntax.cs
similarity index 100%
rename from csharp/app/Collector/src/Influx/LineProtocolSyntax.cs
rename to csharp/App/Collector/src/Influx/LineProtocolSyntax.cs
diff --git a/csharp/app/Collector/src/Influx/TagAttribute.cs b/csharp/App/Collector/src/Influx/TagAttribute.cs
similarity index 100%
rename from csharp/app/Collector/src/Influx/TagAttribute.cs
rename to csharp/App/Collector/src/Influx/TagAttribute.cs
diff --git a/csharp/app/Collector/src/Program.cs b/csharp/App/Collector/src/Program.cs
similarity index 100%
rename from csharp/app/Collector/src/Program.cs
rename to csharp/App/Collector/src/Program.cs
diff --git a/csharp/app/Collector/src/Records/Alarms.cs b/csharp/App/Collector/src/Records/Alarms.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/Alarms.cs
rename to csharp/App/Collector/src/Records/Alarms.cs
diff --git a/csharp/app/Collector/src/Records/BatteryRecord.cs b/csharp/App/Collector/src/Records/BatteryRecord.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/BatteryRecord.cs
rename to csharp/App/Collector/src/Records/BatteryRecord.cs
diff --git a/csharp/app/Collector/src/Records/BatteryStatus.cs b/csharp/App/Collector/src/Records/BatteryStatus.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/BatteryStatus.cs
rename to csharp/App/Collector/src/Records/BatteryStatus.cs
diff --git a/csharp/app/Collector/src/Records/Error.cs b/csharp/App/Collector/src/Records/Error.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/Error.cs
rename to csharp/App/Collector/src/Records/Error.cs
diff --git a/csharp/app/Collector/src/Records/InstallationStatus.cs b/csharp/App/Collector/src/Records/InstallationStatus.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/InstallationStatus.cs
rename to csharp/App/Collector/src/Records/InstallationStatus.cs
diff --git a/csharp/app/Collector/src/Records/IoStatus.cs b/csharp/App/Collector/src/Records/IoStatus.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/IoStatus.cs
rename to csharp/App/Collector/src/Records/IoStatus.cs
diff --git a/csharp/app/Collector/src/Records/Leds.cs b/csharp/App/Collector/src/Records/Leds.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/Leds.cs
rename to csharp/App/Collector/src/Records/Leds.cs
diff --git a/csharp/app/Collector/src/Records/Temperatures.cs b/csharp/App/Collector/src/Records/Temperatures.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/Temperatures.cs
rename to csharp/App/Collector/src/Records/Temperatures.cs
diff --git a/csharp/app/Collector/src/Records/Warnings.cs b/csharp/App/Collector/src/Records/Warnings.cs
similarity index 100%
rename from csharp/app/Collector/src/Records/Warnings.cs
rename to csharp/App/Collector/src/Records/Warnings.cs
diff --git a/csharp/app/Collector/src/Settings.cs b/csharp/App/Collector/src/Settings.cs
similarity index 100%
rename from csharp/app/Collector/src/Settings.cs
rename to csharp/App/Collector/src/Settings.cs
diff --git a/csharp/app/Collector/src/Utils/Extensions.cs b/csharp/App/Collector/src/Utils/Extensions.cs
similarity index 100%
rename from csharp/app/Collector/src/Utils/Extensions.cs
rename to csharp/App/Collector/src/Utils/Extensions.cs
diff --git a/csharp/app/Collector/src/Utils/Log.cs b/csharp/App/Collector/src/Utils/Log.cs
similarity index 100%
rename from csharp/app/Collector/src/Utils/Log.cs
rename to csharp/App/Collector/src/Utils/Log.cs
diff --git a/csharp/app/Collector/src/Utils/Property.cs b/csharp/App/Collector/src/Utils/Property.cs
similarity index 100%
rename from csharp/app/Collector/src/Utils/Property.cs
rename to csharp/App/Collector/src/Utils/Property.cs
diff --git a/csharp/app/Collector/src/Utils/ReadOnlyListExtensions.cs b/csharp/App/Collector/src/Utils/ReadOnlyListExtensions.cs
similarity index 100%
rename from csharp/app/Collector/src/Utils/ReadOnlyListExtensions.cs
rename to csharp/App/Collector/src/Utils/ReadOnlyListExtensions.cs
diff --git a/csharp/app/Collector/src/Utils/Utils.cs b/csharp/App/Collector/src/Utils/Utils.cs
similarity index 100%
rename from csharp/app/Collector/src/Utils/Utils.cs
rename to csharp/App/Collector/src/Utils/Utils.cs
diff --git a/csharp/app/EmuMeterDriver/Config.cs b/csharp/App/EmuMeterDriver/Config.cs
similarity index 100%
rename from csharp/app/EmuMeterDriver/Config.cs
rename to csharp/App/EmuMeterDriver/Config.cs
diff --git a/csharp/app/EmuMeterDriver/EmuMeterDriver.cs b/csharp/App/EmuMeterDriver/EmuMeterDriver.cs
similarity index 100%
rename from csharp/app/EmuMeterDriver/EmuMeterDriver.cs
rename to csharp/App/EmuMeterDriver/EmuMeterDriver.cs
diff --git a/csharp/App/EmuMeterDriver/EmuMeterDriver.csproj b/csharp/App/EmuMeterDriver/EmuMeterDriver.csproj
new file mode 100644
index 000000000..b2f8696ed
--- /dev/null
+++ b/csharp/App/EmuMeterDriver/EmuMeterDriver.csproj
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/csharp/app/EmuMeterDriver/Nic.cs b/csharp/App/EmuMeterDriver/Nic.cs
similarity index 100%
rename from csharp/app/EmuMeterDriver/Nic.cs
rename to csharp/App/EmuMeterDriver/Nic.cs
diff --git a/csharp/app/EmuMeterDriver/Program.cs b/csharp/App/EmuMeterDriver/Program.cs
similarity index 100%
rename from csharp/app/EmuMeterDriver/Program.cs
rename to csharp/App/EmuMeterDriver/Program.cs
diff --git a/csharp/app/EmuMeterDriver/Signal.cs b/csharp/App/EmuMeterDriver/Signal.cs
similarity index 100%
rename from csharp/app/EmuMeterDriver/Signal.cs
rename to csharp/App/EmuMeterDriver/Signal.cs
diff --git a/csharp/app/EmuMeterDriver/Utils.cs b/csharp/App/EmuMeterDriver/Utils.cs
similarity index 100%
rename from csharp/app/EmuMeterDriver/Utils.cs
rename to csharp/App/EmuMeterDriver/Utils.cs
diff --git a/csharp/app/EmuMeterDriver/debug.sh b/csharp/App/EmuMeterDriver/debug.sh
similarity index 100%
rename from csharp/app/EmuMeterDriver/debug.sh
rename to csharp/App/EmuMeterDriver/debug.sh
diff --git a/csharp/app/EmuMeterDriver/service/log/run b/csharp/App/EmuMeterDriver/service/log/run
similarity index 100%
rename from csharp/app/EmuMeterDriver/service/log/run
rename to csharp/App/EmuMeterDriver/service/log/run
diff --git a/csharp/app/EmuMeterDriver/service/run b/csharp/App/EmuMeterDriver/service/run
similarity index 100%
rename from csharp/app/EmuMeterDriver/service/run
rename to csharp/App/EmuMeterDriver/service/run
diff --git a/csharp/app/InnovEnergy.app.props b/csharp/App/InnovEnergy.App.props
similarity index 100%
rename from csharp/app/InnovEnergy.app.props
rename to csharp/App/InnovEnergy.App.props
diff --git a/csharp/app/OpenVpnCertificatesServer/Files.cs b/csharp/App/OpenVpnCertificatesServer/Files.cs
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/Files.cs
rename to csharp/App/OpenVpnCertificatesServer/Files.cs
diff --git a/csharp/app/OpenVpnCertificatesServer/Http.cs b/csharp/App/OpenVpnCertificatesServer/Http.cs
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/Http.cs
rename to csharp/App/OpenVpnCertificatesServer/Http.cs
diff --git a/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj b/csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
similarity index 58%
rename from csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
rename to csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
index 2773cd430..e44b0a11e 100644
--- a/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
+++ b/csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj
@@ -1,5 +1,5 @@
-
+
@@ -8,8 +8,9 @@
-
-
+
+
+
diff --git a/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.sln b/csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.sln
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.sln
rename to csharp/App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.sln
diff --git a/csharp/app/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs b/csharp/App/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs
rename to csharp/App/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs
diff --git a/csharp/app/OpenVpnCertificatesServer/PKI/Pem.cs b/csharp/App/OpenVpnCertificatesServer/PKI/Pem.cs
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/PKI/Pem.cs
rename to csharp/App/OpenVpnCertificatesServer/PKI/Pem.cs
diff --git a/csharp/app/OpenVpnCertificatesServer/PKI/PwdFinder.cs b/csharp/App/OpenVpnCertificatesServer/PKI/PwdFinder.cs
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/PKI/PwdFinder.cs
rename to csharp/App/OpenVpnCertificatesServer/PKI/PwdFinder.cs
diff --git a/csharp/app/OpenVpnCertificatesServer/Program.cs b/csharp/App/OpenVpnCertificatesServer/Program.cs
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/Program.cs
rename to csharp/App/OpenVpnCertificatesServer/Program.cs
diff --git a/csharp/app/OpenVpnCertificatesServer/Utils.cs b/csharp/App/OpenVpnCertificatesServer/Utils.cs
similarity index 100%
rename from csharp/app/OpenVpnCertificatesServer/Utils.cs
rename to csharp/App/OpenVpnCertificatesServer/Utils.cs
diff --git a/csharp/app/RemoteSupportConsole/Login.cs b/csharp/App/RemoteSupportConsole/Login.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/Login.cs
rename to csharp/App/RemoteSupportConsole/Login.cs
diff --git a/csharp/app/RemoteSupportConsole/ObservablePipeSource.cs b/csharp/App/RemoteSupportConsole/ObservablePipeSource.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/ObservablePipeSource.cs
rename to csharp/App/RemoteSupportConsole/ObservablePipeSource.cs
diff --git a/csharp/app/RemoteSupportConsole/Program.cs b/csharp/App/RemoteSupportConsole/Program.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/Program.cs
rename to csharp/App/RemoteSupportConsole/Program.cs
diff --git a/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj b/csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj
similarity index 67%
rename from csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj
rename to csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj
index cb8c7d1b8..c00eed4bb 100644
--- a/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj
+++ b/csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj
@@ -1,9 +1,9 @@
-
+
-
-
+
+
diff --git a/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj.DotSettings b/csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj.DotSettings
similarity index 100%
rename from csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj.DotSettings
rename to csharp/App/RemoteSupportConsole/RemoteSupportConsole.csproj.DotSettings
diff --git a/csharp/app/RemoteSupportConsole/Ssh.cs b/csharp/App/RemoteSupportConsole/Ssh.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/Ssh.cs
rename to csharp/App/RemoteSupportConsole/Ssh.cs
diff --git a/csharp/app/RemoteSupportConsole/VpnConnection.cs b/csharp/App/RemoteSupportConsole/VpnConnection.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/VpnConnection.cs
rename to csharp/App/RemoteSupportConsole/VpnConnection.cs
diff --git a/csharp/app/RemoteSupportConsole/VpnInfo.cs b/csharp/App/RemoteSupportConsole/VpnInfo.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/VpnInfo.cs
rename to csharp/App/RemoteSupportConsole/VpnInfo.cs
diff --git a/csharp/app/RemoteSupportConsole/VrmConnection.cs b/csharp/App/RemoteSupportConsole/VrmConnection.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/VrmConnection.cs
rename to csharp/App/RemoteSupportConsole/VrmConnection.cs
diff --git a/csharp/app/RemoteSupportConsole/VrmInfo.cs b/csharp/App/RemoteSupportConsole/VrmInfo.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/VrmInfo.cs
rename to csharp/App/RemoteSupportConsole/VrmInfo.cs
diff --git a/csharp/app/RemoteSupportConsole/VrmProxy.cs b/csharp/App/RemoteSupportConsole/VrmProxy.cs
similarity index 100%
rename from csharp/app/RemoteSupportConsole/VrmProxy.cs
rename to csharp/App/RemoteSupportConsole/VrmProxy.cs
diff --git a/csharp/App/SaliMax/SaliMax.csproj b/csharp/App/SaliMax/SaliMax.csproj
new file mode 100644
index 000000000..c647ee0d5
--- /dev/null
+++ b/csharp/App/SaliMax/SaliMax.csproj
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/csharp/app/SaliMax/run (BeagleBone Meiringen).sh b/csharp/App/SaliMax/run (BeagleBone Meiringen).sh
similarity index 100%
rename from csharp/app/SaliMax/run (BeagleBone Meiringen).sh
rename to csharp/App/SaliMax/run (BeagleBone Meiringen).sh
diff --git a/csharp/app/SaliMax/src/AsciiArt.cs b/csharp/App/SaliMax/src/AsciiArt.cs
similarity index 100%
rename from csharp/app/SaliMax/src/AsciiArt.cs
rename to csharp/App/SaliMax/src/AsciiArt.cs
diff --git a/csharp/app/SaliMax/src/BusPort.cs b/csharp/App/SaliMax/src/BusPort.cs
similarity index 100%
rename from csharp/app/SaliMax/src/BusPort.cs
rename to csharp/App/SaliMax/src/BusPort.cs
diff --git a/csharp/app/SaliMax/src/Controller/AvgBatteriesStatus.cs b/csharp/App/SaliMax/src/Controller/AvgBatteriesStatus.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/AvgBatteriesStatus.cs
rename to csharp/App/SaliMax/src/Controller/AvgBatteriesStatus.cs
diff --git a/csharp/app/SaliMax/src/Controller/Control.cs b/csharp/App/SaliMax/src/Controller/Control.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/Control.cs
rename to csharp/App/SaliMax/src/Controller/Control.cs
diff --git a/csharp/app/SaliMax/src/Controller/ControlRecord.cs b/csharp/App/SaliMax/src/Controller/ControlRecord.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/ControlRecord.cs
rename to csharp/App/SaliMax/src/Controller/ControlRecord.cs
diff --git a/csharp/app/SaliMax/src/Controller/ControlTarget.cs b/csharp/App/SaliMax/src/Controller/ControlTarget.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/ControlTarget.cs
rename to csharp/App/SaliMax/src/Controller/ControlTarget.cs
diff --git a/csharp/app/SaliMax/src/Controller/Controller.cs b/csharp/App/SaliMax/src/Controller/Controller.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/Controller.cs
rename to csharp/App/SaliMax/src/Controller/Controller.cs
diff --git a/csharp/app/SaliMax/src/Controller/SaliMaxState.cs b/csharp/App/SaliMax/src/Controller/SaliMaxState.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/SaliMaxState.cs
rename to csharp/App/SaliMax/src/Controller/SaliMaxState.cs
diff --git a/csharp/app/SaliMax/src/Controller/State.cs b/csharp/App/SaliMax/src/Controller/State.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/State.cs
rename to csharp/App/SaliMax/src/Controller/State.cs
diff --git a/csharp/app/SaliMax/src/Controller/StateConfig.cs b/csharp/App/SaliMax/src/Controller/StateConfig.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/StateConfig.cs
rename to csharp/App/SaliMax/src/Controller/StateConfig.cs
diff --git a/csharp/app/SaliMax/src/Controller/StatusRecord.cs b/csharp/App/SaliMax/src/Controller/StatusRecord.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Controller/StatusRecord.cs
rename to csharp/App/SaliMax/src/Controller/StatusRecord.cs
diff --git a/csharp/app/SaliMax/src/Log/Ampt.cs b/csharp/App/SaliMax/src/Log/Ampt.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Log/Ampt.cs
rename to csharp/App/SaliMax/src/Log/Ampt.cs
diff --git a/csharp/app/SaliMax/src/Log/Battery48Tl.cs b/csharp/App/SaliMax/src/Log/Battery48Tl.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Log/Battery48Tl.cs
rename to csharp/App/SaliMax/src/Log/Battery48Tl.cs
diff --git a/csharp/app/SaliMax/src/Log/EmuMeter.cs b/csharp/App/SaliMax/src/Log/EmuMeter.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Log/EmuMeter.cs
rename to csharp/App/SaliMax/src/Log/EmuMeter.cs
diff --git a/csharp/app/SaliMax/src/Log/JsonUtil.cs b/csharp/App/SaliMax/src/Log/JsonUtil.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Log/JsonUtil.cs
rename to csharp/App/SaliMax/src/Log/JsonUtil.cs
diff --git a/csharp/app/SaliMax/src/Log/Salimax.cs b/csharp/App/SaliMax/src/Log/Salimax.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Log/Salimax.cs
rename to csharp/App/SaliMax/src/Log/Salimax.cs
diff --git a/csharp/app/SaliMax/src/Log/TruConvertAc.cs b/csharp/App/SaliMax/src/Log/TruConvertAc.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Log/TruConvertAc.cs
rename to csharp/App/SaliMax/src/Log/TruConvertAc.cs
diff --git a/csharp/app/SaliMax/src/Log/TruConvertDc.cs b/csharp/App/SaliMax/src/Log/TruConvertDc.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Log/TruConvertDc.cs
rename to csharp/App/SaliMax/src/Log/TruConvertDc.cs
diff --git a/csharp/app/SaliMax/src/Program.cs b/csharp/App/SaliMax/src/Program.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Program.cs
rename to csharp/App/SaliMax/src/Program.cs
diff --git a/csharp/app/SaliMax/src/S3Config.cs b/csharp/App/SaliMax/src/S3Config.cs
similarity index 100%
rename from csharp/app/SaliMax/src/S3Config.cs
rename to csharp/App/SaliMax/src/S3Config.cs
diff --git a/csharp/app/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs b/csharp/App/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs
similarity index 100%
rename from csharp/app/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs
rename to csharp/App/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs
diff --git a/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs b/csharp/App/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs
similarity index 100%
rename from csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs
rename to csharp/App/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs
diff --git a/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs b/csharp/App/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs
similarity index 100%
rename from csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs
rename to csharp/App/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs
diff --git a/csharp/app/SaliMax/src/SystemConfig/Config.cs b/csharp/App/SaliMax/src/SystemConfig/Config.cs
similarity index 100%
rename from csharp/app/SaliMax/src/SystemConfig/Config.cs
rename to csharp/App/SaliMax/src/SystemConfig/Config.cs
diff --git a/csharp/app/SaliMax/src/SystemConfig/Defaults.cs b/csharp/App/SaliMax/src/SystemConfig/Defaults.cs
similarity index 100%
rename from csharp/app/SaliMax/src/SystemConfig/Defaults.cs
rename to csharp/App/SaliMax/src/SystemConfig/Defaults.cs
diff --git a/csharp/app/SaliMax/src/SystemConfig/SalimaxConfig.cs b/csharp/App/SaliMax/src/SystemConfig/SalimaxConfig.cs
similarity index 100%
rename from csharp/app/SaliMax/src/SystemConfig/SalimaxConfig.cs
rename to csharp/App/SaliMax/src/SystemConfig/SalimaxConfig.cs
diff --git a/csharp/app/SaliMax/src/Topology.cs b/csharp/App/SaliMax/src/Topology.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Topology.cs
rename to csharp/App/SaliMax/src/Topology.cs
diff --git a/csharp/app/SaliMax/src/Utils.cs b/csharp/App/SaliMax/src/Utils.cs
similarity index 100%
rename from csharp/app/SaliMax/src/Utils.cs
rename to csharp/App/SaliMax/src/Utils.cs
diff --git a/csharp/app/SaliMax/tunnels.html b/csharp/App/SaliMax/tunnels.html
similarity index 100%
rename from csharp/app/SaliMax/tunnels.html
rename to csharp/App/SaliMax/tunnels.html
diff --git a/csharp/app/SaliMax/tunnels.sh b/csharp/App/SaliMax/tunnels.sh
similarity index 100%
rename from csharp/app/SaliMax/tunnels.sh
rename to csharp/App/SaliMax/tunnels.sh
diff --git a/csharp/InnovEnergy.sln b/csharp/InnovEnergy.sln
index 5002df0a2..70c4b2f57 100644
--- a/csharp/InnovEnergy.sln
+++ b/csharp/InnovEnergy.sln
@@ -1,32 +1,32 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Collector", "app/Collector/Collector.csproj", "{E3A5F3A3-72A5-47CC-85C6-2D8E962A0EC1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Collector", "App/Collector/Collector.csproj", "{E3A5F3A3-72A5-47CC-85C6-2D8E962A0EC1}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenVpnCertificatesServer", "app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj", "{CF4834CB-91B7-4172-AC13-ECDA8613CD17}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenVpnCertificatesServer", "App/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj", "{CF4834CB-91B7-4172-AC13-ECDA8613CD17}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteSupportConsole", "app/RemoteSupportConsole/RemoteSupportConsole.csproj", "{B1268C03-66EB-4486-8BFC-B439225D9D54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RemoteSupportConsole", "App/RemoteSupportConsole/RemoteSupportConsole.csproj", "{B1268C03-66EB-4486-8BFC-B439225D9D54}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SysTools", "lib/SysTools/SysTools.csproj", "{4A67D79F-F0C9-4BBC-9601-D5948E6C05D3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SysTools", "Lib/SysTools/SysTools.csproj", "{4A67D79F-F0C9-4BBC-9601-D5948E6C05D3}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServer", "lib/WebServer/WebServer.csproj", "{B2627B9F-41DF-44F7-A0D1-CA71FF4A007A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServer", "Lib/WebServer/WebServer.csproj", "{B2627B9F-41DF-44F7-A0D1-CA71FF4A007A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Time", "lib/Time/Time.csproj", "{442A8366-C177-48FE-84A7-BDF6470A09FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Time", "Lib/Time/Time.csproj", "{442A8366-C177-48FE-84A7-BDF6470A09FF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmuMeterDriver", "app/EmuMeterDriver/EmuMeterDriver.csproj", "{F65F33B0-3522-4008-8D1E-47EF8E4C7AC7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmuMeterDriver", "App/EmuMeterDriver/EmuMeterDriver.csproj", "{F65F33B0-3522-4008-8D1E-47EF8E4C7AC7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BmsTunnel", "app/BmsTunnel/BmsTunnel.csproj", "{40B45363-BE34-420B-8F87-775EE6EE3513}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BmsTunnel", "App/BmsTunnel/BmsTunnel.csproj", "{40B45363-BE34-420B-8F87-775EE6EE3513}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{145597B4-3E30-45E6-9F72-4DD43194539A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{145597B4-3E30-45E6-9F72-4DD43194539A}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{AD5B98A8-AB7F-4DA2-B66D-5B4E63E7D854}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{AD5B98A8-AB7F-4DA2-B66D-5B4E63E7D854}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "S3", "lib/S3/S3.csproj", "{C3639841-13F4-4F24-99C6-7D965593BF89}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "S3", "Lib/S3/S3.csproj", "{C3639841-13F4-4F24-99C6-7D965593BF89}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{46DE03C4-52D1-47AA-8E60-8BB15361D723}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaliMax", "app/SaliMax/SaliMax.csproj", "{25073794-D859-4824-9984-194C7E928496}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaliMax", "App/SaliMax/SaliMax.csproj", "{25073794-D859-4824-9984-194C7E928496}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatusApi", "lib/StatusApi/StatusApi.csproj", "{9D17E78C-8A70-43DB-A619-DC12D20D023D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatusApi", "Lib/StatusApi/StatusApi.csproj", "{9D17E78C-8A70-43DB-A619-DC12D20D023D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Devices", "Devices", "{4931A385-24DC-4E78-BFF4-356F8D6D5183}"
EndProject
@@ -36,36 +36,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Victron", "Victron", "{BD8C
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Trumpf", "Trumpf", "{DDDBEFD0-5DEA-4C7C-A9F2-FDB4636CF092}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TruConvert", "lib/Devices/Trumpf/TruConvert/TruConvert.csproj", "{EF46CF7B-823E-4CB7-966F-EDDC144C7954}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TruConvert", "Lib/Devices/Trumpf/TruConvert/TruConvert.csproj", "{EF46CF7B-823E-4CB7-966F-EDDC144C7954}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TruConvertAc", "lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj", "{1F4B445E-459E-44CD-813E-6D725EBB81E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TruConvertAc", "Lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj", "{1F4B445E-459E-44CD-813E-6D725EBB81E8}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TruConvertDc", "lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj", "{F6F29829-C31A-4994-A698-E441BEA631C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TruConvertDc", "Lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj", "{F6F29829-C31A-4994-A698-E441BEA631C6}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DBus", "lib/Protocols/DBus/DBus.csproj", "{8C3C620A-087D-4DD6-B493-A47FC643F8DC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DBus", "Lib/Protocols/DBus/DBus.csproj", "{8C3C620A-087D-4DD6-B493-A47FC643F8DC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modbus", "lib/Protocols/Modbus/Modbus.csproj", "{E4AE6A33-0DEB-48EB-9D57-C0C7C63FC267}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modbus", "Lib/Protocols/Modbus/Modbus.csproj", "{E4AE6A33-0DEB-48EB-9D57-C0C7C63FC267}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeDBus", "lib/Victron/VeDBus/VeDBus.csproj", "{50B26E29-1B99-4D07-BCA5-359CD550BBAA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VeDBus", "Lib/Victron/VeDBus/VeDBus.csproj", "{50B26E29-1B99-4D07-BCA5-359CD550BBAA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VictronVRM", "lib/Victron/VictronVRM/VictronVRM.csproj", "{FE05DF69-B5C7-4C2E-8FB9-7776441A7622}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VictronVRM", "Lib/Victron/VictronVRM/VictronVRM.csproj", "{FE05DF69-B5C7-4C2E-8FB9-7776441A7622}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ampt", "lib/Devices/AMPT/Ampt.csproj", "{77AF3A64-2878-4150-BCD0-F16530783165}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ampt", "Lib/Devices/AMPT/Ampt.csproj", "{77AF3A64-2878-4150-BCD0-F16530783165}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Battery48TL", "lib/Devices/Battery48TL/Battery48TL.csproj", "{1C3F443A-B339-4B08-80E6-8A84817FFEC9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Battery48TL", "Lib/Devices/Battery48TL/Battery48TL.csproj", "{1C3F443A-B339-4B08-80E6-8A84817FFEC9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmuMeter", "lib/Devices/EmuMeter/EmuMeter.csproj", "{152A4168-F612-493C-BBEA-8EB26E6E2D34}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmuMeter", "Lib/Devices/EmuMeter/EmuMeter.csproj", "{152A4168-F612-493C-BBEA-8EB26E6E2D34}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "lib/Utils/Utils.csproj", "{89A3E29C-4E57-47FE-A800-12AC68418264}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Lib/Utils/Utils.csproj", "{89A3E29C-4E57-47FE-A800-12AC68418264}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Adam6060", "lib/Devices/Adam6060/Adam6060.csproj", "{4AFDB799-E6A4-4DCA-8B6D-8C0F98398461}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Adam6060", "Lib/Devices/Adam6060/Adam6060.csproj", "{4AFDB799-E6A4-4DCA-8B6D-8C0F98398461}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Channels", "lib/Channels/Channels.csproj", "{AF7E8DCA-8D48-498E-AB3D-208061B244DC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Channels", "Lib/Channels/Channels.csproj", "{AF7E8DCA-8D48-498E-AB3D-208061B244DC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend", "app/Backend/Backend.csproj", "{A56F58C2-B265-435B-A985-53B4D6F49B1A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend", "App/Backend/Backend.csproj", "{A56F58C2-B265-435B-A985-53B4D6F49B1A}"
EndProject
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatusData", "lib\StatusData\StatusData.csproj", "{C04FB6DA-23C6-46BB-9B21-8F4FBA32FFF7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatusData", "Lib\StatusData\StatusData.csproj", "{C04FB6DA-23C6-46BB-9B21-8F4FBA32FFF7}"
EndProject
Global
diff --git a/csharp/Lib/Channels/Channels.csproj b/csharp/Lib/Channels/Channels.csproj
new file mode 100644
index 000000000..9eb898d4e
--- /dev/null
+++ b/csharp/Lib/Channels/Channels.csproj
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/csharp/lib/Channels/CloseAfter.cs b/csharp/Lib/Channels/CloseAfter.cs
similarity index 100%
rename from csharp/lib/Channels/CloseAfter.cs
rename to csharp/Lib/Channels/CloseAfter.cs
diff --git a/csharp/lib/Channels/Connection.cs b/csharp/Lib/Channels/Connection.cs
similarity index 100%
rename from csharp/lib/Channels/Connection.cs
rename to csharp/Lib/Channels/Connection.cs
diff --git a/csharp/lib/Channels/Framed/Channel.cs b/csharp/Lib/Channels/Framed/Channel.cs
similarity index 100%
rename from csharp/lib/Channels/Framed/Channel.cs
rename to csharp/Lib/Channels/Framed/Channel.cs
diff --git a/csharp/lib/Channels/Stages/Channel.cs b/csharp/Lib/Channels/Stages/Channel.cs
similarity index 100%
rename from csharp/lib/Channels/Stages/Channel.cs
rename to csharp/Lib/Channels/Stages/Channel.cs
diff --git a/csharp/lib/Channels/Stages/ConnectedChannel.cs b/csharp/Lib/Channels/Stages/ConnectedChannel.cs
similarity index 100%
rename from csharp/lib/Channels/Stages/ConnectedChannel.cs
rename to csharp/Lib/Channels/Stages/ConnectedChannel.cs
diff --git a/csharp/lib/Channels/Stages/Stage.cs b/csharp/Lib/Channels/Stages/Stage.cs
similarity index 100%
rename from csharp/lib/Channels/Stages/Stage.cs
rename to csharp/Lib/Channels/Stages/Stage.cs
diff --git a/csharp/lib/Channels/V2/Bak/Connections/Connection.cs b/csharp/Lib/Channels/V2/Bak/Connections/Connection.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Bak/Connections/Connection.cs
rename to csharp/Lib/Channels/V2/Bak/Connections/Connection.cs
diff --git a/csharp/lib/Channels/V2/Bak/Connections/Connections.cs b/csharp/Lib/Channels/V2/Bak/Connections/Connections.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Bak/Connections/Connections.cs
rename to csharp/Lib/Channels/V2/Bak/Connections/Connections.cs
diff --git a/csharp/lib/Channels/V2/Bak/Connections/Extensions.cs b/csharp/Lib/Channels/V2/Bak/Connections/Extensions.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Bak/Connections/Extensions.cs
rename to csharp/Lib/Channels/V2/Bak/Connections/Extensions.cs
diff --git a/csharp/lib/Channels/V2/Bak/Connections/IConnection.cs b/csharp/Lib/Channels/V2/Bak/Connections/IConnection.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Bak/Connections/IConnection.cs
rename to csharp/Lib/Channels/V2/Bak/Connections/IConnection.cs
diff --git a/csharp/lib/Channels/V2/Bak/GenericChannel.cs b/csharp/Lib/Channels/V2/Bak/GenericChannel.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Bak/GenericChannel.cs
rename to csharp/Lib/Channels/V2/Bak/GenericChannel.cs
diff --git a/csharp/lib/Channels/V2/Bak/StreamChannel.cs b/csharp/Lib/Channels/V2/Bak/StreamChannel.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Bak/StreamChannel.cs
rename to csharp/Lib/Channels/V2/Bak/StreamChannel.cs
diff --git a/csharp/lib/Channels/V2/CommandChannel.cs b/csharp/Lib/Channels/V2/CommandChannel.cs
similarity index 100%
rename from csharp/lib/Channels/V2/CommandChannel.cs
rename to csharp/Lib/Channels/V2/CommandChannel.cs
diff --git a/csharp/lib/Channels/V2/IChannel.cs b/csharp/Lib/Channels/V2/IChannel.cs
similarity index 100%
rename from csharp/lib/Channels/V2/IChannel.cs
rename to csharp/Lib/Channels/V2/IChannel.cs
diff --git a/csharp/lib/Channels/V2/Pipes/AsyncPipeSource.cs b/csharp/Lib/Channels/V2/Pipes/AsyncPipeSource.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Pipes/AsyncPipeSource.cs
rename to csharp/Lib/Channels/V2/Pipes/AsyncPipeSource.cs
diff --git a/csharp/lib/Channels/V2/Pipes/AsyncPipeTarget.cs b/csharp/Lib/Channels/V2/Pipes/AsyncPipeTarget.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Pipes/AsyncPipeTarget.cs
rename to csharp/Lib/Channels/V2/Pipes/AsyncPipeTarget.cs
diff --git a/csharp/lib/Channels/V2/Pipes/ChannelPipeSource.cs b/csharp/Lib/Channels/V2/Pipes/ChannelPipeSource.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Pipes/ChannelPipeSource.cs
rename to csharp/Lib/Channels/V2/Pipes/ChannelPipeSource.cs
diff --git a/csharp/lib/Channels/V2/Pipes/ChannelPipeTarget.cs b/csharp/Lib/Channels/V2/Pipes/ChannelPipeTarget.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Pipes/ChannelPipeTarget.cs
rename to csharp/Lib/Channels/V2/Pipes/ChannelPipeTarget.cs
diff --git a/csharp/lib/Channels/V2/Stage.cs b/csharp/Lib/Channels/V2/Stage.cs
similarity index 100%
rename from csharp/lib/Channels/V2/Stage.cs
rename to csharp/Lib/Channels/V2/Stage.cs
diff --git a/csharp/lib/Channels/V2/StreamChannel.cs b/csharp/Lib/Channels/V2/StreamChannel.cs
similarity index 100%
rename from csharp/lib/Channels/V2/StreamChannel.cs
rename to csharp/Lib/Channels/V2/StreamChannel.cs
diff --git a/csharp/lib/Channels/V2/TcpChannel.cs b/csharp/Lib/Channels/V2/TcpChannel.cs
similarity index 100%
rename from csharp/lib/Channels/V2/TcpChannel.cs
rename to csharp/Lib/Channels/V2/TcpChannel.cs
diff --git a/csharp/lib/Devices/AMPT/Ampt.csproj b/csharp/Lib/Devices/AMPT/Ampt.csproj
similarity index 88%
rename from csharp/lib/Devices/AMPT/Ampt.csproj
rename to csharp/Lib/Devices/AMPT/Ampt.csproj
index 2190a3c06..ea8cbf21c 100644
--- a/csharp/lib/Devices/AMPT/Ampt.csproj
+++ b/csharp/Lib/Devices/AMPT/Ampt.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Devices/AMPT/AmptCommunicationUnit.cs b/csharp/Lib/Devices/AMPT/AmptCommunicationUnit.cs
similarity index 100%
rename from csharp/lib/Devices/AMPT/AmptCommunicationUnit.cs
rename to csharp/Lib/Devices/AMPT/AmptCommunicationUnit.cs
diff --git a/csharp/lib/Devices/AMPT/AmptDeviceStatus.cs b/csharp/Lib/Devices/AMPT/AmptDeviceStatus.cs
similarity index 100%
rename from csharp/lib/Devices/AMPT/AmptDeviceStatus.cs
rename to csharp/Lib/Devices/AMPT/AmptDeviceStatus.cs
diff --git a/csharp/lib/Devices/AMPT/AmptStatus.cs b/csharp/Lib/Devices/AMPT/AmptStatus.cs
similarity index 100%
rename from csharp/lib/Devices/AMPT/AmptStatus.cs
rename to csharp/Lib/Devices/AMPT/AmptStatus.cs
diff --git a/csharp/lib/Devices/AMPT/AmptStringStatus.cs b/csharp/Lib/Devices/AMPT/AmptStringStatus.cs
similarity index 100%
rename from csharp/lib/Devices/AMPT/AmptStringStatus.cs
rename to csharp/Lib/Devices/AMPT/AmptStringStatus.cs
diff --git a/csharp/lib/Devices/Adam6060/Adam6060.csproj b/csharp/Lib/Devices/Adam6060/Adam6060.csproj
similarity index 75%
rename from csharp/lib/Devices/Adam6060/Adam6060.csproj
rename to csharp/Lib/Devices/Adam6060/Adam6060.csproj
index de99fbbaa..1a36e43e1 100644
--- a/csharp/lib/Devices/Adam6060/Adam6060.csproj
+++ b/csharp/Lib/Devices/Adam6060/Adam6060.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Devices/Adam6060/Adam6060Control.cs b/csharp/Lib/Devices/Adam6060/Adam6060Control.cs
similarity index 100%
rename from csharp/lib/Devices/Adam6060/Adam6060Control.cs
rename to csharp/Lib/Devices/Adam6060/Adam6060Control.cs
diff --git a/csharp/lib/Devices/Adam6060/Adam6060Device.cs b/csharp/Lib/Devices/Adam6060/Adam6060Device.cs
similarity index 100%
rename from csharp/lib/Devices/Adam6060/Adam6060Device.cs
rename to csharp/Lib/Devices/Adam6060/Adam6060Device.cs
diff --git a/csharp/lib/Devices/Adam6060/Adam6060Status.cs b/csharp/Lib/Devices/Adam6060/Adam6060Status.cs
similarity index 100%
rename from csharp/lib/Devices/Adam6060/Adam6060Status.cs
rename to csharp/Lib/Devices/Adam6060/Adam6060Status.cs
diff --git a/csharp/lib/Devices/Battery48TL/Battery48TL.csproj b/csharp/Lib/Devices/Battery48TL/Battery48TL.csproj
similarity index 84%
rename from csharp/lib/Devices/Battery48TL/Battery48TL.csproj
rename to csharp/Lib/Devices/Battery48TL/Battery48TL.csproj
index bbfe44b02..ce3b83de6 100644
--- a/csharp/lib/Devices/Battery48TL/Battery48TL.csproj
+++ b/csharp/Lib/Devices/Battery48TL/Battery48TL.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Devices/Battery48TL/Battery48TLDevice.cs b/csharp/Lib/Devices/Battery48TL/Battery48TLDevice.cs
similarity index 100%
rename from csharp/lib/Devices/Battery48TL/Battery48TLDevice.cs
rename to csharp/Lib/Devices/Battery48TL/Battery48TLDevice.cs
diff --git a/csharp/lib/Devices/Battery48TL/Battery48TLStatusRecord.cs b/csharp/Lib/Devices/Battery48TL/Battery48TLStatusRecord.cs
similarity index 100%
rename from csharp/lib/Devices/Battery48TL/Battery48TLStatusRecord.cs
rename to csharp/Lib/Devices/Battery48TL/Battery48TLStatusRecord.cs
diff --git a/csharp/lib/Devices/Battery48TL/BatteryDataParser.cs b/csharp/Lib/Devices/Battery48TL/BatteryDataParser.cs
similarity index 100%
rename from csharp/lib/Devices/Battery48TL/BatteryDataParser.cs
rename to csharp/Lib/Devices/Battery48TL/BatteryDataParser.cs
diff --git a/csharp/lib/Devices/Battery48TL/Constants.cs b/csharp/Lib/Devices/Battery48TL/Constants.cs
similarity index 100%
rename from csharp/lib/Devices/Battery48TL/Constants.cs
rename to csharp/Lib/Devices/Battery48TL/Constants.cs
diff --git a/csharp/lib/Devices/Battery48TL/LedColor.cs b/csharp/Lib/Devices/Battery48TL/LedColor.cs
similarity index 100%
rename from csharp/lib/Devices/Battery48TL/LedColor.cs
rename to csharp/Lib/Devices/Battery48TL/LedColor.cs
diff --git a/csharp/lib/Devices/Battery48TL/LedState.cs b/csharp/Lib/Devices/Battery48TL/LedState.cs
similarity index 100%
rename from csharp/lib/Devices/Battery48TL/LedState.cs
rename to csharp/Lib/Devices/Battery48TL/LedState.cs
diff --git a/csharp/lib/Devices/EmuMeter/Conversions.cs b/csharp/Lib/Devices/EmuMeter/Conversions.cs
similarity index 100%
rename from csharp/lib/Devices/EmuMeter/Conversions.cs
rename to csharp/Lib/Devices/EmuMeter/Conversions.cs
diff --git a/csharp/lib/Devices/EmuMeter/EmuMeter.csproj b/csharp/Lib/Devices/EmuMeter/EmuMeter.csproj
similarity index 84%
rename from csharp/lib/Devices/EmuMeter/EmuMeter.csproj
rename to csharp/Lib/Devices/EmuMeter/EmuMeter.csproj
index bbfe44b02..ce3b83de6 100644
--- a/csharp/lib/Devices/EmuMeter/EmuMeter.csproj
+++ b/csharp/Lib/Devices/EmuMeter/EmuMeter.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Devices/EmuMeter/EmuMeterDevice.cs b/csharp/Lib/Devices/EmuMeter/EmuMeterDevice.cs
similarity index 100%
rename from csharp/lib/Devices/EmuMeter/EmuMeterDevice.cs
rename to csharp/Lib/Devices/EmuMeter/EmuMeterDevice.cs
diff --git a/csharp/lib/Devices/EmuMeter/EmuMeterStatus.cs b/csharp/Lib/Devices/EmuMeter/EmuMeterStatus.cs
similarity index 100%
rename from csharp/lib/Devices/EmuMeter/EmuMeterStatus.cs
rename to csharp/Lib/Devices/EmuMeter/EmuMeterStatus.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvert/AlarmState.cs b/csharp/Lib/Devices/Trumpf/TruConvert/AlarmState.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvert/AlarmState.cs
rename to csharp/Lib/Devices/Trumpf/TruConvert/AlarmState.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvert/MainState.cs b/csharp/Lib/Devices/Trumpf/TruConvert/MainState.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvert/MainState.cs
rename to csharp/Lib/Devices/Trumpf/TruConvert/MainState.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvert/Slave.cs b/csharp/Lib/Devices/Trumpf/TruConvert/Slave.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvert/Slave.cs
rename to csharp/Lib/Devices/Trumpf/TruConvert/Slave.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvert/SystemConfig.cs b/csharp/Lib/Devices/Trumpf/TruConvert/SystemConfig.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvert/SystemConfig.cs
rename to csharp/Lib/Devices/Trumpf/TruConvert/SystemConfig.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj b/csharp/Lib/Devices/Trumpf/TruConvert/TruConvert.csproj
similarity index 72%
rename from csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj
rename to csharp/Lib/Devices/Trumpf/TruConvert/TruConvert.csproj
index 660a234b8..ca3eb7a2a 100644
--- a/csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj
+++ b/csharp/Lib/Devices/Trumpf/TruConvert/TruConvert.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Devices/Trumpf/TruConvert/Utils.cs b/csharp/Lib/Devices/Trumpf/TruConvert/Utils.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvert/Utils.cs
rename to csharp/Lib/Devices/Trumpf/TruConvert/Utils.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/AcControlRegisters.cs b/csharp/Lib/Devices/Trumpf/TruConvertAc/AcControlRegisters.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/AcControlRegisters.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/AcControlRegisters.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/AcEnums.cs b/csharp/Lib/Devices/Trumpf/TruConvertAc/AcEnums.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/AcEnums.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/AcEnums.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs b/csharp/Lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj b/csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj
similarity index 84%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj
index b29f9d3f8..3a70b12a0 100644
--- a/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj
+++ b/csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAcControl.cs b/csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAcControl.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAcControl.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAcControl.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAcDevice.cs b/csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAcDevice.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAcDevice.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAcDevice.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAcStatus.cs b/csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAcStatus.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAcStatus.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/TruConvertAcStatus.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs b/csharp/Lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/AlarmMessage.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/AlarmMessage.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/AlarmMessage.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/AlarmMessage.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/DcControlRegisters.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/DcControlRegisters.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/DcControlRegisters.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/DcControlRegisters.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/DcEnums.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/DcEnums.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/DcEnums.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/DcEnums.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj b/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj
similarity index 84%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj
index 8f13140f6..1628a2b19 100644
--- a/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj
+++ b/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDcControl.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcControl.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDcControl.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcControl.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDcDevice.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcDevice.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDcDevice.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcDevice.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDcStatus.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcStatus.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDcStatus.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/TruConvertDcStatus.cs
diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/WarningMessage.cs b/csharp/Lib/Devices/Trumpf/TruConvertDc/WarningMessage.cs
similarity index 100%
rename from csharp/lib/Devices/Trumpf/TruConvertDc/WarningMessage.cs
rename to csharp/Lib/Devices/Trumpf/TruConvertDc/WarningMessage.cs
diff --git a/csharp/lib/InnovEnergy.lib.props b/csharp/Lib/InnovEnergy.Lib.props
similarity index 100%
rename from csharp/lib/InnovEnergy.lib.props
rename to csharp/Lib/InnovEnergy.Lib.props
diff --git a/csharp/lib/Protocols/DBus/Bus.cs b/csharp/Lib/Protocols/DBus/Bus.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Bus.cs
rename to csharp/Lib/Protocols/DBus/Bus.cs
diff --git a/csharp/lib/Protocols/DBus/DBus.csproj b/csharp/Lib/Protocols/DBus/DBus.csproj
similarity index 89%
rename from csharp/lib/Protocols/DBus/DBus.csproj
rename to csharp/Lib/Protocols/DBus/DBus.csproj
index e33bdceca..01a9e0400 100644
--- a/csharp/lib/Protocols/DBus/DBus.csproj
+++ b/csharp/Lib/Protocols/DBus/DBus.csproj
@@ -1,5 +1,5 @@
-
+
DBus Library
diff --git a/csharp/lib/Protocols/DBus/DBusConnection.cs b/csharp/Lib/Protocols/DBus/DBusConnection.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/DBusConnection.cs
rename to csharp/Lib/Protocols/DBus/DBusConnection.cs
diff --git a/csharp/lib/Protocols/DBus/DBusMessageStream.cs b/csharp/Lib/Protocols/DBus/DBusMessageStream.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/DBusMessageStream.cs
rename to csharp/Lib/Protocols/DBus/DBusMessageStream.cs
diff --git a/csharp/lib/Protocols/DBus/DBusService.cs b/csharp/Lib/Protocols/DBus/DBusService.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/DBusService.cs
rename to csharp/Lib/Protocols/DBus/DBusService.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/DBusDaemonApi.cs b/csharp/Lib/Protocols/DBus/Daemon/DBusDaemonApi.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/DBusDaemonApi.cs
rename to csharp/Lib/Protocols/DBus/Daemon/DBusDaemonApi.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/DBusDaemonConnection.Resolver.cs b/csharp/Lib/Protocols/DBus/Daemon/DBusDaemonConnection.Resolver.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/DBusDaemonConnection.Resolver.cs
rename to csharp/Lib/Protocols/DBus/Daemon/DBusDaemonConnection.Resolver.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/DBusDaemonConnection.cs b/csharp/Lib/Protocols/DBus/Daemon/DBusDaemonConnection.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/DBusDaemonConnection.cs
rename to csharp/Lib/Protocols/DBus/Daemon/DBusDaemonConnection.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/MatchRule.cs b/csharp/Lib/Protocols/DBus/Daemon/MatchRule.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/MatchRule.cs
rename to csharp/Lib/Protocols/DBus/Daemon/MatchRule.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/ObservableDictionary.cs b/csharp/Lib/Protocols/DBus/Daemon/ObservableDictionary.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/ObservableDictionary.cs
rename to csharp/Lib/Protocols/DBus/Daemon/ObservableDictionary.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/ReleaseNameReply.cs b/csharp/Lib/Protocols/DBus/Daemon/ReleaseNameReply.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/ReleaseNameReply.cs
rename to csharp/Lib/Protocols/DBus/Daemon/ReleaseNameReply.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/RequestNameOptions.cs b/csharp/Lib/Protocols/DBus/Daemon/RequestNameOptions.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/RequestNameOptions.cs
rename to csharp/Lib/Protocols/DBus/Daemon/RequestNameOptions.cs
diff --git a/csharp/lib/Protocols/DBus/Daemon/RequestNameReply.cs b/csharp/Lib/Protocols/DBus/Daemon/RequestNameReply.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Daemon/RequestNameReply.cs
rename to csharp/Lib/Protocols/DBus/Daemon/RequestNameReply.cs
diff --git a/csharp/lib/Protocols/DBus/Env.cs b/csharp/Lib/Protocols/DBus/Env.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Env.cs
rename to csharp/Lib/Protocols/DBus/Env.cs
diff --git a/csharp/lib/Protocols/DBus/Interop.cs b/csharp/Lib/Protocols/DBus/Interop.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Interop.cs
rename to csharp/Lib/Protocols/DBus/Interop.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Convert/StringToSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/StringToSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Convert/StringToSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/StringToSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Convert/TypeToSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/ObjectPath.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/ObjectPath.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/ObjectPath.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/ObjectPath.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Equality.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Equality.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Equality.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Equality.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Terminals.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Terminals.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Terminals.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.Terminals.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Signature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ArraySignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BasicTypeSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BooleanSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BooleanSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BooleanSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/BooleanSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ByteSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ByteSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ByteSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ByteSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/CompositeSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/CompositeSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/CompositeSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/CompositeSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ContainerTypeSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ContainerTypeSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ContainerTypeSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ContainerTypeSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DictionarySignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DictionarySignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DictionarySignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DictionarySignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DoubleSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DoubleSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DoubleSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/DoubleSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/EmptySignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/EmptySignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/EmptySignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/EmptySignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/FixedTypeSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/FixedTypeSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/FixedTypeSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/FixedTypeSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int16Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int16Signature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int16Signature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int16Signature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int32Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int32Signature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int32Signature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int32Signature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/Int64Signature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ObjectPathSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ObjectPathSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ObjectPathSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/ObjectPathSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/SignatureTypeSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/SignatureTypeSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/SignatureTypeSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/SignatureTypeSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringLikeTypeSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringLikeTypeSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringLikeTypeSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringLikeTypeSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StringSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StructSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StructSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StructSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/StructSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt16Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt16Signature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt16Signature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt16Signature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt32Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt32Signature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt32Signature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt32Signature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt64Signature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt64Signature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt64Signature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/UInt64Signature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/VariantSignature.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/VariantSignature.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/VariantSignature.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Signatures/Specialized/VariantSignature.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/DataTypes/Variant.cs b/csharp/Lib/Protocols/DBus/Protocol/DataTypes/Variant.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/DataTypes/Variant.cs
rename to csharp/Lib/Protocols/DBus/Protocol/DataTypes/Variant.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/Header/Endian.cs b/csharp/Lib/Protocols/DBus/Protocol/Header/Endian.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/Header/Endian.cs
rename to csharp/Lib/Protocols/DBus/Protocol/Header/Endian.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/Header/FieldCode.cs b/csharp/Lib/Protocols/DBus/Protocol/Header/FieldCode.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/Header/FieldCode.cs
rename to csharp/Lib/Protocols/DBus/Protocol/Header/FieldCode.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/Header/HeaderExtensions.cs b/csharp/Lib/Protocols/DBus/Protocol/Header/HeaderExtensions.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/Header/HeaderExtensions.cs
rename to csharp/Lib/Protocols/DBus/Protocol/Header/HeaderExtensions.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/Header/HeaderFlags.cs b/csharp/Lib/Protocols/DBus/Protocol/Header/HeaderFlags.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/Header/HeaderFlags.cs
rename to csharp/Lib/Protocols/DBus/Protocol/Header/HeaderFlags.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/Header/MessageType.cs b/csharp/Lib/Protocols/DBus/Protocol/Header/MessageType.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/Header/MessageType.cs
rename to csharp/Lib/Protocols/DBus/Protocol/Header/MessageType.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/Message.cs b/csharp/Lib/Protocols/DBus/Protocol/Message.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/Message.cs
rename to csharp/Lib/Protocols/DBus/Protocol/Message.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/Replies.cs b/csharp/Lib/Protocols/DBus/Protocol/Replies.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/Replies.cs
rename to csharp/Lib/Protocols/DBus/Protocol/Replies.cs
diff --git a/csharp/lib/Protocols/DBus/Protocol/SerialSource.cs b/csharp/Lib/Protocols/DBus/Protocol/SerialSource.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Protocol/SerialSource.cs
rename to csharp/Lib/Protocols/DBus/Protocol/SerialSource.cs
diff --git a/csharp/lib/Protocols/DBus/Transport/AuthenticationMethod.cs b/csharp/Lib/Protocols/DBus/Transport/AuthenticationMethod.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Transport/AuthenticationMethod.cs
rename to csharp/Lib/Protocols/DBus/Transport/AuthenticationMethod.cs
diff --git a/csharp/lib/Protocols/DBus/Transport/BufferedSocketReader.cs b/csharp/Lib/Protocols/DBus/Transport/BufferedSocketReader.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Transport/BufferedSocketReader.cs
rename to csharp/Lib/Protocols/DBus/Transport/BufferedSocketReader.cs
diff --git a/csharp/lib/Protocols/DBus/Transport/DBusBufferReader.cs b/csharp/Lib/Protocols/DBus/Transport/DBusBufferReader.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Transport/DBusBufferReader.cs
rename to csharp/Lib/Protocols/DBus/Transport/DBusBufferReader.cs
diff --git a/csharp/lib/Protocols/DBus/Transport/DBusBufferWriter.cs b/csharp/Lib/Protocols/DBus/Transport/DBusBufferWriter.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Transport/DBusBufferWriter.cs
rename to csharp/Lib/Protocols/DBus/Transport/DBusBufferWriter.cs
diff --git a/csharp/lib/Protocols/DBus/Transport/DBusSocket.cs b/csharp/Lib/Protocols/DBus/Transport/DBusSocket.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Transport/DBusSocket.cs
rename to csharp/Lib/Protocols/DBus/Transport/DBusSocket.cs
diff --git a/csharp/lib/Protocols/DBus/Utils/DisposableStack.cs b/csharp/Lib/Protocols/DBus/Utils/DisposableStack.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Utils/DisposableStack.cs
rename to csharp/Lib/Protocols/DBus/Utils/DisposableStack.cs
diff --git a/csharp/lib/Protocols/DBus/Utils/Extensions.cs b/csharp/Lib/Protocols/DBus/Utils/Extensions.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Utils/Extensions.cs
rename to csharp/Lib/Protocols/DBus/Utils/Extensions.cs
diff --git a/csharp/lib/Protocols/DBus/Utils/HexView.cs b/csharp/Lib/Protocols/DBus/Utils/HexView.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/Utils/HexView.cs
rename to csharp/Lib/Protocols/DBus/Utils/HexView.cs
diff --git a/csharp/lib/Protocols/DBus/WireFormat/DBusMeasureWriter.cs b/csharp/Lib/Protocols/DBus/WireFormat/DBusMeasureWriter.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/WireFormat/DBusMeasureWriter.cs
rename to csharp/Lib/Protocols/DBus/WireFormat/DBusMeasureWriter.cs
diff --git a/csharp/lib/Protocols/DBus/WireFormat/DBusReader.cs b/csharp/Lib/Protocols/DBus/WireFormat/DBusReader.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/WireFormat/DBusReader.cs
rename to csharp/Lib/Protocols/DBus/WireFormat/DBusReader.cs
diff --git a/csharp/lib/Protocols/DBus/WireFormat/DBusSocketReader.cs b/csharp/Lib/Protocols/DBus/WireFormat/DBusSocketReader.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/WireFormat/DBusSocketReader.cs
rename to csharp/Lib/Protocols/DBus/WireFormat/DBusSocketReader.cs
diff --git a/csharp/lib/Protocols/DBus/WireFormat/DBusWriter.cs b/csharp/Lib/Protocols/DBus/WireFormat/DBusWriter.cs
similarity index 100%
rename from csharp/lib/Protocols/DBus/WireFormat/DBusWriter.cs
rename to csharp/Lib/Protocols/DBus/WireFormat/DBusWriter.cs
diff --git a/csharp/lib/Protocols/Modbus/Clients/ModbusClient.cs b/csharp/Lib/Protocols/Modbus/Clients/ModbusClient.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Clients/ModbusClient.cs
rename to csharp/Lib/Protocols/Modbus/Clients/ModbusClient.cs
diff --git a/csharp/lib/Protocols/Modbus/Clients/ModbusRtuClient.cs b/csharp/Lib/Protocols/Modbus/Clients/ModbusRtuClient.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Clients/ModbusRtuClient.cs
rename to csharp/Lib/Protocols/Modbus/Clients/ModbusRtuClient.cs
diff --git a/csharp/lib/Protocols/Modbus/Clients/ModbusTcpClient.cs b/csharp/Lib/Protocols/Modbus/Clients/ModbusTcpClient.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Clients/ModbusTcpClient.cs
rename to csharp/Lib/Protocols/Modbus/Clients/ModbusTcpClient.cs
diff --git a/csharp/lib/Protocols/Modbus/Connections/ModbusConnection.cs b/csharp/Lib/Protocols/Modbus/Connections/ModbusConnection.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Connections/ModbusConnection.cs
rename to csharp/Lib/Protocols/Modbus/Connections/ModbusConnection.cs
diff --git a/csharp/lib/Protocols/Modbus/Connections/ModbusSerialConnection.cs b/csharp/Lib/Protocols/Modbus/Connections/ModbusSerialConnection.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Connections/ModbusSerialConnection.cs
rename to csharp/Lib/Protocols/Modbus/Connections/ModbusSerialConnection.cs
diff --git a/csharp/lib/Protocols/Modbus/Connections/ModbusTcpConnection.cs b/csharp/Lib/Protocols/Modbus/Connections/ModbusTcpConnection.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Connections/ModbusTcpConnection.cs
rename to csharp/Lib/Protocols/Modbus/Connections/ModbusTcpConnection.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/Endianness.cs b/csharp/Lib/Protocols/Modbus/Conversions/Endianness.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/Endianness.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/Endianness.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Bit.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Bit.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Bit.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Bit.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Boolean.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Boolean.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Boolean.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Boolean.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Bytes.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Bytes.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Bytes.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Bytes.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Int16.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Int16.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Int16.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Int16.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Int32.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Int32.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Int32.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Int32.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Single.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Single.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.Single.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.Single.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.String.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.String.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.String.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.String.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt16.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt16.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt16.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt16.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt32.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt32.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt32.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.UInt32.cs
diff --git a/csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.cs b/csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Conversions/ModbusRegisters.cs
rename to csharp/Lib/Protocols/Modbus/Conversions/ModbusRegisters.cs
diff --git a/csharp/lib/Protocols/Modbus/Modbus.csproj b/csharp/Lib/Protocols/Modbus/Modbus.csproj
similarity index 82%
rename from csharp/lib/Protocols/Modbus/Modbus.csproj
rename to csharp/Lib/Protocols/Modbus/Modbus.csproj
index d40e6dc28..460195f09 100644
--- a/csharp/lib/Protocols/Modbus/Modbus.csproj
+++ b/csharp/Lib/Protocols/Modbus/Modbus.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Protocols/Modbus/Protocol/ExceptionCode.cs b/csharp/Lib/Protocols/Modbus/Protocol/ExceptionCode.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/ExceptionCode.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/ExceptionCode.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Exceptions.cs b/csharp/Lib/Protocols/Modbus/Protocol/Exceptions.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Exceptions.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Exceptions.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/Accessors.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/Accessors.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/Accessors.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/Accessors.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbAddress.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbAddress.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbAddress.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbAddress.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbBits.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbBits.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbBits.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbBits.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte{T}.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte{T}.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte{T}.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbByte{T}.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWord.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWord.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWord.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWord.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWords.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWords.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWords.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Accessors/MbWords.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadDiscreteInputsCommandFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadDiscreteInputsCommandFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadDiscreteInputsCommandFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadDiscreteInputsCommandFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadHoldingRegistersCommandFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadHoldingRegistersCommandFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadHoldingRegistersCommandFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadHoldingRegistersCommandFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadInputRegistersCommandFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadInputRegistersCommandFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadInputRegistersCommandFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadInputRegistersCommandFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadWriteRegistersCommandFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadWriteRegistersCommandFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/ReadWriteRegistersCommandFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/ReadWriteRegistersCommandFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/WriteCoilsCommandFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/WriteCoilsCommandFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/WriteCoilsCommandFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/WriteCoilsCommandFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/WriteRegistersCommandFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/WriteRegistersCommandFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Commands/WriteRegistersCommandFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Commands/WriteRegistersCommandFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Constants.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Constants.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Constants.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Constants.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/ModbusFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/ModbusFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/ModbusFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/ModbusFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ErrorResponseFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ErrorResponseFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ErrorResponseFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ErrorResponseFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadDiscreteInputResponseFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadDiscreteInputResponseFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadDiscreteInputResponseFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadDiscreteInputResponseFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadHoldingRegistersResponseFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadHoldingRegistersResponseFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadHoldingRegistersResponseFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadHoldingRegistersResponseFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadInputRegistersResponseFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadInputRegistersResponseFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadInputRegistersResponseFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadInputRegistersResponseFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadWriteRegistersCommandFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadWriteRegistersCommandFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/ReadWriteRegistersCommandFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/ReadWriteRegistersCommandFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/WriteCoilsResponseFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/WriteCoilsResponseFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/WriteCoilsResponseFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/WriteCoilsResponseFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/WriteRegistersResponseFrame.cs b/csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/WriteRegistersResponseFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/Frames/Replies/WriteRegistersResponseFrame.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/Frames/Replies/WriteRegistersResponseFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Protocol/FunctionCode.cs b/csharp/Lib/Protocols/Modbus/Protocol/FunctionCode.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Protocol/FunctionCode.cs
rename to csharp/Lib/Protocols/Modbus/Protocol/FunctionCode.cs
diff --git a/csharp/lib/Protocols/Modbus/Tcp/MbapHeader.cs b/csharp/Lib/Protocols/Modbus/Tcp/MbapHeader.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Tcp/MbapHeader.cs
rename to csharp/Lib/Protocols/Modbus/Tcp/MbapHeader.cs
diff --git a/csharp/lib/Protocols/Modbus/Tcp/ModbusTcpFrame.cs b/csharp/Lib/Protocols/Modbus/Tcp/ModbusTcpFrame.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Tcp/ModbusTcpFrame.cs
rename to csharp/Lib/Protocols/Modbus/Tcp/ModbusTcpFrame.cs
diff --git a/csharp/lib/Protocols/Modbus/Util/ArraySegmentExtensions.cs b/csharp/Lib/Protocols/Modbus/Util/ArraySegmentExtensions.cs
similarity index 100%
rename from csharp/lib/Protocols/Modbus/Util/ArraySegmentExtensions.cs
rename to csharp/Lib/Protocols/Modbus/Util/ArraySegmentExtensions.cs
diff --git a/csharp/lib/S3/DataRec.cs b/csharp/Lib/S3/DataRec.cs
similarity index 100%
rename from csharp/lib/S3/DataRec.cs
rename to csharp/Lib/S3/DataRec.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Delegates/ReadRecord.cs b/csharp/Lib/S3/Drivers/Internal/Delegates/ReadRecord.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Delegates/ReadRecord.cs
rename to csharp/Lib/S3/Drivers/Internal/Delegates/ReadRecord.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Delegates/WriteRecord.cs b/csharp/Lib/S3/Drivers/Internal/Delegates/WriteRecord.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Delegates/WriteRecord.cs
rename to csharp/Lib/S3/Drivers/Internal/Delegates/WriteRecord.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Reader.cs b/csharp/Lib/S3/Drivers/Internal/Reader.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Reader.cs
rename to csharp/Lib/S3/Drivers/Internal/Reader.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Reader.public.cs b/csharp/Lib/S3/Drivers/Internal/Reader.public.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Reader.public.cs
rename to csharp/Lib/S3/Drivers/Internal/Reader.public.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Util/Aggregator.cs b/csharp/Lib/S3/Drivers/Internal/Util/Aggregator.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Util/Aggregator.cs
rename to csharp/Lib/S3/Drivers/Internal/Util/Aggregator.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Util/Sampler.cs b/csharp/Lib/S3/Drivers/Internal/Util/Sampler.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Util/Sampler.cs
rename to csharp/Lib/S3/Drivers/Internal/Util/Sampler.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Writer.cs b/csharp/Lib/S3/Drivers/Internal/Writer.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Writer.cs
rename to csharp/Lib/S3/Drivers/Internal/Writer.cs
diff --git a/csharp/lib/S3/Drivers/Internal/Writer.public.cs b/csharp/Lib/S3/Drivers/Internal/Writer.public.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/Internal/Writer.public.cs
rename to csharp/Lib/S3/Drivers/Internal/Writer.public.cs
diff --git a/csharp/lib/S3/Drivers/MemoryDriver.cs b/csharp/Lib/S3/Drivers/MemoryDriver.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/MemoryDriver.cs
rename to csharp/Lib/S3/Drivers/MemoryDriver.cs
diff --git a/csharp/lib/S3/Drivers/S3Config.cs b/csharp/Lib/S3/Drivers/S3Config.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/S3Config.cs
rename to csharp/Lib/S3/Drivers/S3Config.cs
diff --git a/csharp/lib/S3/Drivers/S3Driver.cs b/csharp/Lib/S3/Drivers/S3Driver.cs
similarity index 100%
rename from csharp/lib/S3/Drivers/S3Driver.cs
rename to csharp/Lib/S3/Drivers/S3Driver.cs
diff --git a/csharp/lib/S3/Metadata/AggregationLevel.cs b/csharp/Lib/S3/Metadata/AggregationLevel.cs
similarity index 100%
rename from csharp/lib/S3/Metadata/AggregationLevel.cs
rename to csharp/Lib/S3/Metadata/AggregationLevel.cs
diff --git a/csharp/lib/S3/Metadata/FieldType.cs b/csharp/Lib/S3/Metadata/FieldType.cs
similarity index 100%
rename from csharp/lib/S3/Metadata/FieldType.cs
rename to csharp/Lib/S3/Metadata/FieldType.cs
diff --git a/csharp/lib/S3/Program.cs b/csharp/Lib/S3/Program.cs
similarity index 100%
rename from csharp/lib/S3/Program.cs
rename to csharp/Lib/S3/Program.cs
diff --git a/csharp/lib/S3/Records/Fields/Field.cs b/csharp/Lib/S3/Records/Fields/Field.cs
similarity index 100%
rename from csharp/lib/S3/Records/Fields/Field.cs
rename to csharp/Lib/S3/Records/Fields/Field.cs
diff --git a/csharp/lib/S3/Records/Fields/NumberField.cs b/csharp/Lib/S3/Records/Fields/NumberField.cs
similarity index 100%
rename from csharp/lib/S3/Records/Fields/NumberField.cs
rename to csharp/Lib/S3/Records/Fields/NumberField.cs
diff --git a/csharp/lib/S3/Records/Fields/TextField.cs b/csharp/Lib/S3/Records/Fields/TextField.cs
similarity index 100%
rename from csharp/lib/S3/Records/Fields/TextField.cs
rename to csharp/Lib/S3/Records/Fields/TextField.cs
diff --git a/csharp/lib/S3/Records/Fields/TextFrequency.cs b/csharp/Lib/S3/Records/Fields/TextFrequency.cs
similarity index 100%
rename from csharp/lib/S3/Records/Fields/TextFrequency.cs
rename to csharp/Lib/S3/Records/Fields/TextFrequency.cs
diff --git a/csharp/lib/S3/Records/Fields/UnitAttribute.cs b/csharp/Lib/S3/Records/Fields/UnitAttribute.cs
similarity index 100%
rename from csharp/lib/S3/Records/Fields/UnitAttribute.cs
rename to csharp/Lib/S3/Records/Fields/UnitAttribute.cs
diff --git a/csharp/lib/S3/Records/Fields/WithUnit.cs b/csharp/Lib/S3/Records/Fields/WithUnit.cs
similarity index 100%
rename from csharp/lib/S3/Records/Fields/WithUnit.cs
rename to csharp/Lib/S3/Records/Fields/WithUnit.cs
diff --git a/csharp/lib/S3/Records/Operations/Aggregation.cs b/csharp/Lib/S3/Records/Operations/Aggregation.cs
similarity index 100%
rename from csharp/lib/S3/Records/Operations/Aggregation.cs
rename to csharp/Lib/S3/Records/Operations/Aggregation.cs
diff --git a/csharp/lib/S3/Records/Operations/Conversion.cs b/csharp/Lib/S3/Records/Operations/Conversion.cs
similarity index 100%
rename from csharp/lib/S3/Records/Operations/Conversion.cs
rename to csharp/Lib/S3/Records/Operations/Conversion.cs
diff --git a/csharp/lib/S3/Records/Record.cs b/csharp/Lib/S3/Records/Record.cs
similarity index 100%
rename from csharp/lib/S3/Records/Record.cs
rename to csharp/Lib/S3/Records/Record.cs
diff --git a/csharp/lib/S3/Records/Serialization/FieldTag.cs b/csharp/Lib/S3/Records/Serialization/FieldTag.cs
similarity index 100%
rename from csharp/lib/S3/Records/Serialization/FieldTag.cs
rename to csharp/Lib/S3/Records/Serialization/FieldTag.cs
diff --git a/csharp/lib/S3/Records/Serialization/Parser.cs b/csharp/Lib/S3/Records/Serialization/Parser.cs
similarity index 100%
rename from csharp/lib/S3/Records/Serialization/Parser.cs
rename to csharp/Lib/S3/Records/Serialization/Parser.cs
diff --git a/csharp/lib/S3/Records/Serialization/Serializer.cs b/csharp/Lib/S3/Records/Serialization/Serializer.cs
similarity index 100%
rename from csharp/lib/S3/Records/Serialization/Serializer.cs
rename to csharp/Lib/S3/Records/Serialization/Serializer.cs
diff --git a/csharp/lib/S3/Records/Specialized/AggregatedRecord.cs b/csharp/Lib/S3/Records/Specialized/AggregatedRecord.cs
similarity index 100%
rename from csharp/lib/S3/Records/Specialized/AggregatedRecord.cs
rename to csharp/Lib/S3/Records/Specialized/AggregatedRecord.cs
diff --git a/csharp/lib/S3/Records/Specialized/TimeStampedRecord.cs b/csharp/Lib/S3/Records/Specialized/TimeStampedRecord.cs
similarity index 100%
rename from csharp/lib/S3/Records/Specialized/TimeStampedRecord.cs
rename to csharp/Lib/S3/Records/Specialized/TimeStampedRecord.cs
diff --git a/csharp/lib/S3/S3.csproj b/csharp/Lib/S3/S3.csproj
similarity index 60%
rename from csharp/lib/S3/S3.csproj
rename to csharp/Lib/S3/S3.csproj
index 0da1127e5..946c4841f 100644
--- a/csharp/lib/S3/S3.csproj
+++ b/csharp/Lib/S3/S3.csproj
@@ -1,10 +1,10 @@
-
+
-
-
+
+
diff --git a/csharp/lib/S3/Serialization/JsonConverters.cs b/csharp/Lib/S3/Serialization/JsonConverters.cs
similarity index 100%
rename from csharp/lib/S3/Serialization/JsonConverters.cs
rename to csharp/Lib/S3/Serialization/JsonConverters.cs
diff --git a/csharp/lib/StatusApi/Connections/DcConnection.cs b/csharp/Lib/StatusApi/Connections/DcConnection.cs
similarity index 100%
rename from csharp/lib/StatusApi/Connections/DcConnection.cs
rename to csharp/Lib/StatusApi/Connections/DcConnection.cs
diff --git a/csharp/lib/StatusApi/Connections/SinglePhaseAcConnection.cs b/csharp/Lib/StatusApi/Connections/SinglePhaseAcConnection.cs
similarity index 100%
rename from csharp/lib/StatusApi/Connections/SinglePhaseAcConnection.cs
rename to csharp/Lib/StatusApi/Connections/SinglePhaseAcConnection.cs
diff --git a/csharp/lib/StatusApi/Connections/ThreePhaseAcConnection.cs b/csharp/Lib/StatusApi/Connections/ThreePhaseAcConnection.cs
similarity index 100%
rename from csharp/lib/StatusApi/Connections/ThreePhaseAcConnection.cs
rename to csharp/Lib/StatusApi/Connections/ThreePhaseAcConnection.cs
diff --git a/csharp/lib/StatusApi/DeviceType.cs b/csharp/Lib/StatusApi/DeviceType.cs
similarity index 100%
rename from csharp/lib/StatusApi/DeviceType.cs
rename to csharp/Lib/StatusApi/DeviceType.cs
diff --git a/csharp/lib/StatusApi/Devices/Battery.cs b/csharp/Lib/StatusApi/Devices/Battery.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/Battery.cs
rename to csharp/Lib/StatusApi/Devices/Battery.cs
diff --git a/csharp/lib/StatusApi/Devices/DcDcConverter.cs b/csharp/Lib/StatusApi/Devices/DcDcConverter.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/DcDcConverter.cs
rename to csharp/Lib/StatusApi/Devices/DcDcConverter.cs
diff --git a/csharp/lib/StatusApi/Devices/DcDevice.cs b/csharp/Lib/StatusApi/Devices/DcDevice.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/DcDevice.cs
rename to csharp/Lib/StatusApi/Devices/DcDevice.cs
diff --git a/csharp/lib/StatusApi/Devices/Device.cs b/csharp/Lib/StatusApi/Devices/Device.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/Device.cs
rename to csharp/Lib/StatusApi/Devices/Device.cs
diff --git a/csharp/lib/StatusApi/Devices/GridMeter.cs b/csharp/Lib/StatusApi/Devices/GridMeter.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/GridMeter.cs
rename to csharp/Lib/StatusApi/Devices/GridMeter.cs
diff --git a/csharp/lib/StatusApi/Devices/IPvCoupledDevice.cs b/csharp/Lib/StatusApi/Devices/IPvCoupledDevice.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/IPvCoupledDevice.cs
rename to csharp/Lib/StatusApi/Devices/IPvCoupledDevice.cs
diff --git a/csharp/lib/StatusApi/Devices/Mppt.cs b/csharp/Lib/StatusApi/Devices/Mppt.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/Mppt.cs
rename to csharp/Lib/StatusApi/Devices/Mppt.cs
diff --git a/csharp/lib/StatusApi/Devices/SinglePhaseAcDevice.cs b/csharp/Lib/StatusApi/Devices/SinglePhaseAcDevice.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/SinglePhaseAcDevice.cs
rename to csharp/Lib/StatusApi/Devices/SinglePhaseAcDevice.cs
diff --git a/csharp/lib/StatusApi/Devices/SinglePhaseInverter.cs b/csharp/Lib/StatusApi/Devices/SinglePhaseInverter.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/SinglePhaseInverter.cs
rename to csharp/Lib/StatusApi/Devices/SinglePhaseInverter.cs
diff --git a/csharp/lib/StatusApi/Devices/SinglePhasePvInverter.cs b/csharp/Lib/StatusApi/Devices/SinglePhasePvInverter.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/SinglePhasePvInverter.cs
rename to csharp/Lib/StatusApi/Devices/SinglePhasePvInverter.cs
diff --git a/csharp/lib/StatusApi/Devices/ThreePhaseAcDevice.cs b/csharp/Lib/StatusApi/Devices/ThreePhaseAcDevice.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/ThreePhaseAcDevice.cs
rename to csharp/Lib/StatusApi/Devices/ThreePhaseAcDevice.cs
diff --git a/csharp/lib/StatusApi/Devices/ThreePhaseInverter.cs b/csharp/Lib/StatusApi/Devices/ThreePhaseInverter.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/ThreePhaseInverter.cs
rename to csharp/Lib/StatusApi/Devices/ThreePhaseInverter.cs
diff --git a/csharp/lib/StatusApi/Devices/ThreePhasePvInverter.cs b/csharp/Lib/StatusApi/Devices/ThreePhasePvInverter.cs
similarity index 100%
rename from csharp/lib/StatusApi/Devices/ThreePhasePvInverter.cs
rename to csharp/Lib/StatusApi/Devices/ThreePhasePvInverter.cs
diff --git a/csharp/lib/StatusApi/Phases/AcPhase.cs b/csharp/Lib/StatusApi/Phases/AcPhase.cs
similarity index 100%
rename from csharp/lib/StatusApi/Phases/AcPhase.cs
rename to csharp/Lib/StatusApi/Phases/AcPhase.cs
diff --git a/csharp/lib/StatusApi/Phases/Phase.cs b/csharp/Lib/StatusApi/Phases/Phase.cs
similarity index 100%
rename from csharp/lib/StatusApi/Phases/Phase.cs
rename to csharp/Lib/StatusApi/Phases/Phase.cs
diff --git a/csharp/lib/StatusApi/StatusApi.csproj b/csharp/Lib/StatusApi/StatusApi.csproj
similarity index 75%
rename from csharp/lib/StatusApi/StatusApi.csproj
rename to csharp/Lib/StatusApi/StatusApi.csproj
index bb446855b..f1e4bc0f8 100644
--- a/csharp/lib/StatusApi/StatusApi.csproj
+++ b/csharp/Lib/StatusApi/StatusApi.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/StatusApi/Utils.cs b/csharp/Lib/StatusApi/Utils.cs
similarity index 100%
rename from csharp/lib/StatusApi/Utils.cs
rename to csharp/Lib/StatusApi/Utils.cs
diff --git a/csharp/lib/StatusData/Current.cs b/csharp/Lib/StatusData/Current.cs
similarity index 100%
rename from csharp/lib/StatusData/Current.cs
rename to csharp/Lib/StatusData/Current.cs
diff --git a/csharp/lib/StatusData/Json/Converters.cs b/csharp/Lib/StatusData/Json/Converters.cs
similarity index 100%
rename from csharp/lib/StatusData/Json/Converters.cs
rename to csharp/Lib/StatusData/Json/Converters.cs
diff --git a/csharp/lib/StatusData/Json/CurrentConverter.cs b/csharp/Lib/StatusData/Json/CurrentConverter.cs
similarity index 100%
rename from csharp/lib/StatusData/Json/CurrentConverter.cs
rename to csharp/Lib/StatusData/Json/CurrentConverter.cs
diff --git a/csharp/lib/StatusData/Json/PowerConverter.cs b/csharp/Lib/StatusData/Json/PowerConverter.cs
similarity index 100%
rename from csharp/lib/StatusData/Json/PowerConverter.cs
rename to csharp/Lib/StatusData/Json/PowerConverter.cs
diff --git a/csharp/lib/StatusData/Json/ResistanceConverter.cs b/csharp/Lib/StatusData/Json/ResistanceConverter.cs
similarity index 100%
rename from csharp/lib/StatusData/Json/ResistanceConverter.cs
rename to csharp/Lib/StatusData/Json/ResistanceConverter.cs
diff --git a/csharp/lib/StatusData/Json/VoltageConverter.cs b/csharp/Lib/StatusData/Json/VoltageConverter.cs
similarity index 100%
rename from csharp/lib/StatusData/Json/VoltageConverter.cs
rename to csharp/Lib/StatusData/Json/VoltageConverter.cs
diff --git a/csharp/lib/StatusData/Power.cs b/csharp/Lib/StatusData/Power.cs
similarity index 100%
rename from csharp/lib/StatusData/Power.cs
rename to csharp/Lib/StatusData/Power.cs
diff --git a/csharp/lib/StatusData/Resistance.cs b/csharp/Lib/StatusData/Resistance.cs
similarity index 100%
rename from csharp/lib/StatusData/Resistance.cs
rename to csharp/Lib/StatusData/Resistance.cs
diff --git a/csharp/lib/StatusData/State.cs b/csharp/Lib/StatusData/State.cs
similarity index 100%
rename from csharp/lib/StatusData/State.cs
rename to csharp/Lib/StatusData/State.cs
diff --git a/csharp/lib/StatusData/StatusData.csproj b/csharp/Lib/StatusData/StatusData.csproj
similarity index 77%
rename from csharp/lib/StatusData/StatusData.csproj
rename to csharp/Lib/StatusData/StatusData.csproj
index 22522002f..69d164c4f 100644
--- a/csharp/lib/StatusData/StatusData.csproj
+++ b/csharp/Lib/StatusData/StatusData.csproj
@@ -1,5 +1,5 @@
-
+
Library
diff --git a/csharp/lib/StatusData/Units.cs b/csharp/Lib/StatusData/Units.cs
similarity index 100%
rename from csharp/lib/StatusData/Units.cs
rename to csharp/Lib/StatusData/Units.cs
diff --git a/csharp/lib/StatusData/Voltage.cs b/csharp/Lib/StatusData/Voltage.cs
similarity index 100%
rename from csharp/lib/StatusData/Voltage.cs
rename to csharp/Lib/StatusData/Voltage.cs
diff --git a/csharp/lib/SysTools/Edges/RemoteCommandToProcess.cs b/csharp/Lib/SysTools/Edges/RemoteCommandToProcess.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/RemoteCommandToProcess.cs
rename to csharp/Lib/SysTools/Edges/RemoteCommandToProcess.cs
diff --git a/csharp/lib/SysTools/Edges/RemotePathToRemoteCommand.cs b/csharp/Lib/SysTools/Edges/RemotePathToRemoteCommand.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/RemotePathToRemoteCommand.cs
rename to csharp/Lib/SysTools/Edges/RemotePathToRemoteCommand.cs
diff --git a/csharp/lib/SysTools/Edges/SshHostToRemoteCommand.cs b/csharp/Lib/SysTools/Edges/SshHostToRemoteCommand.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/SshHostToRemoteCommand.cs
rename to csharp/Lib/SysTools/Edges/SshHostToRemoteCommand.cs
diff --git a/csharp/lib/SysTools/Edges/SshHostToRemotePath.cs b/csharp/Lib/SysTools/Edges/SshHostToRemotePath.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/SshHostToRemotePath.cs
rename to csharp/Lib/SysTools/Edges/SshHostToRemotePath.cs
diff --git a/csharp/lib/SysTools/Edges/StringToCommand.cs b/csharp/Lib/SysTools/Edges/StringToCommand.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/StringToCommand.cs
rename to csharp/Lib/SysTools/Edges/StringToCommand.cs
diff --git a/csharp/lib/SysTools/Edges/StringToProcess.cs b/csharp/Lib/SysTools/Edges/StringToProcess.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/StringToProcess.cs
rename to csharp/Lib/SysTools/Edges/StringToProcess.cs
diff --git a/csharp/lib/SysTools/Edges/StringToRemotePath.cs b/csharp/Lib/SysTools/Edges/StringToRemotePath.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/StringToRemotePath.cs
rename to csharp/Lib/SysTools/Edges/StringToRemotePath.cs
diff --git a/csharp/lib/SysTools/Edges/StringToSysPath.cs b/csharp/Lib/SysTools/Edges/StringToSysPath.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/StringToSysPath.cs
rename to csharp/Lib/SysTools/Edges/StringToSysPath.cs
diff --git a/csharp/lib/SysTools/Edges/SysCommandToProcess.cs b/csharp/Lib/SysTools/Edges/SysCommandToProcess.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/SysCommandToProcess.cs
rename to csharp/Lib/SysTools/Edges/SysCommandToProcess.cs
diff --git a/csharp/lib/SysTools/Edges/SysCommandToRemoteCommand.cs b/csharp/Lib/SysTools/Edges/SysCommandToRemoteCommand.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/SysCommandToRemoteCommand.cs
rename to csharp/Lib/SysTools/Edges/SysCommandToRemoteCommand.cs
diff --git a/csharp/lib/SysTools/Edges/SysPathToProcess.cs b/csharp/Lib/SysTools/Edges/SysPathToProcess.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/SysPathToProcess.cs
rename to csharp/Lib/SysTools/Edges/SysPathToProcess.cs
diff --git a/csharp/lib/SysTools/Edges/SysPathToRemotePath.cs b/csharp/Lib/SysTools/Edges/SysPathToRemotePath.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/SysPathToRemotePath.cs
rename to csharp/Lib/SysTools/Edges/SysPathToRemotePath.cs
diff --git a/csharp/lib/SysTools/Edges/SysPathToSysCommand.cs b/csharp/Lib/SysTools/Edges/SysPathToSysCommand.cs
similarity index 100%
rename from csharp/lib/SysTools/Edges/SysPathToSysCommand.cs
rename to csharp/Lib/SysTools/Edges/SysPathToSysCommand.cs
diff --git a/csharp/lib/SysTools/FileIo.cs b/csharp/Lib/SysTools/FileIo.cs
similarity index 100%
rename from csharp/lib/SysTools/FileIo.cs
rename to csharp/Lib/SysTools/FileIo.cs
diff --git a/csharp/lib/SysTools/Process/AsyncProcess.cs b/csharp/Lib/SysTools/Process/AsyncProcess.cs
similarity index 100%
rename from csharp/lib/SysTools/Process/AsyncProcess.cs
rename to csharp/Lib/SysTools/Process/AsyncProcess.cs
diff --git a/csharp/lib/SysTools/Process/ProcessResult.cs b/csharp/Lib/SysTools/Process/ProcessResult.cs
similarity index 100%
rename from csharp/lib/SysTools/Process/ProcessResult.cs
rename to csharp/Lib/SysTools/Process/ProcessResult.cs
diff --git a/csharp/lib/SysTools/Process/SyncProcess.cs b/csharp/Lib/SysTools/Process/SyncProcess.cs
similarity index 100%
rename from csharp/lib/SysTools/Process/SyncProcess.cs
rename to csharp/Lib/SysTools/Process/SyncProcess.cs
diff --git a/csharp/lib/SysTools/Remote/RemoteCommand.cs b/csharp/Lib/SysTools/Remote/RemoteCommand.cs
similarity index 100%
rename from csharp/lib/SysTools/Remote/RemoteCommand.cs
rename to csharp/Lib/SysTools/Remote/RemoteCommand.cs
diff --git a/csharp/lib/SysTools/Remote/RemoteFileIo.cs b/csharp/Lib/SysTools/Remote/RemoteFileIo.cs
similarity index 100%
rename from csharp/lib/SysTools/Remote/RemoteFileIo.cs
rename to csharp/Lib/SysTools/Remote/RemoteFileIo.cs
diff --git a/csharp/lib/SysTools/Remote/RemotePath.cs b/csharp/Lib/SysTools/Remote/RemotePath.cs
similarity index 100%
rename from csharp/lib/SysTools/Remote/RemotePath.cs
rename to csharp/Lib/SysTools/Remote/RemotePath.cs
diff --git a/csharp/lib/SysTools/Remote/SshHost.cs b/csharp/Lib/SysTools/Remote/SshHost.cs
similarity index 100%
rename from csharp/lib/SysTools/Remote/SshHost.cs
rename to csharp/Lib/SysTools/Remote/SshHost.cs
diff --git a/csharp/lib/SysTools/SysCommand.cs b/csharp/Lib/SysTools/SysCommand.cs
similarity index 100%
rename from csharp/lib/SysTools/SysCommand.cs
rename to csharp/Lib/SysTools/SysCommand.cs
diff --git a/csharp/lib/SysTools/SysDirs.cs b/csharp/Lib/SysTools/SysDirs.cs
similarity index 100%
rename from csharp/lib/SysTools/SysDirs.cs
rename to csharp/Lib/SysTools/SysDirs.cs
diff --git a/csharp/lib/SysTools/SysPath.cs b/csharp/Lib/SysTools/SysPath.cs
similarity index 100%
rename from csharp/lib/SysTools/SysPath.cs
rename to csharp/Lib/SysTools/SysPath.cs
diff --git a/csharp/lib/SysTools/SysTools.csproj b/csharp/Lib/SysTools/SysTools.csproj
similarity index 75%
rename from csharp/lib/SysTools/SysTools.csproj
rename to csharp/Lib/SysTools/SysTools.csproj
index aa11972a1..9fd38651b 100644
--- a/csharp/lib/SysTools/SysTools.csproj
+++ b/csharp/Lib/SysTools/SysTools.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/SysTools/Utils/ConsoleUtils.cs b/csharp/Lib/SysTools/Utils/ConsoleUtils.cs
similarity index 100%
rename from csharp/lib/SysTools/Utils/ConsoleUtils.cs
rename to csharp/Lib/SysTools/Utils/ConsoleUtils.cs
diff --git a/csharp/lib/SysTools/Utils/EnumerableUtils.cs b/csharp/Lib/SysTools/Utils/EnumerableUtils.cs
similarity index 100%
rename from csharp/lib/SysTools/Utils/EnumerableUtils.cs
rename to csharp/Lib/SysTools/Utils/EnumerableUtils.cs
diff --git a/csharp/lib/SysTools/Utils/StringUtils.cs b/csharp/Lib/SysTools/Utils/StringUtils.cs
similarity index 100%
rename from csharp/lib/SysTools/Utils/StringUtils.cs
rename to csharp/Lib/SysTools/Utils/StringUtils.cs
diff --git a/csharp/lib/SysTools/Utils/Utils.cs b/csharp/Lib/SysTools/Utils/Utils.cs
similarity index 100%
rename from csharp/lib/SysTools/Utils/Utils.cs
rename to csharp/Lib/SysTools/Utils/Utils.cs
diff --git a/csharp/Lib/Time/Time.csproj b/csharp/Lib/Time/Time.csproj
new file mode 100644
index 000000000..e971a1f7d
--- /dev/null
+++ b/csharp/Lib/Time/Time.csproj
@@ -0,0 +1,3 @@
+
+
+
diff --git a/csharp/lib/Time/Unix/UnixTime.Compare.cs b/csharp/Lib/Time/Unix/UnixTime.Compare.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTime.Compare.cs
rename to csharp/Lib/Time/Unix/UnixTime.Compare.cs
diff --git a/csharp/lib/Time/Unix/UnixTime.Constructors.cs b/csharp/Lib/Time/Unix/UnixTime.Constructors.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTime.Constructors.cs
rename to csharp/Lib/Time/Unix/UnixTime.Constructors.cs
diff --git a/csharp/lib/Time/Unix/UnixTime.Converters.cs b/csharp/Lib/Time/Unix/UnixTime.Converters.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTime.Converters.cs
rename to csharp/Lib/Time/Unix/UnixTime.Converters.cs
diff --git a/csharp/lib/Time/Unix/UnixTime.Operators.cs b/csharp/Lib/Time/Unix/UnixTime.Operators.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTime.Operators.cs
rename to csharp/Lib/Time/Unix/UnixTime.Operators.cs
diff --git a/csharp/lib/Time/Unix/UnixTime.Overrides.cs b/csharp/Lib/Time/Unix/UnixTime.Overrides.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTime.Overrides.cs
rename to csharp/Lib/Time/Unix/UnixTime.Overrides.cs
diff --git a/csharp/lib/Time/Unix/UnixTime.cs b/csharp/Lib/Time/Unix/UnixTime.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTime.cs
rename to csharp/Lib/Time/Unix/UnixTime.cs
diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Compare.cs b/csharp/Lib/Time/Unix/UnixTimeDelta.Compare.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTimeDelta.Compare.cs
rename to csharp/Lib/Time/Unix/UnixTimeDelta.Compare.cs
diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Constructors.cs b/csharp/Lib/Time/Unix/UnixTimeDelta.Constructors.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTimeDelta.Constructors.cs
rename to csharp/Lib/Time/Unix/UnixTimeDelta.Constructors.cs
diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Operators.cs b/csharp/Lib/Time/Unix/UnixTimeDelta.Operators.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTimeDelta.Operators.cs
rename to csharp/Lib/Time/Unix/UnixTimeDelta.Operators.cs
diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Overrides.cs b/csharp/Lib/Time/Unix/UnixTimeDelta.Overrides.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTimeDelta.Overrides.cs
rename to csharp/Lib/Time/Unix/UnixTimeDelta.Overrides.cs
diff --git a/csharp/lib/Time/Unix/UnixTimeDeltaExtensions.cs b/csharp/Lib/Time/Unix/UnixTimeDeltaExtensions.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTimeDeltaExtensions.cs
rename to csharp/Lib/Time/Unix/UnixTimeDeltaExtensions.cs
diff --git a/csharp/lib/Time/Unix/UnixTimeSpan.cs b/csharp/Lib/Time/Unix/UnixTimeSpan.cs
similarity index 100%
rename from csharp/lib/Time/Unix/UnixTimeSpan.cs
rename to csharp/Lib/Time/Unix/UnixTimeSpan.cs
diff --git a/csharp/lib/Utils/ArrayExtensions.cs b/csharp/Lib/Utils/ArrayExtensions.cs
similarity index 100%
rename from csharp/lib/Utils/ArrayExtensions.cs
rename to csharp/Lib/Utils/ArrayExtensions.cs
diff --git a/csharp/lib/Utils/AsyncDelegates.cs b/csharp/Lib/Utils/AsyncDelegates.cs
similarity index 100%
rename from csharp/lib/Utils/AsyncDelegates.cs
rename to csharp/Lib/Utils/AsyncDelegates.cs
diff --git a/csharp/lib/Utils/AsyncEnumerableEx.cs b/csharp/Lib/Utils/AsyncEnumerableEx.cs
similarity index 100%
rename from csharp/lib/Utils/AsyncEnumerableEx.cs
rename to csharp/Lib/Utils/AsyncEnumerableEx.cs
diff --git a/csharp/lib/Utils/AutoComplete.cs b/csharp/Lib/Utils/AutoComplete.cs
similarity index 100%
rename from csharp/lib/Utils/AutoComplete.cs
rename to csharp/Lib/Utils/AutoComplete.cs
diff --git a/csharp/lib/Utils/CliCommandUtils.cs b/csharp/Lib/Utils/CliCommandUtils.cs
similarity index 100%
rename from csharp/lib/Utils/CliCommandUtils.cs
rename to csharp/Lib/Utils/CliCommandUtils.cs
diff --git a/csharp/lib/Utils/ConsoleUtils.cs b/csharp/Lib/Utils/ConsoleUtils.cs
similarity index 100%
rename from csharp/lib/Utils/ConsoleUtils.cs
rename to csharp/Lib/Utils/ConsoleUtils.cs
diff --git a/csharp/lib/Utils/DecimalUtils.cs b/csharp/Lib/Utils/DecimalUtils.cs
similarity index 100%
rename from csharp/lib/Utils/DecimalUtils.cs
rename to csharp/Lib/Utils/DecimalUtils.cs
diff --git a/csharp/lib/Utils/DictObservables.cs b/csharp/Lib/Utils/DictObservables.cs
similarity index 100%
rename from csharp/lib/Utils/DictObservables.cs
rename to csharp/Lib/Utils/DictObservables.cs
diff --git a/csharp/lib/Utils/Disposable.cs b/csharp/Lib/Utils/Disposable.cs
similarity index 100%
rename from csharp/lib/Utils/Disposable.cs
rename to csharp/Lib/Utils/Disposable.cs
diff --git a/csharp/lib/Utils/EnumerableUtils.cs b/csharp/Lib/Utils/EnumerableUtils.cs
similarity index 100%
rename from csharp/lib/Utils/EnumerableUtils.cs
rename to csharp/Lib/Utils/EnumerableUtils.cs
diff --git a/csharp/lib/Utils/ExceptionHandling.cs b/csharp/Lib/Utils/ExceptionHandling.cs
similarity index 100%
rename from csharp/lib/Utils/ExceptionHandling.cs
rename to csharp/Lib/Utils/ExceptionHandling.cs
diff --git a/csharp/lib/Utils/FileSystem.cs b/csharp/Lib/Utils/FileSystem.cs
similarity index 100%
rename from csharp/lib/Utils/FileSystem.cs
rename to csharp/Lib/Utils/FileSystem.cs
diff --git a/csharp/lib/Utils/JsonNodeAccessors.cs b/csharp/Lib/Utils/JsonNodeAccessors.cs
similarity index 100%
rename from csharp/lib/Utils/JsonNodeAccessors.cs
rename to csharp/Lib/Utils/JsonNodeAccessors.cs
diff --git a/csharp/lib/Utils/Maybe.cs b/csharp/Lib/Utils/Maybe.cs
similarity index 100%
rename from csharp/lib/Utils/Maybe.cs
rename to csharp/Lib/Utils/Maybe.cs
diff --git a/csharp/lib/Utils/Net/NetUtils.cs b/csharp/Lib/Utils/Net/NetUtils.cs
similarity index 100%
rename from csharp/lib/Utils/Net/NetUtils.cs
rename to csharp/Lib/Utils/Net/NetUtils.cs
diff --git a/csharp/lib/Utils/Net/PingExtensions.cs b/csharp/Lib/Utils/Net/PingExtensions.cs
similarity index 100%
rename from csharp/lib/Utils/Net/PingExtensions.cs
rename to csharp/Lib/Utils/Net/PingExtensions.cs
diff --git a/csharp/lib/Utils/Net/UdpExtensions.cs b/csharp/Lib/Utils/Net/UdpExtensions.cs
similarity index 100%
rename from csharp/lib/Utils/Net/UdpExtensions.cs
rename to csharp/Lib/Utils/Net/UdpExtensions.cs
diff --git a/csharp/lib/Utils/None.cs b/csharp/Lib/Utils/None.cs
similarity index 100%
rename from csharp/lib/Utils/None.cs
rename to csharp/Lib/Utils/None.cs
diff --git a/csharp/lib/Utils/NullableUtils.cs b/csharp/Lib/Utils/NullableUtils.cs
similarity index 100%
rename from csharp/lib/Utils/NullableUtils.cs
rename to csharp/Lib/Utils/NullableUtils.cs
diff --git a/csharp/lib/Utils/ObservableExceptionHandling.cs b/csharp/Lib/Utils/ObservableExceptionHandling.cs
similarity index 100%
rename from csharp/lib/Utils/ObservableExceptionHandling.cs
rename to csharp/Lib/Utils/ObservableExceptionHandling.cs
diff --git a/csharp/lib/Utils/ObservableUtils.cs b/csharp/Lib/Utils/ObservableUtils.cs
similarity index 100%
rename from csharp/lib/Utils/ObservableUtils.cs
rename to csharp/Lib/Utils/ObservableUtils.cs
diff --git a/csharp/lib/Utils/PointFree.cs b/csharp/Lib/Utils/PointFree.cs
similarity index 100%
rename from csharp/lib/Utils/PointFree.cs
rename to csharp/Lib/Utils/PointFree.cs
diff --git a/csharp/lib/Utils/SshHost.cs b/csharp/Lib/Utils/SshHost.cs
similarity index 100%
rename from csharp/lib/Utils/SshHost.cs
rename to csharp/Lib/Utils/SshHost.cs
diff --git a/csharp/lib/Utils/StreamExtensions.cs b/csharp/Lib/Utils/StreamExtensions.cs
similarity index 100%
rename from csharp/lib/Utils/StreamExtensions.cs
rename to csharp/Lib/Utils/StreamExtensions.cs
diff --git a/csharp/lib/Utils/StringUtils.cs b/csharp/Lib/Utils/StringUtils.cs
similarity index 100%
rename from csharp/lib/Utils/StringUtils.cs
rename to csharp/Lib/Utils/StringUtils.cs
diff --git a/csharp/lib/Utils/TaskUtils.cs b/csharp/Lib/Utils/TaskUtils.cs
similarity index 100%
rename from csharp/lib/Utils/TaskUtils.cs
rename to csharp/Lib/Utils/TaskUtils.cs
diff --git a/csharp/lib/Utils/TextBlock.cs b/csharp/Lib/Utils/TextBlock.cs
similarity index 100%
rename from csharp/lib/Utils/TextBlock.cs
rename to csharp/Lib/Utils/TextBlock.cs
diff --git a/csharp/lib/Utils/Try/Operators.async.cs b/csharp/Lib/Utils/Try/Operators.async.cs
similarity index 100%
rename from csharp/lib/Utils/Try/Operators.async.cs
rename to csharp/Lib/Utils/Try/Operators.async.cs
diff --git a/csharp/lib/Utils/Try/Operators.sync.cs b/csharp/Lib/Utils/Try/Operators.sync.cs
similarity index 100%
rename from csharp/lib/Utils/Try/Operators.sync.cs
rename to csharp/Lib/Utils/Try/Operators.sync.cs
diff --git a/csharp/lib/Utils/Try/Policy.cs b/csharp/Lib/Utils/Try/Policy.cs
similarity index 100%
rename from csharp/lib/Utils/Try/Policy.cs
rename to csharp/Lib/Utils/Try/Policy.cs
diff --git a/csharp/lib/Utils/Try/TryAsync.async.cs b/csharp/Lib/Utils/Try/TryAsync.async.cs
similarity index 100%
rename from csharp/lib/Utils/Try/TryAsync.async.cs
rename to csharp/Lib/Utils/Try/TryAsync.async.cs
diff --git a/csharp/lib/Utils/Try/TryAsync.cs b/csharp/Lib/Utils/Try/TryAsync.cs
similarity index 100%
rename from csharp/lib/Utils/Try/TryAsync.cs
rename to csharp/Lib/Utils/Try/TryAsync.cs
diff --git a/csharp/lib/Utils/Try/TryAsync.sync.cs b/csharp/Lib/Utils/Try/TryAsync.sync.cs
similarity index 100%
rename from csharp/lib/Utils/Try/TryAsync.sync.cs
rename to csharp/Lib/Utils/Try/TryAsync.sync.cs
diff --git a/csharp/lib/Utils/Try/TrySync.async.cs b/csharp/Lib/Utils/Try/TrySync.async.cs
similarity index 100%
rename from csharp/lib/Utils/Try/TrySync.async.cs
rename to csharp/Lib/Utils/Try/TrySync.async.cs
diff --git a/csharp/lib/Utils/Try/TrySync.cs b/csharp/Lib/Utils/Try/TrySync.cs
similarity index 100%
rename from csharp/lib/Utils/Try/TrySync.cs
rename to csharp/Lib/Utils/Try/TrySync.cs
diff --git a/csharp/lib/Utils/Try/TrySync.sync.cs b/csharp/Lib/Utils/Try/TrySync.sync.cs
similarity index 100%
rename from csharp/lib/Utils/Try/TrySync.sync.cs
rename to csharp/Lib/Utils/Try/TrySync.sync.cs
diff --git a/csharp/lib/Utils/Units.cs b/csharp/Lib/Utils/Units.cs
similarity index 100%
rename from csharp/lib/Utils/Units.cs
rename to csharp/Lib/Utils/Units.cs
diff --git a/csharp/lib/Utils/Utils.cs b/csharp/Lib/Utils/Utils.cs
similarity index 100%
rename from csharp/lib/Utils/Utils.cs
rename to csharp/Lib/Utils/Utils.cs
diff --git a/csharp/lib/Utils/Utils.csproj b/csharp/Lib/Utils/Utils.csproj
similarity index 87%
rename from csharp/lib/Utils/Utils.csproj
rename to csharp/Lib/Utils/Utils.csproj
index 222f85663..59af027d7 100644
--- a/csharp/lib/Utils/Utils.csproj
+++ b/csharp/Lib/Utils/Utils.csproj
@@ -1,5 +1,5 @@
-
+
diff --git a/csharp/lib/Utils/Utils.sln b/csharp/Lib/Utils/Utils.sln
similarity index 100%
rename from csharp/lib/Utils/Utils.sln
rename to csharp/Lib/Utils/Utils.sln
diff --git a/csharp/lib/Utils/ValueTupleUtils.cs b/csharp/Lib/Utils/ValueTupleUtils.cs
similarity index 100%
rename from csharp/lib/Utils/ValueTupleUtils.cs
rename to csharp/Lib/Utils/ValueTupleUtils.cs
diff --git a/csharp/lib/Victron/VeDBus/Program.cs b/csharp/Lib/Victron/VeDBus/Program.cs
similarity index 100%
rename from csharp/lib/Victron/VeDBus/Program.cs
rename to csharp/Lib/Victron/VeDBus/Program.cs
diff --git a/csharp/lib/Victron/VeDBus/VeDBus.cs b/csharp/Lib/Victron/VeDBus/VeDBus.cs
similarity index 100%
rename from csharp/lib/Victron/VeDBus/VeDBus.cs
rename to csharp/Lib/Victron/VeDBus/VeDBus.cs
diff --git a/csharp/lib/Victron/VeDBus/VeDBus.csproj b/csharp/Lib/Victron/VeDBus/VeDBus.csproj
similarity index 88%
rename from csharp/lib/Victron/VeDBus/VeDBus.csproj
rename to csharp/Lib/Victron/VeDBus/VeDBus.csproj
index 5f986d84c..fe0000124 100644
--- a/csharp/lib/Victron/VeDBus/VeDBus.csproj
+++ b/csharp/Lib/Victron/VeDBus/VeDBus.csproj
@@ -1,6 +1,6 @@
-
+
diff --git a/csharp/lib/Victron/VeDBus/VeDBusApi.cs b/csharp/Lib/Victron/VeDBus/VeDBusApi.cs
similarity index 100%
rename from csharp/lib/Victron/VeDBus/VeDBusApi.cs
rename to csharp/Lib/Victron/VeDBus/VeDBusApi.cs
diff --git a/csharp/lib/Victron/VeDBus/VeDbusService.cs b/csharp/Lib/Victron/VeDBus/VeDbusService.cs
similarity index 100%
rename from csharp/lib/Victron/VeDBus/VeDbusService.cs
rename to csharp/Lib/Victron/VeDBus/VeDbusService.cs
diff --git a/csharp/lib/Victron/VeDBus/VeProperties.Dbus.cs b/csharp/Lib/Victron/VeDBus/VeProperties.Dbus.cs
similarity index 100%
rename from csharp/lib/Victron/VeDBus/VeProperties.Dbus.cs
rename to csharp/Lib/Victron/VeDBus/VeProperties.Dbus.cs
diff --git a/csharp/lib/Victron/VeDBus/VeProperties.cs b/csharp/Lib/Victron/VeDBus/VeProperties.cs
similarity index 100%
rename from csharp/lib/Victron/VeDBus/VeProperties.cs
rename to csharp/Lib/Victron/VeDBus/VeProperties.cs
diff --git a/csharp/lib/Victron/VeDBus/VeProperty.cs b/csharp/Lib/Victron/VeDBus/VeProperty.cs
similarity index 100%
rename from csharp/lib/Victron/VeDBus/VeProperty.cs
rename to csharp/Lib/Victron/VeDBus/VeProperty.cs
diff --git a/csharp/lib/Victron/VictronVRM/Detail.cs b/csharp/Lib/Victron/VictronVRM/Detail.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Detail.cs
rename to csharp/Lib/Victron/VictronVRM/Detail.cs
diff --git a/csharp/lib/Victron/VictronVRM/Details.cs b/csharp/Lib/Victron/VictronVRM/Details.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Details.cs
rename to csharp/Lib/Victron/VictronVRM/Details.cs
diff --git a/csharp/lib/Victron/VictronVRM/Device.cs b/csharp/Lib/Victron/VictronVRM/Device.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Device.cs
rename to csharp/Lib/Victron/VictronVRM/Device.cs
diff --git a/csharp/lib/Victron/VictronVRM/FlurlExtensions.cs b/csharp/Lib/Victron/VictronVRM/FlurlExtensions.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/FlurlExtensions.cs
rename to csharp/Lib/Victron/VictronVRM/FlurlExtensions.cs
diff --git a/csharp/lib/Victron/VictronVRM/Installation.Settings.cs b/csharp/Lib/Victron/VictronVRM/Installation.Settings.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Installation.Settings.cs
rename to csharp/Lib/Victron/VictronVRM/Installation.Settings.cs
diff --git a/csharp/lib/Victron/VictronVRM/Installation.Tags.cs b/csharp/Lib/Victron/VictronVRM/Installation.Tags.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Installation.Tags.cs
rename to csharp/Lib/Victron/VictronVRM/Installation.Tags.cs
diff --git a/csharp/lib/Victron/VictronVRM/Installation.cs b/csharp/Lib/Victron/VictronVRM/Installation.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Installation.cs
rename to csharp/Lib/Victron/VictronVRM/Installation.cs
diff --git a/csharp/lib/Victron/VictronVRM/Reply.cs b/csharp/Lib/Victron/VictronVRM/Reply.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Reply.cs
rename to csharp/Lib/Victron/VictronVRM/Reply.cs
diff --git a/csharp/lib/Victron/VictronVRM/Requests.cs b/csharp/Lib/Victron/VictronVRM/Requests.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Requests.cs
rename to csharp/Lib/Victron/VictronVRM/Requests.cs
diff --git a/csharp/lib/Victron/VictronVRM/Settings.cs b/csharp/Lib/Victron/VictronVRM/Settings.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/Settings.cs
rename to csharp/Lib/Victron/VictronVRM/Settings.cs
diff --git a/csharp/lib/Victron/VictronVRM/VictronVRM.csproj b/csharp/Lib/Victron/VictronVRM/VictronVRM.csproj
similarity index 92%
rename from csharp/lib/Victron/VictronVRM/VictronVRM.csproj
rename to csharp/Lib/Victron/VictronVRM/VictronVRM.csproj
index 4370080ea..f37c8f354 100644
--- a/csharp/lib/Victron/VictronVRM/VictronVRM.csproj
+++ b/csharp/Lib/Victron/VictronVRM/VictronVRM.csproj
@@ -1,6 +1,6 @@
-
+
full
diff --git a/csharp/lib/Victron/VictronVRM/VrmAccount.cs b/csharp/Lib/Victron/VictronVRM/VrmAccount.cs
similarity index 100%
rename from csharp/lib/Victron/VictronVRM/VrmAccount.cs
rename to csharp/Lib/Victron/VictronVRM/VrmAccount.cs
diff --git a/csharp/lib/WebServer/ContentType.cs b/csharp/Lib/WebServer/ContentType.cs
similarity index 100%
rename from csharp/lib/WebServer/ContentType.cs
rename to csharp/Lib/WebServer/ContentType.cs
diff --git a/csharp/lib/WebServer/Default.cs b/csharp/Lib/WebServer/Default.cs
similarity index 100%
rename from csharp/lib/WebServer/Default.cs
rename to csharp/Lib/WebServer/Default.cs
diff --git a/csharp/lib/WebServer/HttpExtensions.cs b/csharp/Lib/WebServer/HttpExtensions.cs
similarity index 100%
rename from csharp/lib/WebServer/HttpExtensions.cs
rename to csharp/Lib/WebServer/HttpExtensions.cs
diff --git a/csharp/lib/WebServer/HttpHeader.cs b/csharp/Lib/WebServer/HttpHeader.cs
similarity index 100%
rename from csharp/lib/WebServer/HttpHeader.cs
rename to csharp/Lib/WebServer/HttpHeader.cs
diff --git a/csharp/lib/WebServer/HttpMethod.cs b/csharp/Lib/WebServer/HttpMethod.cs
similarity index 100%
rename from csharp/lib/WebServer/HttpMethod.cs
rename to csharp/Lib/WebServer/HttpMethod.cs
diff --git a/csharp/lib/WebServer/HttpRequest.cs b/csharp/Lib/WebServer/HttpRequest.cs
similarity index 100%
rename from csharp/lib/WebServer/HttpRequest.cs
rename to csharp/Lib/WebServer/HttpRequest.cs
diff --git a/csharp/lib/WebServer/HttpResponse.cs b/csharp/Lib/WebServer/HttpResponse.cs
similarity index 100%
rename from csharp/lib/WebServer/HttpResponse.cs
rename to csharp/Lib/WebServer/HttpResponse.cs
diff --git a/csharp/lib/WebServer/WebServer.cs b/csharp/Lib/WebServer/WebServer.cs
similarity index 100%
rename from csharp/lib/WebServer/WebServer.cs
rename to csharp/Lib/WebServer/WebServer.cs
diff --git a/csharp/lib/WebServer/WebServer.csproj b/csharp/Lib/WebServer/WebServer.csproj
similarity index 76%
rename from csharp/lib/WebServer/WebServer.csproj
rename to csharp/Lib/WebServer/WebServer.csproj
index 8063be2ce..00c76841c 100644
--- a/csharp/lib/WebServer/WebServer.csproj
+++ b/csharp/Lib/WebServer/WebServer.csproj
@@ -1,6 +1,6 @@
-
+
@@ -13,7 +13,7 @@
-
+
diff --git a/csharp/lib/Wireformat/WireFormat.csproj.DotSettings b/csharp/Lib/Wireformat/WireFormat.csproj.DotSettings
similarity index 100%
rename from csharp/lib/Wireformat/WireFormat.csproj.DotSettings
rename to csharp/Lib/Wireformat/WireFormat.csproj.DotSettings
diff --git a/csharp/lib/Wireformat/build_proto.sh b/csharp/Lib/Wireformat/build_proto.sh
similarity index 100%
rename from csharp/lib/Wireformat/build_proto.sh
rename to csharp/Lib/Wireformat/build_proto.sh
diff --git a/csharp/lib/Wireformat/package-lock.json b/csharp/Lib/Wireformat/package-lock.json
similarity index 100%
rename from csharp/lib/Wireformat/package-lock.json
rename to csharp/Lib/Wireformat/package-lock.json
diff --git a/csharp/lib/Wireformat/package.json b/csharp/Lib/Wireformat/package.json
similarity index 100%
rename from csharp/lib/Wireformat/package.json
rename to csharp/Lib/Wireformat/package.json
diff --git a/csharp/lib/Wireformat/proto/Payload.proto b/csharp/Lib/Wireformat/proto/Payload.proto
similarity index 100%
rename from csharp/lib/Wireformat/proto/Payload.proto
rename to csharp/Lib/Wireformat/proto/Payload.proto
diff --git a/csharp/lib/Wireformat/proto/VictronV1/BatteryStatus48TL.proto b/csharp/Lib/Wireformat/proto/VictronV1/BatteryStatus48TL.proto
similarity index 100%
rename from csharp/lib/Wireformat/proto/VictronV1/BatteryStatus48TL.proto
rename to csharp/Lib/Wireformat/proto/VictronV1/BatteryStatus48TL.proto
diff --git a/csharp/lib/Wireformat/proto/VictronV1/Device.proto b/csharp/Lib/Wireformat/proto/VictronV1/Device.proto
similarity index 100%
rename from csharp/lib/Wireformat/proto/VictronV1/Device.proto
rename to csharp/Lib/Wireformat/proto/VictronV1/Device.proto
diff --git a/csharp/lib/Wireformat/proto/VictronV1/VictronTopologyV1.proto b/csharp/Lib/Wireformat/proto/VictronV1/VictronTopologyV1.proto
similarity index 100%
rename from csharp/lib/Wireformat/proto/VictronV1/VictronTopologyV1.proto
rename to csharp/Lib/Wireformat/proto/VictronV1/VictronTopologyV1.proto
diff --git a/csharp/app/Backend/db.sqlite b/csharp/app/Backend/db.sqlite
deleted file mode 100644
index fc3ad2ed8..000000000
Binary files a/csharp/app/Backend/db.sqlite and /dev/null differ
diff --git a/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj b/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj
deleted file mode 100644
index ae7263dc2..000000000
--- a/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/csharp/app/SaliMax/SaliMax.csproj b/csharp/app/SaliMax/SaliMax.csproj
deleted file mode 100644
index 2c2d378bd..000000000
--- a/csharp/app/SaliMax/SaliMax.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/csharp/lib/Channels/Channels.csproj b/csharp/lib/Channels/Channels.csproj
deleted file mode 100644
index 38b2fa318..000000000
--- a/csharp/lib/Channels/Channels.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/csharp/lib/Time/Time.csproj b/csharp/lib/Time/Time.csproj
deleted file mode 100644
index a2a63460f..000000000
--- a/csharp/lib/Time/Time.csproj
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-