Reorganized source code in repository (#200)

- Moved source code to own src folder - Renamed lib into libraries folder - Adjusted spelling for all VS project folders Signed-off-by: Christoph Hofmann <[email protected]>
openhab · Feb 17, 2022 · 8c17c8c · 8c17c8c
1 parent 937010e
commit 8c17c8c
Show file tree

Hide file tree

Showing 222 changed files with 38 additions and 35 deletions.
diff --git a/.github/workflows/actions/app-build/action.yml b/.github/workflows/actions/app-build/action.yml
@@ -37,13 +37,13 @@ runs:
             $minor = [System.DateTime]::Now.Month
             $build = [System.DateTime]::Now.Day
 
-            ./Set-Version.ps1 -SourceDirectory '${{github.workspace}}\src\' -Major $major -Minor $minor -Build $build -Revision 0 -SetVersion
+            ./Set-Version.ps1 -SourceDirectory '${{github.workspace}}\repo\src\' -Major $major -Minor $minor -Build $build -Revision 0 -SetVersion
 
     - name: Restore nuget packages
       shell: pwsh
       run: |
             Write-Host "==== Restore Nuget packages ====" -ForegroundColor Green
-            nuget restore ${{github.workspace}}\src\OpenHAB.Windows.sln
+            nuget restore ${{github.workspace}}\repo\OpenHAB.Windows.sln
     
     - name: Build OpenHab Windows App
       shell: pwsh
@@ -52,4 +52,4 @@ runs:
         SONAR_TOKEN: ${{inputs.SONAR_TOKEN}}
       run: |
           Write-Host "==== Build app package ====" -ForegroundColor Green
-          msbuild.exe ${{github.workspace}}\src\OpenHAB.Windows.sln /p:Platform="x86" /p:AppxBundlePlatforms="${{inputs. bundle_Platforms}}" /p:AppxPackageDir="${{inputs.output_directory}}" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload /p:configuration="${{inputs.build_configuration}}" /t:rebuild
+          msbuild.exe ${{github.workspace}}\repo\OpenHAB.Windows.sln /p:Platform="x86" /p:AppxBundlePlatforms="${{inputs. bundle_Platforms}}" /p:AppxPackageDir="${{inputs.output_directory}}" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload /p:configuration="${{inputs.build_configuration}}" /t:rebuild
diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Checkout main code
       uses: actions/checkout@v2
       with:
-        path: src
+        path: repo
         clean: true 
 
     - name: Setup NuGet.exe for use with actions
@@ -40,7 +40,7 @@ jobs:
 
     - name: Build App
       id: create_app_package
-      uses: ./src/.github/workflows/actions/app-build
+      uses: ./repo/.github/workflows/actions/app-build
       with:
         build_configuration: ${{github.event.inputs.BuildConfiguration}}
         output_directory: '${{env.BuildDirectory}}'

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Checkout main code
       uses: actions/checkout@v2
       with:
-        path: src
+        path: repo
         clean: true
 
     - name: Setup NuGet.exe for use with actions
@@ -64,11 +64,11 @@ jobs:
         SONAR_TOKEN: ${{secrets.SONAR_TOKE }}
       shell: pwsh
       run: |
-          .\.sonar\scanner\SonarScanner.MSBuild.exe begin /k:"openhab_openhab-windows" /o:"openhab" /d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.verbose="true"
+          .\.sonar\scanner\SonarScanner.MSBuild.exe begin /k:"openhab_openhab-windows" /o:"openhab" /d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.projectBaseDir="${{github.workspace}}/repo/src/" /d:sonar.verbose="true"
 
     - name: Build App
       id: create_app_package
-      uses: .\src\.github\workflows\actions\app-build
+      uses: .\repo\.github\workflows\actions\app-build
       with:
         build_configuration: 'debug'
         output_directory: '${{env.BuildDirectory}}'

diff --git a/OpenHAB.Windows.sln b/OpenHAB.Windows.sln
@@ -3,33 +3,42 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29409.12
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openHAB.Windows", "OpenHAB.Windows\openHAB.Windows.csproj", "{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{6D9E45E3-F3C1-4A9D-A62D-72DDBA11C31B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libaries", "libaries", "{6D9E45E3-F3C1-4A9D-A62D-72DDBA11C31B}"
 	ProjectSection(SolutionItems) = preProject
 		Libs\MJPEGDecoderWinRTLib.dll = Libs\MJPEGDecoderWinRTLib.dll
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openHAB.Core", "OpenHAB.Core\openHAB.Core.csproj", "{2A8FD10E-4EE5-4E25-B47C-2296E071F482}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5CFF8A8-CFA1-4C8F-A197-4F095FAC2B76}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Openhab.Core", "src\openHAB.Core\Openhab.Core.csproj", "{2A8FD10E-4EE5-4E25-B47C-2296E071F482}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openHAB.Windows", "src\openHAB.Windows\openHAB.Windows.csproj", "{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|ARM = Release|ARM
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.ActiveCfg = Debug|ARM
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.Build.0 = Debug|ARM
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.ActiveCfg = Debug|x64
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.Build.0 = Debug|x64
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.ActiveCfg = Debug|x86
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.Build.0 = Debug|x86
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.ActiveCfg = Release|ARM
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.Build.0 = Release|ARM
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.ActiveCfg = Release|x64
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.Build.0 = Release|x64
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.ActiveCfg = Release|x86
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.Build.0 = Release|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.ActiveCfg = Debug|ARM
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.Build.0 = Debug|ARM
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.Deploy.0 = Debug|ARM
@@ -39,7 +48,6 @@ Global
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.ActiveCfg = Debug|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.Build.0 = Debug|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.Deploy.0 = Debug|x86
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|Any CPU.ActiveCfg = Release|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.ActiveCfg = Release|ARM
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.Build.0 = Release|ARM
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.Deploy.0 = Release|ARM
@@ -49,20 +57,6 @@ Global
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.ActiveCfg = Release|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.Build.0 = Release|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.Deploy.0 = Release|x86
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.Build.0 = Debug|ARM
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.ActiveCfg = Debug|x64
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.Build.0 = Debug|x64
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.ActiveCfg = Debug|x86
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.Build.0 = Debug|x86
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|Any CPU.ActiveCfg = Release|x86
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.ActiveCfg = Release|ARM
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.Build.0 = Release|ARM
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.ActiveCfg = Release|x64
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.Build.0 = Release|x64
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.ActiveCfg = Release|x86
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Libs/MJPEGDecoderWinRTLib.dll → libaries/MJPEGDecoderWinRTLib.dll b/Libs/MJPEGDecoderWinRTLib.dll → libaries/MJPEGDecoderWinRTLib.dll
diff --git a/...AB.Core.Client/openHAB.Core.Client.csproj → ...AB.Core.Client/openHAB.Core.Client.csproj b/...AB.Core.Client/openHAB.Core.Client.csproj → ...AB.Core.Client/openHAB.Core.Client.csproj
diff --git a/Openhab.Core/AppResources.cs → src/openHAB.Core/AppResources.cs b/Openhab.Core/AppResources.cs → src/openHAB.Core/AppResources.cs
diff --git a/Openhab.Core/Common/ActionCommand.cs → src/openHAB.Core/Common/ActionCommand.cs b/Openhab.Core/Common/ActionCommand.cs → src/openHAB.Core/Common/ActionCommand.cs
diff --git a/Openhab.Core/Common/ColorChangedEventArgs.cs → ...nHAB.Core/Common/ColorChangedEventArgs.cs b/Openhab.Core/Common/ColorChangedEventArgs.cs → ...nHAB.Core/Common/ColorChangedEventArgs.cs
diff --git a/Openhab.Core/Common/ColorHelper.cs → src/openHAB.Core/Common/ColorHelper.cs b/Openhab.Core/Common/ColorHelper.cs → src/openHAB.Core/Common/ColorHelper.cs
diff --git a/Openhab.Core/Common/Constants.cs → src/openHAB.Core/Common/Constants.cs b/Openhab.Core/Common/Constants.cs → src/openHAB.Core/Common/Constants.cs
diff --git a/Openhab.Core/Common/DataErrorInfo.cs → src/openHAB.Core/Common/DataErrorInfo.cs b/Openhab.Core/Common/DataErrorInfo.cs → src/openHAB.Core/Common/DataErrorInfo.cs
diff --git a/Openhab.Core/Common/DeviceFamily.cs → src/openHAB.Core/Common/DeviceFamily.cs b/Openhab.Core/Common/DeviceFamily.cs → src/openHAB.Core/Common/DeviceFamily.cs
diff --git a/Openhab.Core/Common/DeviceTypeHelper.cs → src/openHAB.Core/Common/DeviceTypeHelper.cs b/Openhab.Core/Common/DeviceTypeHelper.cs → src/openHAB.Core/Common/DeviceTypeHelper.cs
diff --git a/Openhab.Core/Common/Enum.cs → src/openHAB.Core/Common/Enum.cs b/Openhab.Core/Common/Enum.cs → src/openHAB.Core/Common/Enum.cs
diff --git a/Openhab.Core/Common/HttpResponseResult.cs → ...openHAB.Core/Common/HttpResponseResult.cs b/Openhab.Core/Common/HttpResponseResult.cs → ...openHAB.Core/Common/HttpResponseResult.cs
diff --git a/.../Common/ObservableCollectionExtensions.cs → .../Common/ObservableCollectionExtensions.cs b/.../Common/ObservableCollectionExtensions.cs → .../Common/ObservableCollectionExtensions.cs
diff --git a/Openhab.Core/Common/OpenHABHttpClient.cs → src/openHAB.Core/Common/OpenHABHttpClient.cs b/Openhab.Core/Common/OpenHABHttpClient.cs → src/openHAB.Core/Common/OpenHABHttpClient.cs
diff --git a/Openhab.Core/Contracts/IConnectionProfile.cs → ...nHAB.Core/Contracts/IConnectionProfile.cs b/Openhab.Core/Contracts/IConnectionProfile.cs → ...nHAB.Core/Contracts/IConnectionProfile.cs
diff --git a/...s/Services/IDependencyInjectionService.cs → ...s/Services/IDependencyInjectionService.cs b/...s/Services/IDependencyInjectionService.cs → ...s/Services/IDependencyInjectionService.cs
diff --git a/...re/Contracts/Services/ISettingsService.cs → ...re/Contracts/Services/ISettingsService.cs b/...re/Contracts/Services/ISettingsService.cs → ...re/Contracts/Services/ISettingsService.cs
diff --git a/Openhab.Core/Messages/FireErrorMessage.cs → ...openHAB.Core/Messages/FireErrorMessage.cs b/Openhab.Core/Messages/FireErrorMessage.cs → ...openHAB.Core/Messages/FireErrorMessage.cs
diff --git a/Openhab.Core/Messages/FireInfoMessage.cs → src/openHAB.Core/Messages/FireInfoMessage.cs b/Openhab.Core/Messages/FireInfoMessage.cs → src/openHAB.Core/Messages/FireInfoMessage.cs
diff --git a/....Core/Messages/ItemStateChangedMessage.cs → ....Core/Messages/ItemStateChangedMessage.cs b/....Core/Messages/ItemStateChangedMessage.cs → ....Core/Messages/ItemStateChangedMessage.cs
diff --git a/Openhab.Core/Messages/MessageType.cs → src/openHAB.Core/Messages/MessageType.cs b/Openhab.Core/Messages/MessageType.cs → src/openHAB.Core/Messages/MessageType.cs
diff --git a/...b.Core/Messages/SettingsUpdatedMessage.cs → ...B.Core/Messages/SettingsUpdatedMessage.cs b/...b.Core/Messages/SettingsUpdatedMessage.cs → ...B.Core/Messages/SettingsUpdatedMessage.cs
diff --git a/...ore/Messages/SettingsValidationMessage.cs → ...ore/Messages/SettingsValidationMessage.cs b/...ore/Messages/SettingsValidationMessage.cs → ...ore/Messages/SettingsValidationMessage.cs
diff --git a/...ab.Core/Messages/TriggerCommandMessage.cs → ...AB.Core/Messages/TriggerCommandMessage.cs b/...ab.Core/Messages/TriggerCommandMessage.cs → ...AB.Core/Messages/TriggerCommandMessage.cs
diff --git a/Openhab.Core/Messages/UpdateItemMessage.cs → ...penHAB.Core/Messages/UpdateItemMessage.cs b/Openhab.Core/Messages/UpdateItemMessage.cs → ...penHAB.Core/Messages/UpdateItemMessage.cs
diff --git a/...hab.Core/Messages/WidgetClickedMessage.cs → ...HAB.Core/Messages/WidgetClickedMessage.cs b/...hab.Core/Messages/WidgetClickedMessage.cs → ...HAB.Core/Messages/WidgetClickedMessage.cs
diff --git a/...odel/Connection/CloudConnectionProfile.cs → ...odel/Connection/CloudConnectionProfile.cs b/...odel/Connection/CloudConnectionProfile.cs → ...odel/Connection/CloudConnectionProfile.cs
diff --git a/...el/Connection/DefaultConnectionProfile.cs → ...el/Connection/DefaultConnectionProfile.cs b/...el/Connection/DefaultConnectionProfile.cs → ...el/Connection/DefaultConnectionProfile.cs
diff --git a/...Model/Connection/DemoConnectionProfile.cs → ...Model/Connection/DemoConnectionProfile.cs b/...Model/Connection/DemoConnectionProfile.cs → ...Model/Connection/DemoConnectionProfile.cs
diff --git a/...odel/Connection/LocalConnectionProfile.cs → ...odel/Connection/LocalConnectionProfile.cs b/...odel/Connection/LocalConnectionProfile.cs → ...odel/Connection/LocalConnectionProfile.cs
diff --git a/...ore/Model/Connection/OpenHABConnection.cs → ...ore/Model/Connection/OpenHABConnection.cs b/...ore/Model/Connection/OpenHABConnection.cs → ...ore/Model/Connection/OpenHABConnection.cs
diff --git a/...Model/Connection/OpenHABHttpClientType.cs → ...Model/Connection/OpenHABHttpClientType.cs b/...Model/Connection/OpenHABHttpClientType.cs → ...Model/Connection/OpenHABHttpClientType.cs
diff --git a/...del/Connection/RemoteConnectionProfile.cs → ...del/Connection/RemoteConnectionProfile.cs b/...del/Connection/RemoteConnectionProfile.cs → ...del/Connection/RemoteConnectionProfile.cs
diff --git a/Openhab.Core/Model/Event/EventStreamData.cs → ...enHAB.Core/Model/Event/EventStreamData.cs b/Openhab.Core/Model/Event/EventStreamData.cs → ...enHAB.Core/Model/Event/EventStreamData.cs
diff --git a/...ab.Core/Model/Event/EventStreamPayload.cs → ...AB.Core/Model/Event/EventStreamPayload.cs b/...ab.Core/Model/Event/EventStreamPayload.cs → ...AB.Core/Model/Event/EventStreamPayload.cs
diff --git a/Openhab.Core/Model/Event/OpenHABEvent.cs → src/openHAB.Core/Model/Event/OpenHABEvent.cs b/Openhab.Core/Model/Event/OpenHABEvent.cs → src/openHAB.Core/Model/Event/OpenHABEvent.cs
diff --git a/Openhab.Core/Model/Event/OpenHABEventType.cs → ...nHAB.Core/Model/Event/OpenHABEventType.cs b/Openhab.Core/Model/Event/OpenHABEventType.cs → ...nHAB.Core/Model/Event/OpenHABEventType.cs
diff --git a/Openhab.Core/Model/Link.cs → src/openHAB.Core/Model/Link.cs b/Openhab.Core/Model/Link.cs → src/openHAB.Core/Model/Link.cs
diff --git a/Openhab.Core/Model/OpenHABAPIInfo.cs → src/openHAB.Core/Model/OpenHABAPIInfo.cs b/Openhab.Core/Model/OpenHABAPIInfo.cs → src/openHAB.Core/Model/OpenHABAPIInfo.cs
diff --git a/...b.Core/Model/OpenHABCommandDescription.cs → ...B.Core/Model/OpenHABCommandDescription.cs b/...b.Core/Model/OpenHABCommandDescription.cs → ...B.Core/Model/OpenHABCommandDescription.cs
diff --git a/Openhab.Core/Model/OpenHABCommandOptions.cs → ...enHAB.Core/Model/OpenHABCommandOptions.cs b/Openhab.Core/Model/OpenHABCommandOptions.cs → ...enHAB.Core/Model/OpenHABCommandOptions.cs
diff --git a/Openhab.Core/Model/OpenHABCommands.cs → src/openHAB.Core/Model/OpenHABCommands.cs b/Openhab.Core/Model/OpenHABCommands.cs → src/openHAB.Core/Model/OpenHABCommands.cs
diff --git a/Openhab.Core/Model/OpenHABConnectionType.cs → ...enHAB.Core/Model/OpenHABConnectionType.cs b/Openhab.Core/Model/OpenHABConnectionType.cs → ...enHAB.Core/Model/OpenHABConnectionType.cs
diff --git a/Openhab.Core/Model/OpenHABException.cs → src/openHAB.Core/Model/OpenHABException.cs b/Openhab.Core/Model/OpenHABException.cs → src/openHAB.Core/Model/OpenHABException.cs
diff --git a/Openhab.Core/Model/OpenHABItem.cs → src/openHAB.Core/Model/OpenHABItem.cs b/Openhab.Core/Model/OpenHABItem.cs → src/openHAB.Core/Model/OpenHABItem.cs
diff --git a/Openhab.Core/Model/OpenHABSitemap.cs → src/openHAB.Core/Model/OpenHABSitemap.cs b/Openhab.Core/Model/OpenHABSitemap.cs → src/openHAB.Core/Model/OpenHABSitemap.cs
diff --git a/Openhab.Core/Model/OpenHABUrlState.cs → src/openHAB.Core/Model/OpenHABUrlState.cs b/Openhab.Core/Model/OpenHABUrlState.cs → src/openHAB.Core/Model/OpenHABUrlState.cs
diff --git a/Openhab.Core/Model/OpenHABWidget.cs → src/openHAB.Core/Model/OpenHABWidget.cs b/Openhab.Core/Model/OpenHABWidget.cs → src/openHAB.Core/Model/OpenHABWidget.cs
diff --git a/Openhab.Core/Model/OpenHABWidgetFactory.cs → ...penHAB.Core/Model/OpenHABWidgetFactory.cs b/Openhab.Core/Model/OpenHABWidgetFactory.cs → ...penHAB.Core/Model/OpenHABWidgetFactory.cs
diff --git a/Openhab.Core/Model/OpenHABWidgetMapping.cs → ...penHAB.Core/Model/OpenHABWidgetMapping.cs b/Openhab.Core/Model/OpenHABWidgetMapping.cs → ...penHAB.Core/Model/OpenHABWidgetMapping.cs
diff --git a/Openhab.Core/Model/OpenHabVersion.cs → src/openHAB.Core/Model/OpenHabVersion.cs b/Openhab.Core/Model/OpenHabVersion.cs → src/openHAB.Core/Model/OpenHabVersion.cs
diff --git a/...ab.Core/Model/OpenhabConnectionProfile.cs → ...AB.Core/Model/OpenhabConnectionProfile.cs b/...ab.Core/Model/OpenhabConnectionProfile.cs → ...AB.Core/Model/OpenhabConnectionProfile.cs
diff --git a/Openhab.Core/Model/RuntimeInfo.cs → src/openHAB.Core/Model/RuntimeInfo.cs b/Openhab.Core/Model/RuntimeInfo.cs → src/openHAB.Core/Model/RuntimeInfo.cs
diff --git a/Openhab.Core/Model/Settings.cs → src/openHAB.Core/Model/Settings.cs b/Openhab.Core/Model/Settings.cs → src/openHAB.Core/Model/Settings.cs
diff --git a/Openhab.Core/Model/WidgetTypeEnum.cs → src/openHAB.Core/Model/WidgetTypeEnum.cs b/Openhab.Core/Model/WidgetTypeEnum.cs → src/openHAB.Core/Model/WidgetTypeEnum.cs
diff --git a/...GeneratedMSBuildEditorConfig.editorconfig → ...GeneratedMSBuildEditorConfig.editorconfig b/...GeneratedMSBuildEditorConfig.editorconfig → ...GeneratedMSBuildEditorConfig.editorconfig
diff --git a/Openhab.Core/Openhab.Core.csproj → src/openHAB.Core/Openhab.Core.csproj b/Openhab.Core/Openhab.Core.csproj → src/openHAB.Core/Openhab.Core.csproj
diff --git a/Openhab.Core/Properties/AssemblyInfo.cs → src/openHAB.Core/Properties/AssemblyInfo.cs b/Openhab.Core/Properties/AssemblyInfo.cs → src/openHAB.Core/Properties/AssemblyInfo.cs
diff --git a/Openhab.Core/Properties/OpenHAB.Core.rd.xml → ...enHAB.Core/Properties/OpenHAB.Core.rd.xml b/Openhab.Core/Properties/OpenHAB.Core.rd.xml → ...enHAB.Core/Properties/OpenHAB.Core.rd.xml
diff --git a/Openhab.Core/SDK/IOpenHAB.cs → src/openHAB.Core/SDK/IOpenHAB.cs b/Openhab.Core/SDK/IOpenHAB.cs → src/openHAB.Core/SDK/IOpenHAB.cs
diff --git a/Openhab.Core/SDK/OpenHABClient.cs → src/openHAB.Core/SDK/OpenHABClient.cs b/Openhab.Core/SDK/OpenHABClient.cs → src/openHAB.Core/SDK/OpenHABClient.cs
diff --git a/Openhab.Core/Services/AppManager.cs → src/openHAB.Core/Services/AppManager.cs b/Openhab.Core/Services/AppManager.cs → src/openHAB.Core/Services/AppManager.cs
diff --git a/Openhab.Core/Services/IAppManager.cs → src/openHAB.Core/Services/IAppManager.cs b/Openhab.Core/Services/IAppManager.cs → src/openHAB.Core/Services/IAppManager.cs
diff --git a/Openhab.Core/Services/IIconCaching.cs → src/openHAB.Core/Services/IIconCaching.cs b/Openhab.Core/Services/IIconCaching.cs → src/openHAB.Core/Services/IIconCaching.cs
diff --git a/Openhab.Core/Services/IItemManager.cs → src/openHAB.Core/Services/IItemManager.cs b/Openhab.Core/Services/IItemManager.cs → src/openHAB.Core/Services/IItemManager.cs
diff --git a/Openhab.Core/Services/IconCaching.cs → src/openHAB.Core/Services/IconCaching.cs b/Openhab.Core/Services/IconCaching.cs → src/openHAB.Core/Services/IconCaching.cs
diff --git a/Openhab.Core/Services/ItemManager.cs → src/openHAB.Core/Services/ItemManager.cs b/Openhab.Core/Services/ItemManager.cs → src/openHAB.Core/Services/ItemManager.cs
diff --git a/...ices/Notification/INotificationManager.cs → ...ices/Notification/INotificationManager.cs b/...ices/Notification/INotificationManager.cs → ...ices/Notification/INotificationManager.cs
diff --git a/...vices/Notification/IOpenHABEventParser.cs → ...vices/Notification/IOpenHABEventParser.cs b/...vices/Notification/IOpenHABEventParser.cs → ...vices/Notification/IOpenHABEventParser.cs
diff --git a/...vices/Notification/NotificationManager.cs → ...vices/Notification/NotificationManager.cs b/...vices/Notification/NotificationManager.cs → ...vices/Notification/NotificationManager.cs
diff --git a/...rvices/Notification/OpenHABEventParser.cs → ...rvices/Notification/OpenHABEventParser.cs b/...rvices/Notification/OpenHABEventParser.cs → ...rvices/Notification/OpenHABEventParser.cs
diff --git a/...s/Notification/TileNotificationSchema.xml → ...s/Notification/TileNotificationSchema.xml b/...s/Notification/TileNotificationSchema.xml → ...s/Notification/TileNotificationSchema.xml
diff --git a/.../Notification/ToastNotificationSchema.xml → .../Notification/ToastNotificationSchema.xml b/.../Notification/ToastNotificationSchema.xml → .../Notification/ToastNotificationSchema.xml
diff --git a/Openhab.Core/Services/SettingsService.cs → src/openHAB.Core/Services/SettingsService.cs b/Openhab.Core/Services/SettingsService.cs → src/openHAB.Core/Services/SettingsService.cs
diff --git a/....Core/Services/WidgetNavigationService.cs → ....Core/Services/WidgetNavigationService.cs b/....Core/Services/WidgetNavigationService.cs → ....Core/Services/WidgetNavigationService.cs
diff --git a/Openhab.Core/Strings/de-de/Errors.resw → src/openHAB.Core/Strings/de-de/Errors.resw b/Openhab.Core/Strings/de-de/Errors.resw → src/openHAB.Core/Strings/de-de/Errors.resw
diff --git a/Openhab.Core/Strings/de-de/Resources.resw → ...openHAB.Core/Strings/de-de/Resources.resw b/Openhab.Core/Strings/de-de/Resources.resw → ...openHAB.Core/Strings/de-de/Resources.resw
diff --git a/Openhab.Core/Strings/en-us/Errors.resw → src/openHAB.Core/Strings/en-us/Errors.resw b/Openhab.Core/Strings/en-us/Errors.resw → src/openHAB.Core/Strings/en-us/Errors.resw
diff --git a/Openhab.Core/Strings/en-us/Resources.resw → ...openHAB.Core/Strings/en-us/Resources.resw b/Openhab.Core/Strings/en-us/Resources.resw → ...openHAB.Core/Strings/en-us/Resources.resw
diff --git a/OpenHAB.Windows/App.xaml → src/openHAB.Windows/App.xaml b/OpenHAB.Windows/App.xaml → src/openHAB.Windows/App.xaml
diff --git a/OpenHAB.Windows/App.xaml.cs → src/openHAB.Windows/App.xaml.cs b/OpenHAB.Windows/App.xaml.cs → src/openHAB.Windows/App.xaml.cs
diff --git a/...ndows/Assets/LockScreenLogo.scale-200.png → ...ndows/Assets/LockScreenLogo.scale-200.png b/...ndows/Assets/LockScreenLogo.scale-200.png → ...ndows/Assets/LockScreenLogo.scale-200.png
diff --git a/OpenHAB.Windows/Assets/LogoFlat.png → src/openHAB.Windows/Assets/LogoFlat.png b/OpenHAB.Windows/Assets/LogoFlat.png → src/openHAB.Windows/Assets/LogoFlat.png
diff --git a/OpenHAB.Windows/Assets/LogoSplash.jpg → src/openHAB.Windows/Assets/LogoSplash.jpg b/OpenHAB.Windows/Assets/LogoSplash.jpg → src/openHAB.Windows/Assets/LogoSplash.jpg
diff --git a/...Windows/Assets/NewStoreLogo.scale-100.png → ...Windows/Assets/NewStoreLogo.scale-100.png b/...Windows/Assets/NewStoreLogo.scale-100.png → ...Windows/Assets/NewStoreLogo.scale-100.png
diff --git a/...Windows/Assets/NewStoreLogo.scale-125.png → ...Windows/Assets/NewStoreLogo.scale-125.png b/...Windows/Assets/NewStoreLogo.scale-125.png → ...Windows/Assets/NewStoreLogo.scale-125.png
diff --git a/...Windows/Assets/NewStoreLogo.scale-150.png → ...Windows/Assets/NewStoreLogo.scale-150.png b/...Windows/Assets/NewStoreLogo.scale-150.png → ...Windows/Assets/NewStoreLogo.scale-150.png
diff --git a/...Windows/Assets/NewStoreLogo.scale-200.png → ...Windows/Assets/NewStoreLogo.scale-200.png b/...Windows/Assets/NewStoreLogo.scale-200.png → ...Windows/Assets/NewStoreLogo.scale-200.png
diff --git a/...Windows/Assets/NewStoreLogo.scale-400.png → ...Windows/Assets/NewStoreLogo.scale-400.png b/...Windows/Assets/NewStoreLogo.scale-400.png → ...Windows/Assets/NewStoreLogo.scale-400.png
diff --git a/...Windows/Assets/SplashScreen.scale-100.png → ...Windows/Assets/SplashScreen.scale-100.png b/...Windows/Assets/SplashScreen.scale-100.png → ...Windows/Assets/SplashScreen.scale-100.png
diff --git a/...Windows/Assets/SplashScreen.scale-125.png → ...Windows/Assets/SplashScreen.scale-125.png b/...Windows/Assets/SplashScreen.scale-125.png → ...Windows/Assets/SplashScreen.scale-125.png
diff --git a/...Windows/Assets/SplashScreen.scale-150.png → ...Windows/Assets/SplashScreen.scale-150.png b/...Windows/Assets/SplashScreen.scale-150.png → ...Windows/Assets/SplashScreen.scale-150.png
diff --git a/...Windows/Assets/SplashScreen.scale-200.png → ...Windows/Assets/SplashScreen.scale-200.png b/...Windows/Assets/SplashScreen.scale-200.png → ...Windows/Assets/SplashScreen.scale-200.png
diff --git a/...Windows/Assets/SplashScreen.scale-400.png → ...Windows/Assets/SplashScreen.scale-400.png b/...Windows/Assets/SplashScreen.scale-400.png → ...Windows/Assets/SplashScreen.scale-400.png
diff --git a/...ws/Assets/Square150x150Logo.scale-100.png → ...ws/Assets/Square150x150Logo.scale-100.png b/...ws/Assets/Square150x150Logo.scale-100.png → ...ws/Assets/Square150x150Logo.scale-100.png
diff --git a/...ws/Assets/Square150x150Logo.scale-125.png → ...ws/Assets/Square150x150Logo.scale-125.png b/...ws/Assets/Square150x150Logo.scale-125.png → ...ws/Assets/Square150x150Logo.scale-125.png
diff --git a/...ws/Assets/Square150x150Logo.scale-150.png → ...ws/Assets/Square150x150Logo.scale-150.png b/...ws/Assets/Square150x150Logo.scale-150.png → ...ws/Assets/Square150x150Logo.scale-150.png
diff --git a/...ws/Assets/Square150x150Logo.scale-200.png → ...ws/Assets/Square150x150Logo.scale-200.png b/...ws/Assets/Square150x150Logo.scale-200.png → ...ws/Assets/Square150x150Logo.scale-200.png
diff --git a/...ws/Assets/Square150x150Logo.scale-400.png → ...ws/Assets/Square150x150Logo.scale-400.png b/...ws/Assets/Square150x150Logo.scale-400.png → ...ws/Assets/Square150x150Logo.scale-400.png
diff --git a/...ws/Assets/Square310x310Logo.scale-100.png → ...ws/Assets/Square310x310Logo.scale-100.png b/...ws/Assets/Square310x310Logo.scale-100.png → ...ws/Assets/Square310x310Logo.scale-100.png
diff --git a/...ws/Assets/Square310x310Logo.scale-125.png → ...ws/Assets/Square310x310Logo.scale-125.png b/...ws/Assets/Square310x310Logo.scale-125.png → ...ws/Assets/Square310x310Logo.scale-125.png
diff --git a/...ws/Assets/Square310x310Logo.scale-150.png → ...ws/Assets/Square310x310Logo.scale-150.png b/...ws/Assets/Square310x310Logo.scale-150.png → ...ws/Assets/Square310x310Logo.scale-150.png
diff --git a/...ws/Assets/Square310x310Logo.scale-200.png → ...ws/Assets/Square310x310Logo.scale-200.png b/...ws/Assets/Square310x310Logo.scale-200.png → ...ws/Assets/Square310x310Logo.scale-200.png
diff --git a/...ws/Assets/Square310x310Logo.scale-400.png → ...ws/Assets/Square310x310Logo.scale-400.png b/...ws/Assets/Square310x310Logo.scale-400.png → ...ws/Assets/Square310x310Logo.scale-400.png
diff --git a/...dows/Assets/Square44x44Logo.scale-100.png → ...dows/Assets/Square44x44Logo.scale-100.png b/...dows/Assets/Square44x44Logo.scale-100.png → ...dows/Assets/Square44x44Logo.scale-100.png
diff --git a/...dows/Assets/Square44x44Logo.scale-125.png → ...dows/Assets/Square44x44Logo.scale-125.png b/...dows/Assets/Square44x44Logo.scale-125.png → ...dows/Assets/Square44x44Logo.scale-125.png
diff --git a/...dows/Assets/Square44x44Logo.scale-150.png → ...dows/Assets/Square44x44Logo.scale-150.png b/...dows/Assets/Square44x44Logo.scale-150.png → ...dows/Assets/Square44x44Logo.scale-150.png
diff --git a/...dows/Assets/Square44x44Logo.scale-200.png → ...dows/Assets/Square44x44Logo.scale-200.png b/...dows/Assets/Square44x44Logo.scale-200.png → ...dows/Assets/Square44x44Logo.scale-200.png
diff --git a/...dows/Assets/Square44x44Logo.scale-400.png → ...dows/Assets/Square44x44Logo.scale-400.png b/...dows/Assets/Square44x44Logo.scale-400.png → ...dows/Assets/Square44x44Logo.scale-400.png
diff --git a/.../Assets/Square44x44Logo.targetsize-16.png → .../Assets/Square44x44Logo.targetsize-16.png b/.../Assets/Square44x44Logo.targetsize-16.png → .../Assets/Square44x44Logo.targetsize-16.png
diff --git a/...44Logo.targetsize-16_altform-unplated.png → ...44Logo.targetsize-16_altform-unplated.png b/...44Logo.targetsize-16_altform-unplated.png → ...44Logo.targetsize-16_altform-unplated.png
diff --git a/.../Assets/Square44x44Logo.targetsize-24.png → .../Assets/Square44x44Logo.targetsize-24.png b/.../Assets/Square44x44Logo.targetsize-24.png → .../Assets/Square44x44Logo.targetsize-24.png
diff --git a/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png b/...44Logo.targetsize-24_altform-unplated.png → ...44Logo.targetsize-24_altform-unplated.png
diff --git a/...Assets/Square44x44Logo.targetsize-256.png → ...Assets/Square44x44Logo.targetsize-256.png b/...Assets/Square44x44Logo.targetsize-256.png → ...Assets/Square44x44Logo.targetsize-256.png
diff --git a/...4Logo.targetsize-256_altform-unplated.png → ...4Logo.targetsize-256_altform-unplated.png b/...4Logo.targetsize-256_altform-unplated.png → ...4Logo.targetsize-256_altform-unplated.png
diff --git a/.../Assets/Square44x44Logo.targetsize-32.png → .../Assets/Square44x44Logo.targetsize-32.png b/.../Assets/Square44x44Logo.targetsize-32.png → .../Assets/Square44x44Logo.targetsize-32.png
diff --git a/...44Logo.targetsize-32_altform-unplated.png → ...44Logo.targetsize-32_altform-unplated.png b/...44Logo.targetsize-32_altform-unplated.png → ...44Logo.targetsize-32_altform-unplated.png
diff --git a/.../Assets/Square44x44Logo.targetsize-48.png → .../Assets/Square44x44Logo.targetsize-48.png b/.../Assets/Square44x44Logo.targetsize-48.png → .../Assets/Square44x44Logo.targetsize-48.png
diff --git a/...44Logo.targetsize-48_altform-unplated.png → ...44Logo.targetsize-48_altform-unplated.png b/...44Logo.targetsize-48_altform-unplated.png → ...44Logo.targetsize-48_altform-unplated.png
diff --git a/...dows/Assets/Square71x71Logo.scale-100.png → ...dows/Assets/Square71x71Logo.scale-100.png b/...dows/Assets/Square71x71Logo.scale-100.png → ...dows/Assets/Square71x71Logo.scale-100.png
diff --git a/...dows/Assets/Square71x71Logo.scale-125.png → ...dows/Assets/Square71x71Logo.scale-125.png b/...dows/Assets/Square71x71Logo.scale-125.png → ...dows/Assets/Square71x71Logo.scale-125.png
diff --git a/...dows/Assets/Square71x71Logo.scale-150.png → ...dows/Assets/Square71x71Logo.scale-150.png b/...dows/Assets/Square71x71Logo.scale-150.png → ...dows/Assets/Square71x71Logo.scale-150.png
diff --git a/...dows/Assets/Square71x71Logo.scale-200.png → ...dows/Assets/Square71x71Logo.scale-200.png b/...dows/Assets/Square71x71Logo.scale-200.png → ...dows/Assets/Square71x71Logo.scale-200.png
diff --git a/...dows/Assets/Square71x71Logo.scale-400.png → ...dows/Assets/Square71x71Logo.scale-400.png b/...dows/Assets/Square71x71Logo.scale-400.png → ...dows/Assets/Square71x71Logo.scale-400.png
diff --git a/OpenHAB.Windows/Assets/StoreLogo.backup.png → ...enHAB.Windows/Assets/StoreLogo.backup.png b/OpenHAB.Windows/Assets/StoreLogo.backup.png → ...enHAB.Windows/Assets/StoreLogo.backup.png
diff --git a/...dows/Assets/Wide310x150Logo.scale-100.png → ...dows/Assets/Wide310x150Logo.scale-100.png b/...dows/Assets/Wide310x150Logo.scale-100.png → ...dows/Assets/Wide310x150Logo.scale-100.png
diff --git a/...dows/Assets/Wide310x150Logo.scale-125.png → ...dows/Assets/Wide310x150Logo.scale-125.png b/...dows/Assets/Wide310x150Logo.scale-125.png → ...dows/Assets/Wide310x150Logo.scale-125.png
diff --git a/...dows/Assets/Wide310x150Logo.scale-150.png → ...dows/Assets/Wide310x150Logo.scale-150.png b/...dows/Assets/Wide310x150Logo.scale-150.png → ...dows/Assets/Wide310x150Logo.scale-150.png
diff --git a/...dows/Assets/Wide310x150Logo.scale-200.png → ...dows/Assets/Wide310x150Logo.scale-200.png b/...dows/Assets/Wide310x150Logo.scale-200.png → ...dows/Assets/Wide310x150Logo.scale-200.png
diff --git a/...dows/Assets/Wide310x150Logo.scale-400.png → ...dows/Assets/Wide310x150Logo.scale-400.png b/...dows/Assets/Wide310x150Logo.scale-400.png → ...dows/Assets/Wide310x150Logo.scale-400.png
diff --git a/OpenHAB.Windows/Assets/background.jpg → src/openHAB.Windows/Assets/background.jpg b/OpenHAB.Windows/Assets/background.jpg → src/openHAB.Windows/Assets/background.jpg
diff --git a/...HAB.Windows/Assets/logoTransparantBig.png → ...HAB.Windows/Assets/logoTransparantBig.png b/...HAB.Windows/Assets/logoTransparantBig.png → ...HAB.Windows/Assets/logoTransparantBig.png
diff --git a/...AB.Windows/Assets/openhab-logo-square.png → ...AB.Windows/Assets/openhab-logo-square.png b/...AB.Windows/Assets/openhab-logo-square.png → ...AB.Windows/Assets/openhab-logo-square.png
diff --git a/OpenHAB.Windows/Assets/openhab.png → src/openHAB.Windows/Assets/openhab.png b/OpenHAB.Windows/Assets/openhab.png → src/openHAB.Windows/Assets/openhab.png
diff --git a/OpenHAB.Windows/Controls/ChartWidget.xaml → ...openHAB.Windows/Controls/ChartWidget.xaml b/OpenHAB.Windows/Controls/ChartWidget.xaml → ...openHAB.Windows/Controls/ChartWidget.xaml
diff --git a/OpenHAB.Windows/Controls/ChartWidget.xaml.cs → ...nHAB.Windows/Controls/ChartWidget.xaml.cs b/OpenHAB.Windows/Controls/ChartWidget.xaml.cs → ...nHAB.Windows/Controls/ChartWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/ColorMap.xaml → src/openHAB.Windows/Controls/ColorMap.xaml b/OpenHAB.Windows/Controls/ColorMap.xaml → src/openHAB.Windows/Controls/ColorMap.xaml
diff --git a/OpenHAB.Windows/Controls/ColorMap.xaml.cs → ...openHAB.Windows/Controls/ColorMap.xaml.cs b/OpenHAB.Windows/Controls/ColorMap.xaml.cs → ...openHAB.Windows/Controls/ColorMap.xaml.cs
diff --git a/OpenHAB.Windows/Controls/ColorWidget.xaml → ...openHAB.Windows/Controls/ColorWidget.xaml b/OpenHAB.Windows/Controls/ColorWidget.xaml → ...openHAB.Windows/Controls/ColorWidget.xaml
diff --git a/OpenHAB.Windows/Controls/ColorWidget.xaml.cs → ...nHAB.Windows/Controls/ColorWidget.xaml.cs b/OpenHAB.Windows/Controls/ColorWidget.xaml.cs → ...nHAB.Windows/Controls/ColorWidget.xaml.cs
diff --git a/...AB.Windows/Controls/ConnectionDialog.xaml → ...AB.Windows/Controls/ConnectionDialog.xaml b/...AB.Windows/Controls/ConnectionDialog.xaml → ...AB.Windows/Controls/ConnectionDialog.xaml
diff --git a/...Windows/Controls/ConnectionDialog.xaml.cs → ...Windows/Controls/ConnectionDialog.xaml.cs b/...Windows/Controls/ConnectionDialog.xaml.cs → ...Windows/Controls/ConnectionDialog.xaml.cs
diff --git a/...dows/Controls/DeviceFamilyStateTrigger.cs → ...dows/Controls/DeviceFamilyStateTrigger.cs b/...dows/Controls/DeviceFamilyStateTrigger.cs → ...dows/Controls/DeviceFamilyStateTrigger.cs
diff --git a/OpenHAB.Windows/Controls/FrameWidget.xaml → ...openHAB.Windows/Controls/FrameWidget.xaml b/OpenHAB.Windows/Controls/FrameWidget.xaml → ...openHAB.Windows/Controls/FrameWidget.xaml
diff --git a/OpenHAB.Windows/Controls/FrameWidget.xaml.cs → ...nHAB.Windows/Controls/FrameWidget.xaml.cs b/OpenHAB.Windows/Controls/FrameWidget.xaml.cs → ...nHAB.Windows/Controls/FrameWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/ImageLabel.xaml → src/openHAB.Windows/Controls/ImageLabel.xaml b/OpenHAB.Windows/Controls/ImageLabel.xaml → src/openHAB.Windows/Controls/ImageLabel.xaml
diff --git a/OpenHAB.Windows/Controls/ImageLabel.xaml.cs → ...enHAB.Windows/Controls/ImageLabel.xaml.cs b/OpenHAB.Windows/Controls/ImageLabel.xaml.cs → ...enHAB.Windows/Controls/ImageLabel.xaml.cs
diff --git a/OpenHAB.Windows/Controls/ImageWidget.xaml → ...openHAB.Windows/Controls/ImageWidget.xaml b/OpenHAB.Windows/Controls/ImageWidget.xaml → ...openHAB.Windows/Controls/ImageWidget.xaml
diff --git a/OpenHAB.Windows/Controls/ImageWidget.xaml.cs → ...nHAB.Windows/Controls/ImageWidget.xaml.cs b/OpenHAB.Windows/Controls/ImageWidget.xaml.cs → ...nHAB.Windows/Controls/ImageWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/MapViewWidget.xaml → ...enHAB.Windows/Controls/MapViewWidget.xaml b/OpenHAB.Windows/Controls/MapViewWidget.xaml → ...enHAB.Windows/Controls/MapViewWidget.xaml
diff --git a/...AB.Windows/Controls/MapViewWidget.xaml.cs → ...AB.Windows/Controls/MapViewWidget.xaml.cs b/...AB.Windows/Controls/MapViewWidget.xaml.cs → ...AB.Windows/Controls/MapViewWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/MjpegWidget.xaml → ...openHAB.Windows/Controls/MjpegWidget.xaml b/OpenHAB.Windows/Controls/MjpegWidget.xaml → ...openHAB.Windows/Controls/MjpegWidget.xaml
diff --git a/OpenHAB.Windows/Controls/MjpegWidget.xaml.cs → ...nHAB.Windows/Controls/MjpegWidget.xaml.cs b/OpenHAB.Windows/Controls/MjpegWidget.xaml.cs → ...nHAB.Windows/Controls/MjpegWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/NavMenuListView.cs → ...enHAB.Windows/Controls/NavMenuListView.cs b/OpenHAB.Windows/Controls/NavMenuListView.cs → ...enHAB.Windows/Controls/NavMenuListView.cs
diff --git a/OpenHAB.Windows/Controls/PageLinkWidget.xaml → ...nHAB.Windows/Controls/PageLinkWidget.xaml b/OpenHAB.Windows/Controls/PageLinkWidget.xaml → ...nHAB.Windows/Controls/PageLinkWidget.xaml
diff --git a/...B.Windows/Controls/PageLinkWidget.xaml.cs → ...B.Windows/Controls/PageLinkWidget.xaml.cs b/...B.Windows/Controls/PageLinkWidget.xaml.cs → ...B.Windows/Controls/PageLinkWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/RadialSlider.cs → src/openHAB.Windows/Controls/RadialSlider.cs b/OpenHAB.Windows/Controls/RadialSlider.cs → src/openHAB.Windows/Controls/RadialSlider.cs
diff --git a/...Windows/Controls/RollershutterWidget.xaml → ...Windows/Controls/RollershutterWidget.xaml b/...Windows/Controls/RollershutterWidget.xaml → ...Windows/Controls/RollershutterWidget.xaml
diff --git a/...dows/Controls/RollershutterWidget.xaml.cs → ...dows/Controls/RollershutterWidget.xaml.cs b/...dows/Controls/RollershutterWidget.xaml.cs → ...dows/Controls/RollershutterWidget.xaml.cs
diff --git a/...Windows/Controls/SectionSwitchWidget.xaml → ...Windows/Controls/SectionSwitchWidget.xaml b/...Windows/Controls/SectionSwitchWidget.xaml → ...Windows/Controls/SectionSwitchWidget.xaml
diff --git a/...dows/Controls/SectionSwitchWidget.xaml.cs → ...dows/Controls/SectionSwitchWidget.xaml.cs b/...dows/Controls/SectionSwitchWidget.xaml.cs → ...dows/Controls/SectionSwitchWidget.xaml.cs
diff --git a/...HAB.Windows/Controls/SelectionWidget.xaml → ...HAB.Windows/Controls/SelectionWidget.xaml b/...HAB.Windows/Controls/SelectionWidget.xaml → ...HAB.Windows/Controls/SelectionWidget.xaml
diff --git a/....Windows/Controls/SelectionWidget.xaml.cs → ....Windows/Controls/SelectionWidget.xaml.cs b/....Windows/Controls/SelectionWidget.xaml.cs → ....Windows/Controls/SelectionWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/SetpointWidget.xaml → ...nHAB.Windows/Controls/SetpointWidget.xaml b/OpenHAB.Windows/Controls/SetpointWidget.xaml → ...nHAB.Windows/Controls/SetpointWidget.xaml
diff --git a/...B.Windows/Controls/SetpointWidget.xaml.cs → ...B.Windows/Controls/SetpointWidget.xaml.cs b/...B.Windows/Controls/SetpointWidget.xaml.cs → ...B.Windows/Controls/SetpointWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/SliderWidget.xaml → ...penHAB.Windows/Controls/SliderWidget.xaml b/OpenHAB.Windows/Controls/SliderWidget.xaml → ...penHAB.Windows/Controls/SliderWidget.xaml
diff --git a/...HAB.Windows/Controls/SliderWidget.xaml.cs → ...HAB.Windows/Controls/SliderWidget.xaml.cs b/...HAB.Windows/Controls/SliderWidget.xaml.cs → ...HAB.Windows/Controls/SliderWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/SwitchWidget.xaml → ...penHAB.Windows/Controls/SwitchWidget.xaml b/OpenHAB.Windows/Controls/SwitchWidget.xaml → ...penHAB.Windows/Controls/SwitchWidget.xaml
diff --git a/...HAB.Windows/Controls/SwitchWidget.xaml.cs → ...HAB.Windows/Controls/SwitchWidget.xaml.cs b/...HAB.Windows/Controls/SwitchWidget.xaml.cs → ...HAB.Windows/Controls/SwitchWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/TextWidget.xaml → src/openHAB.Windows/Controls/TextWidget.xaml b/OpenHAB.Windows/Controls/TextWidget.xaml → src/openHAB.Windows/Controls/TextWidget.xaml
diff --git a/OpenHAB.Windows/Controls/TextWidget.xaml.cs → ...enHAB.Windows/Controls/TextWidget.xaml.cs b/OpenHAB.Windows/Controls/TextWidget.xaml.cs → ...enHAB.Windows/Controls/TextWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/ToggleWidget.xaml → ...penHAB.Windows/Controls/ToggleWidget.xaml b/OpenHAB.Windows/Controls/ToggleWidget.xaml → ...penHAB.Windows/Controls/ToggleWidget.xaml
diff --git a/...HAB.Windows/Controls/ToggleWidget.xaml.cs → ...HAB.Windows/Controls/ToggleWidget.xaml.cs b/...HAB.Windows/Controls/ToggleWidget.xaml.cs → ...HAB.Windows/Controls/ToggleWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/WebViewWidget.xaml → ...enHAB.Windows/Controls/WebViewWidget.xaml b/OpenHAB.Windows/Controls/WebViewWidget.xaml → ...enHAB.Windows/Controls/WebViewWidget.xaml
diff --git a/...AB.Windows/Controls/WebViewWidget.xaml.cs → ...AB.Windows/Controls/WebViewWidget.xaml.cs b/...AB.Windows/Controls/WebViewWidget.xaml.cs → ...AB.Windows/Controls/WebViewWidget.xaml.cs
diff --git a/OpenHAB.Windows/Controls/WidgetBase.cs → src/openHAB.Windows/Controls/WidgetBase.cs b/OpenHAB.Windows/Controls/WidgetBase.cs → src/openHAB.Windows/Controls/WidgetBase.cs
diff --git a/...onverters/BooleanToVisibilityConverter.cs → ...onverters/BooleanToVisibilityConverter.cs b/...onverters/BooleanToVisibilityConverter.cs → ...onverters/BooleanToVisibilityConverter.cs
diff --git a/...ndows/Converters/IconToBitmapConverter.cs → ...ndows/Converters/IconToBitmapConverter.cs b/...ndows/Converters/IconToBitmapConverter.cs → ...ndows/Converters/IconToBitmapConverter.cs
diff --git a/...Windows/Converters/IconToPathConverter.cs → ...Windows/Converters/IconToPathConverter.cs b/...Windows/Converters/IconToPathConverter.cs → ...Windows/Converters/IconToPathConverter.cs
diff --git a/...ws/Converters/MenuItemTemplateSelector.cs → ...ws/Converters/MenuItemTemplateSelector.cs b/...ws/Converters/MenuItemTemplateSelector.cs → ...ws/Converters/MenuItemTemplateSelector.cs
diff --git a/...dows/Converters/NullToBooleanConverter.cs → ...dows/Converters/NullToBooleanConverter.cs b/...dows/Converters/NullToBooleanConverter.cs → ...dows/Converters/NullToBooleanConverter.cs
diff --git a/...ws/Converters/ObjectToSitemapConverter.cs → ...ws/Converters/ObjectToSitemapConverter.cs b/...ws/Converters/ObjectToSitemapConverter.cs → ...ws/Converters/ObjectToSitemapConverter.cs
diff --git a/...dows/Converters/OpenHabUrlStateToGlyph.cs → ...dows/Converters/OpenHabUrlStateToGlyph.cs b/...dows/Converters/OpenHabUrlStateToGlyph.cs → ...dows/Converters/OpenHabUrlStateToGlyph.cs
diff --git a/...indows/Converters/ReverseBoolConverter.cs → ...indows/Converters/ReverseBoolConverter.cs b/...indows/Converters/ReverseBoolConverter.cs → ...indows/Converters/ReverseBoolConverter.cs
diff --git a/...indows/Converters/StateToBoolConverter.cs → ...indows/Converters/StateToBoolConverter.cs b/...indows/Converters/StateToBoolConverter.cs → ...indows/Converters/StateToBoolConverter.cs
diff --git a/...Converters/StringToColorBrushConverter.cs → ...Converters/StringToColorBrushConverter.cs b/...Converters/StringToColorBrushConverter.cs → ...Converters/StringToColorBrushConverter.cs
diff --git a/...ows/Converters/StringToDoubleConverter.cs → ...ows/Converters/StringToDoubleConverter.cs b/...ows/Converters/StringToDoubleConverter.cs → ...ows/Converters/StringToDoubleConverter.cs
diff --git a/...dows/Converters/WidgetTemplateSelector.cs → ...dows/Converters/WidgetTemplateSelector.cs b/...dows/Converters/WidgetTemplateSelector.cs → ...dows/Converters/WidgetTemplateSelector.cs
diff --git a/...s/Converters/ZeroToVisibilityConverter.cs → ...s/Converters/ZeroToVisibilityConverter.cs b/...s/Converters/ZeroToVisibilityConverter.cs → ...s/Converters/ZeroToVisibilityConverter.cs
diff --git a/OpenHAB.Windows/DIService.cs → src/openHAB.Windows/DIService.cs b/OpenHAB.Windows/DIService.cs → src/openHAB.Windows/DIService.cs
diff --git a/...ows/Extensions/ContentDialogExtensions.cs → ...ows/Extensions/ContentDialogExtensions.cs b/...ows/Extensions/ContentDialogExtensions.cs → ...ows/Extensions/ContentDialogExtensions.cs
diff --git a/OpenHAB.Windows/GlobalSuppressions.cs → src/openHAB.Windows/GlobalSuppressions.cs b/OpenHAB.Windows/GlobalSuppressions.cs → src/openHAB.Windows/GlobalSuppressions.cs
diff --git a/OpenHAB.Windows/OpenHAB.Windows_StoreKey.pfx → ...nHAB.Windows/OpenHAB.Windows_StoreKey.pfx b/OpenHAB.Windows/OpenHAB.Windows_StoreKey.pfx → ...nHAB.Windows/OpenHAB.Windows_StoreKey.pfx
diff --git a/OpenHAB.Windows/Package.StoreAssociation.xml → ...nHAB.Windows/Package.StoreAssociation.xml b/OpenHAB.Windows/Package.StoreAssociation.xml → ...nHAB.Windows/Package.StoreAssociation.xml
diff --git a/OpenHAB.Windows/Package.appxmanifest → src/openHAB.Windows/Package.appxmanifest b/OpenHAB.Windows/Package.appxmanifest → src/openHAB.Windows/Package.appxmanifest
diff --git a/OpenHAB.Windows/Properties/Annotations.cs → ...openHAB.Windows/Properties/Annotations.cs b/OpenHAB.Windows/Properties/Annotations.cs → ...openHAB.Windows/Properties/Annotations.cs
diff --git a/OpenHAB.Windows/Properties/AssemblyInfo.cs → ...penHAB.Windows/Properties/AssemblyInfo.cs b/OpenHAB.Windows/Properties/AssemblyInfo.cs → ...penHAB.Windows/Properties/AssemblyInfo.cs
diff --git a/OpenHAB.Windows/Properties/Default.rd.xml → ...openHAB.Windows/Properties/Default.rd.xml b/OpenHAB.Windows/Properties/Default.rd.xml → ...openHAB.Windows/Properties/Default.rd.xml
diff --git a/OpenHAB.Windows/Styles/DefaultTheme.xaml → src/openHAB.Windows/Styles/DefaultTheme.xaml b/OpenHAB.Windows/Styles/DefaultTheme.xaml → src/openHAB.Windows/Styles/DefaultTheme.xaml
diff --git a/OpenHAB.Windows/Themes/Generic.xaml → src/openHAB.Windows/Themes/Generic.xaml b/OpenHAB.Windows/Themes/Generic.xaml → src/openHAB.Windows/Themes/Generic.xaml
diff --git a/OpenHAB.Windows/View/LogViewerPage.xaml → src/openHAB.Windows/View/LogViewerPage.xaml b/OpenHAB.Windows/View/LogViewerPage.xaml → src/openHAB.Windows/View/LogViewerPage.xaml
diff --git a/OpenHAB.Windows/View/LogViewerPage.xaml.cs → ...penHAB.Windows/View/LogViewerPage.xaml.cs b/OpenHAB.Windows/View/LogViewerPage.xaml.cs → ...penHAB.Windows/View/LogViewerPage.xaml.cs
diff --git a/OpenHAB.Windows/View/MainPage.xaml → src/openHAB.Windows/View/MainPage.xaml b/OpenHAB.Windows/View/MainPage.xaml → src/openHAB.Windows/View/MainPage.xaml
diff --git a/OpenHAB.Windows/View/MainPage.xaml.cs → src/openHAB.Windows/View/MainPage.xaml.cs b/OpenHAB.Windows/View/MainPage.xaml.cs → src/openHAB.Windows/View/MainPage.xaml.cs
diff --git a/OpenHAB.Windows/View/SettingsPage.xaml → src/openHAB.Windows/View/SettingsPage.xaml b/OpenHAB.Windows/View/SettingsPage.xaml → src/openHAB.Windows/View/SettingsPage.xaml
diff --git a/OpenHAB.Windows/View/SettingsPage.xaml.cs → ...openHAB.Windows/View/SettingsPage.xaml.cs b/OpenHAB.Windows/View/SettingsPage.xaml.cs → ...openHAB.Windows/View/SettingsPage.xaml.cs
diff --git a/...ndows/ViewModel/ConfigurationViewModel.cs → ...ndows/ViewModel/ConfigurationViewModel.cs b/...ndows/ViewModel/ConfigurationViewModel.cs → ...ndows/ViewModel/ConfigurationViewModel.cs
diff --git a/...ws/ViewModel/ConnectionDialogViewModel.cs → ...ws/ViewModel/ConnectionDialogViewModel.cs b/...ws/ViewModel/ConnectionDialogViewModel.cs → ...ws/ViewModel/ConnectionDialogViewModel.cs
diff --git a/...s/ViewModel/ConnectionProfileViewModel.cs → ...s/ViewModel/ConnectionProfileViewModel.cs b/...s/ViewModel/ConnectionProfileViewModel.cs → ...s/ViewModel/ConnectionProfileViewModel.cs
diff --git a/OpenHAB.Windows/ViewModel/IViewModel.cs → src/openHAB.Windows/ViewModel/IViewModel.cs b/OpenHAB.Windows/ViewModel/IViewModel.cs → src/openHAB.Windows/ViewModel/IViewModel.cs
diff --git a/...AB.Windows/ViewModel/LanguageViewModel.cs → ...AB.Windows/ViewModel/LanguageViewModel.cs b/...AB.Windows/ViewModel/LanguageViewModel.cs → ...AB.Windows/ViewModel/LanguageViewModel.cs
diff --git a/OpenHAB.Windows/ViewModel/LogsViewModel.cs → ...penHAB.Windows/ViewModel/LogsViewModel.cs b/OpenHAB.Windows/ViewModel/LogsViewModel.cs → ...penHAB.Windows/ViewModel/LogsViewModel.cs
diff --git a/OpenHAB.Windows/ViewModel/MainViewModel.cs → ...penHAB.Windows/ViewModel/MainViewModel.cs b/OpenHAB.Windows/ViewModel/MainViewModel.cs → ...penHAB.Windows/ViewModel/MainViewModel.cs
diff --git a/...AB.Windows/ViewModel/SettingsViewModel.cs → ...AB.Windows/ViewModel/SettingsViewModel.cs b/...AB.Windows/ViewModel/SettingsViewModel.cs → ...AB.Windows/ViewModel/SettingsViewModel.cs
diff --git a/...HAB.Windows/ViewModel/SitemapViewModel.cs → ...HAB.Windows/ViewModel/SitemapViewModel.cs b/...HAB.Windows/ViewModel/SitemapViewModel.cs → ...HAB.Windows/ViewModel/SitemapViewModel.cs
diff --git a/OpenHAB.Windows/ViewModel/ViewModelBase.cs → ...penHAB.Windows/ViewModel/ViewModelBase.cs b/OpenHAB.Windows/ViewModel/ViewModelBase.cs → ...penHAB.Windows/ViewModel/ViewModelBase.cs
diff --git a/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig b/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig
@@ -0,0 +1,8 @@
+is_global = true
+build_property.TargetFramework = 
+build_property.TargetPlatformMinVersion = 10.0.17763.0
+build_property.UsingMicrosoftNETSdkWeb = 
+build_property.ProjectTypeGuids = {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+build_property.PublishSingleFile = 
+build_property.IncludeAllContentForSelfExtract = 
+build_property._SupportedPlatformList =
diff --git a/OpenHAB.Windows/OpenHAB.Windows.csproj → src/openHAB.Windows/openHAB.Windows.csproj b/OpenHAB.Windows/OpenHAB.Windows.csproj → src/openHAB.Windows/openHAB.Windows.csproj
@@ -400,14 +400,15 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\XamlCompiler\Microsoft.UI.Xaml.Markup.winmd</HintPath>
     </Reference>
-    <Reference Include="MJPEGDecoderWinRTLib">
-      <HintPath>..\Libs\MJPEGDecoderWinRTLib.dll</HintPath>
+    <Reference Include="MJPEGDecoderWinRTLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\libaries\MJPEGDecoderWinRTLib.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenHAB.Core\openHAB.Core.csproj">
+    <ProjectReference Include="..\openHAB.Core\Openhab.Core.csproj">
       <Project>{2a8fd10e-4ee5-4e25-b47c-2296e071f482}</Project>
-      <Name>openHAB.Core</Name>
+      <Name>Openhab.Core</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>