diff --git a/.github/workflows/github-compile.yml b/.github/workflows/github-compile.yml
index 920447a2..54c5b974 100644
--- a/.github/workflows/github-compile.yml
+++ b/.github/workflows/github-compile.yml
@@ -50,7 +50,7 @@ jobs:
       - name: '🏗 📦 Build, Pack & Announce New Release (if appropriate)'
         shell: bash
         run: |
-          cd               "$build_repository_folderpath"                                   \
+          cd               "$build_repository_folderpath/Laerdal.Scripts"                   \
                      &&                                                                     \
           dotnet                                                                            \
              msbuild                                                                        \
diff --git a/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties b/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties
index f398c33c..164080a8 100644
--- a/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties
+++ b/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties b/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties
index 070cb702..3eda44db 100644
--- a/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties
+++ b/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets
index a332d096..b2f1a6f1 100644
--- a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets
+++ b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets
@@ -74,10 +74,10 @@
         <Delete Files="$(CoreAarLibrary)"/>
 
         <!-- this builds mcumgr-laerdal-wrapper-release.aar     to make life easier we set +x permission on gradlew right before invoking it -->
-        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command="   $(GradlePath)     --version                                                            "/>
-        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command="   $(GradlePath)     wrapper    --distribution-type=BIN  --gradle-version=7.6             "/>
-        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command="   chmod   +x   ./gradlew                                                                 " Condition=" '$(IsUnix)' == 'true' "/>
-        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" ./gradlew    wrapper    clean   assembleRelease   --console plain   --warning-mode all   "/>
+        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command="   $(GradlePath)     --version                                                                  "/>
+        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command="   $(GradlePath)     wrapper    --distribution-type=BIN  --gradle-version=7.6  --validate-url   "/>
+        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command="   chmod   +x   ./gradlew                                                                       " Condition=" '$(IsUnix)' == 'true' "/>
+        <Exec WorkingDirectory="$(McuMgrLaerdalWrapperLibSourceDirectory)" Command=" ./gradlew    wrapper    clean   assembleRelease   --console plain   --warning-mode all         "/>
 
         <Copy SourceFiles="$(McuMgrLaerdalWrapperAarFilePath)" DestinationFiles="$(CoreAarLibrary)"/>
     </Target>
diff --git a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj
index 493884d7..90330324 100644
--- a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj
+++ b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj
@@ -55,10 +55,10 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
         <!-- these versions are getting replaced by the build script in one swift pass -->
-        <Version>1.0.1037.0</Version>
-        <FileVersion>1.0.1037.0</FileVersion>
-        <PackageVersion>1.0.1037.0</PackageVersion>
-        <AssemblyVersion>1.0.1037.0</AssemblyVersion>
+        <Version>1.0.1039.0</Version>
+        <FileVersion>1.0.1039.0</FileVersion>
+        <PackageVersion>1.0.1039.0</PackageVersion>
+        <AssemblyVersion>1.0.1039.0</AssemblyVersion>
 
         <Title>$(PackageId)</Title>
         <Owners>$(Authors)</Owners>
diff --git a/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj b/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj
index d27175cc..e99a1112 100644
--- a/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj
+++ b/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj
@@ -60,10 +60,10 @@
         <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
 
         <!-- these versions are getting replaced by the build script in one swift pass -->
-        <Version>1.0.1037.0</Version>
-        <FileVersion>1.0.1037.0</FileVersion>
-        <PackageVersion>1.0.1037.0</PackageVersion>
-        <AssemblyVersion>1.0.1037.0</AssemblyVersion>
+        <Version>1.0.1039.0</Version>
+        <FileVersion>1.0.1039.0</FileVersion>
+        <PackageVersion>1.0.1039.0</PackageVersion>
+        <AssemblyVersion>1.0.1039.0</AssemblyVersion>
 
         <Title>$(PackageId)</Title>
         <Summary>McuMgr Bindings for MacCatalyst - MAUI ready</Summary>
diff --git a/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj b/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj
index f7ed3a16..d84b1442 100644
--- a/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj
+++ b/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj
@@ -37,10 +37,10 @@
         <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
 
         <!-- these versions are getting replaced by the build script in one swift pass --> 
-        <Version>1.0.1037.0</Version>
-        <FileVersion>1.0.1037.0</FileVersion>
-        <PackageVersion>1.0.1037.0</PackageVersion>
-        <AssemblyVersion>1.0.1037.0</AssemblyVersion>
+        <Version>1.0.1039.0</Version>
+        <FileVersion>1.0.1039.0</FileVersion>
+        <PackageVersion>1.0.1039.0</PackageVersion>
+        <AssemblyVersion>1.0.1039.0</AssemblyVersion>
 
         <Title>$(PackageId)</Title>
         <Summary>McuMgr C# Implementation (WIP)</Summary>
diff --git a/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj b/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj
index 3709b892..2002baec 100644
--- a/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj
+++ b/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj
@@ -58,10 +58,10 @@
         <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
 
         <!-- these versions are getting replaced by the build script in one swift pass -->
-        <Version>1.0.1037.0</Version>
-        <FileVersion>1.0.1037.0</FileVersion>
-        <PackageVersion>1.0.1037.0</PackageVersion>
-        <AssemblyVersion>1.0.1037.0</AssemblyVersion>
+        <Version>1.0.1039.0</Version>
+        <FileVersion>1.0.1039.0</FileVersion>
+        <PackageVersion>1.0.1039.0</PackageVersion>
+        <AssemblyVersion>1.0.1039.0</AssemblyVersion>
 
         <Title>$(PackageId)</Title>
         <Summary>McuMgr Bindings for iOS - MAUI ready</Summary>
diff --git a/Laerdal.McuMgr.sln b/Laerdal.McuMgr.sln
index 0825d0c8..66832693 100644
--- a/Laerdal.McuMgr.sln
+++ b/Laerdal.McuMgr.sln
@@ -5,11 +5,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Misc", "_Misc", "{2459FC0F
 		LICENSE = LICENSE
 		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
-		Laerdal.CreateNewReleaseInGithub.sh = Laerdal.CreateNewReleaseInGithub.sh
-		Laerdal.McuMgr.Builder.targets = Laerdal.McuMgr.Builder.targets
-		Laerdal.Version.sh = Laerdal.Version.sh
+		Laerdal.CreateNewReleaseInGithub.sh = Laerdal.Scripts\Laerdal.CreateNewReleaseInGithub.sh
+		Laerdal.McuMgr.Builder.targets = Laerdal.Scripts\Laerdal.McuMgr.Builder.targets
+		Laerdal.Version.sh = Laerdal.Scripts\Laerdal.Version.sh
 		global.json = global.json
-		Laerdal.SetupBuildEnvironment.sh = Laerdal.SetupBuildEnvironment.sh
+		Laerdal.SetupBuildEnvironment.sh = Laerdal.Scripts\Laerdal.SetupBuildEnvironment.sh
 		.github\workflows\github-compile.yml = .github\workflows\github-compile.yml
 		.github\workflows\github-deploy.yml = .github\workflows\github-deploy.yml
 	EndProjectSection
diff --git a/Laerdal.McuMgr/Laerdal.McuMgr.csproj b/Laerdal.McuMgr/Laerdal.McuMgr.csproj
index e622eccf..75cb7a14 100644
--- a/Laerdal.McuMgr/Laerdal.McuMgr.csproj
+++ b/Laerdal.McuMgr/Laerdal.McuMgr.csproj
@@ -55,10 +55,10 @@
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 
         <!-- these versions are getting replaced by the build script in one swift pass -->
-        <Version>1.0.1037.0</Version>
-        <FileVersion>1.0.1037.0</FileVersion>
-        <PackageVersion>1.0.1037.0</PackageVersion>
-        <AssemblyVersion>1.0.1037.0</AssemblyVersion>
+        <Version>1.0.1039.0</Version>
+        <FileVersion>1.0.1039.0</FileVersion>
+        <PackageVersion>1.0.1039.0</PackageVersion>
+        <AssemblyVersion>1.0.1039.0</AssemblyVersion>
 
         <Title>$(PackageId)</Title>
         <Owners>$(Authors)</Owners>
@@ -149,21 +149,21 @@
     
     <!-- ANDROID -->
     <ItemGroup Condition=" '$(IsAndroid)' == 'true' ">
-        <PackageReference Include="Laerdal.McuMgr.Bindings.Android" Version="1.0.1037.0"/>
+        <PackageReference Include="Laerdal.McuMgr.Bindings.Android" Version="1.0.1039.0"/>
     </ItemGroup>
 
     <!-- IOS/MacCatalyst -->
     <ItemGroup Condition=" '$(IsIOS)' == 'true' ">
-        <PackageReference Include="Laerdal.McuMgr.Bindings.iOS" Version="1.0.1037.0"/>
+        <PackageReference Include="Laerdal.McuMgr.Bindings.iOS" Version="1.0.1039.0"/>
     </ItemGroup>
 
     <ItemGroup Condition=" '$(IsNetXMacCatalyst)' == 'true' and '$(ShouldSkipMacCatalyst)' != 'true' ">
-        <PackageReference Include="Laerdal.McuMgr.Bindings.MacCatalyst" Version="1.0.1037.0"/>
+        <PackageReference Include="Laerdal.McuMgr.Bindings.MacCatalyst" Version="1.0.1039.0"/>
     </ItemGroup>
 
     <!-- NETSTANDARD -->
     <ItemGroup Condition=" '$(IsNetStandard)' == 'true' ">
-        <PackageReference Include="Laerdal.McuMgr.Bindings.NetStandard" Version="1.0.1037.0"/>
+        <PackageReference Include="Laerdal.McuMgr.Bindings.NetStandard" Version="1.0.1039.0"/>
     </ItemGroup>
 
 </Project>
diff --git a/Laerdal.CreateNewReleaseInGithub.sh b/Laerdal.Scripts/Laerdal.CreateNewReleaseInGithub.sh
similarity index 100%
rename from Laerdal.CreateNewReleaseInGithub.sh
rename to Laerdal.Scripts/Laerdal.CreateNewReleaseInGithub.sh
diff --git a/Laerdal.McuMgr.Builder.targets b/Laerdal.Scripts/Laerdal.McuMgr.Builder.targets
similarity index 90%
rename from Laerdal.McuMgr.Builder.targets
rename to Laerdal.Scripts/Laerdal.McuMgr.Builder.targets
index b343825d..e84bdcf9 100644
--- a/Laerdal.McuMgr.Builder.targets
+++ b/Laerdal.Scripts/Laerdal.McuMgr.Builder.targets
@@ -6,19 +6,19 @@
 <!--                                                                                                                                                                        -->
 <!--        # on macos                                                                                                                                                      -->
 <!--        dotnet    msbuild                                            \                                                                                                  -->
-<!--            Laerdal.McuMgr.Builder.targets                           \                                                                                                  -->
+<!--            Laerdal.Scripts/Laerdal.McuMgr.Builder.targets           \                                                                                                  -->
 <!--            '"/m:1"'  '"/p:Laerdal_Version_Full=1.0.x.0"'                                                                                                               -->
 <!--                                                                                                                                                                        -->
 <!--        # on windows powershell                                                                                                                                         -->
-<!--        dotnet   msbuild                     ^                                                                                                                          -->
-<!--            Laerdal.McuMgr.Builder.targets   ^                                                                                                                          -->
+<!--        dotnet   msbuild                                     ^                                                                                                          -->
+<!--            Laerdal.Scripts\Laerdal.McuMgr.Builder.targets   ^                                                                                                          -->
 <!--            /m:1   /p:Laerdal_Version_Full=1.0.x.0                                                                                                                      -->
 <!--                                                                                                                                                                        -->
 <!--   - (use with caution - only use in localdev for testing) to calculate the proper version, build, tag and create a new release in github with changelog autogenerated  -->
 <!--                                                                                                                                                                        -->
 <!--       dotnet                                                                \                                                                                          -->
 <!--                msbuild                                                      \                                                                                          -->
-<!--                Laerdal.McuMgr.Builder.targets                               \                                                                                          -->
+<!--                Laerdal.Scripts/Laerdal.McuMgr.Builder.targets               \                                                                                          -->
 <!--                '"/m:1"'                                                     \                                                                                          -->
 <!--                '"/p:TF_BUILD=1"'                                            \                                                                                          -->
 <!--                '"/p:Laerdal_Source_Branch=<main / develop / ...>"'          \                                                                                          -->
@@ -34,10 +34,9 @@
         <ShouldRunTestSuite Condition=" '$(ShouldRunTestSuite)' == '' ">true</ShouldRunTestSuite>
 
         <PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$(BUILD_ARTIFACTSTAGINGDIRECTORY)</PackageOutputPath>
-        <PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `Artifacts/`))</PackageOutputPath>
-
-        <Laerdal_Test_Results_Folderpath Condition=" '$(Laerdal_Test_Results_Folderpath)' == '' ">TestResults</Laerdal_Test_Results_Folderpath>
-        <Laerdal_Test_Results_Folderpath Condition=" '$(Laerdal_Test_Results_Folderpath)' == '' ">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), $(Laerdal_Test_Results_Folderpath)))</Laerdal_Test_Results_Folderpath>
+        <PackageOutputPath Condition=" '$(PackageOutputPath)' == '' ">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Artifacts/`))</PackageOutputPath>
+        
+        <Laerdal_Test_Results_Folderpath Condition=" '$(Laerdal_Test_Results_Folderpath)' == '' ">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `TestResults`))</Laerdal_Test_Results_Folderpath>
 
         <ShouldSkipMacCatalyst Condition=" '$(ShouldSkipMacCatalyst)' == '' ">false</ShouldSkipMacCatalyst>
         
@@ -46,11 +45,13 @@
         <Laerdal_Repository_Path Condition="         '$(Laerdal_Repository_Path)'        == '' ">$(BUILD_REPOSITORY_NAME)</Laerdal_Repository_Path>
         <Laerdal_Should_Tag_And_Release Condition="  '$(Laerdal_Should_Tag_And_Release)' == ''  AND  ( '$(Laerdal_Source_Branch)' == 'refs/heads/main'  OR  '$(Laerdal_Source_Branch)' == 'refs/heads/master'  OR  '$(Laerdal_Source_Branch)' == 'refs/heads/develop' ) ">True</Laerdal_Should_Tag_And_Release>
 
-        <Laerdal_McuMgr_ProjectFile>Laerdal.McuMgr/Laerdal.McuMgr.csproj</Laerdal_McuMgr_ProjectFile>
-        <Laerdal_McuMgrBindings_ProjectFile_iOS>Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj</Laerdal_McuMgrBindings_ProjectFile_iOS>
-        <Laerdal_McuMgrBindings_ProjectFile_Android>Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj</Laerdal_McuMgrBindings_ProjectFile_Android>
-        <Laerdal_McuMgrBindings_ProjectFile_MacCatalyst>Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj</Laerdal_McuMgrBindings_ProjectFile_MacCatalyst>
-        <Laerdal_McuMgrBindings_ProjectFile_NetStandard>Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj</Laerdal_McuMgrBindings_ProjectFile_NetStandard>
+        <Laerdal_McuMgr_ProjectFile>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr`, `Laerdal.McuMgr.csproj`))</Laerdal_McuMgr_ProjectFile>
+        <Laerdal_McuMgrBindings_ProjectFile_iOS>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.iOS`, `Laerdal.McuMgr.Bindings.iOS.csproj`))</Laerdal_McuMgrBindings_ProjectFile_iOS>
+        <Laerdal_McuMgrBindings_ProjectFile_Android>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.Android`, `Laerdal.McuMgr.Bindings.Android.csproj`))</Laerdal_McuMgrBindings_ProjectFile_Android>
+        <Laerdal_McuMgrBindings_ProjectFile_MacCatalyst>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.MacCatalyst`, `Laerdal.McuMgr.Bindings.MacCatalyst.csproj`))</Laerdal_McuMgrBindings_ProjectFile_MacCatalyst>
+        <Laerdal_McuMgrBindings_ProjectFile_NetStandard>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.NetStandard`, `Laerdal.McuMgr.Bindings.NetStandard.csproj`))</Laerdal_McuMgrBindings_ProjectFile_NetStandard>
+
+        <Laerdal_McuMgrBindings_ProjectFile_Tests>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Tests`, `Laerdal.McuMgr.Tests.csproj`))</Laerdal_McuMgrBindings_ProjectFile_Tests>
     </PropertyGroup>
 
     <Target Name="PrintConfiguration">
@@ -87,7 +88,7 @@
               EchoOff="true"
               Command=" bash '$(Laerdal_Version_Script_Filepath)' $(_Laerdal_Version_Script_Parameters) "
               ConsoleToMSBuild="true"
-              WorkingDirectory="$(MSBuildThisFileDirectory)">
+              WorkingDirectory="$(MSBuildThisFileDirectory)/..">
             <Output TaskParameter="ConsoleOutput" PropertyName="Laerdal_Version_Full"/>
         </Exec>
 
@@ -187,7 +188,7 @@
         <PropertyGroup>
             <!-- in azure we have to specify the path to gradle explicitly so as to ensure we are using gradle 7.6 for smooth compilation of the android java-libs  -->
             <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)GradlePath=$(Laerdal_Gradle_Path);</_Laerdal_Build_Parameters>
-            <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/Laerdal.McuMgr.Bindings/;</_Laerdal_Build_Parameters>
+            <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/../Laerdal.McuMgr.Bindings/;</_Laerdal_Build_Parameters>
             <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)Configuration=$(Configuration);</_Laerdal_Build_Parameters>
             <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)PackageOutputPath=$(PackageOutputPath);</_Laerdal_Build_Parameters>
             <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)ShouldSkipMacCatalyst=$(ShouldSkipMacCatalyst);</_Laerdal_Build_Parameters>
@@ -214,7 +215,7 @@
         <MSBuild Projects="$(Laerdal_McuMgrBindings_ProjectFile_MacCatalyst)" Properties="$(_Laerdal_Build_Parameters)" Targets="Restore;Rebuild" Condition=" '$(ShouldSkipMacCatalyst)' != 'true' "/>
 
         <PropertyGroup>
-            <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/Laerdal.McuMgr/;</_Laerdal_Build_Parameters>
+            <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/../Laerdal.McuMgr/;</_Laerdal_Build_Parameters>
             <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)Laerdal_McuMgr_Bindings_Package_Version=$(Laerdal_Version_Assembly);</_Laerdal_Build_Parameters>
         </PropertyGroup>
 
@@ -228,7 +229,7 @@
             AfterTargets="BuildProjects">
 
         <MSBuild Targets="Restore"
-                 Projects="Laerdal.McuMgr.Tests/Laerdal.McuMgr.Tests.csproj"
+                 Projects="$(Laerdal_McuMgrBindings_ProjectFile_Tests)"
                  Properties="Configuration=$(Configuration);ShouldSkipMacCatalyst=$(ShouldSkipMacCatalyst);"/>
 
         <PropertyGroup>
@@ -241,7 +242,7 @@
 
         <Exec Command=" bash -c &quot;    dotnet   $(TestParameters)    &quot; "
               ConsoleToMSBuild="true"
-              WorkingDirectory="$(MSBuildThisFileDirectory)"/>
+              WorkingDirectory="$(MSBuildThisFileDirectory)/.."/>
 
         <ItemGroup>
             <TestReportFiles Include="$(Laerdal_Test_Results_Folderpath)\**\*.*;"/>
@@ -275,7 +276,7 @@
         <Error Condition=" '$(Laerdal_Github_Access_Token)' == '' " Text="'Laerdal_Github_Access_Token' has to be set. Please call this script again with the argument '/p:Laerdal_Github_Access_Token=...'" />
 
         <PropertyGroup>
-            <Laerdal_Create_Github_Release_Script_Filepath Condition=" '$(Laerdal_Create_Github_Release_Script_Filepath)' == '' ">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `Laerdal.CreateNewReleaseInGithub.sh`))</Laerdal_Create_Github_Release_Script_Filepath>
+            <Laerdal_Create_Github_Release_Script_Filepath Condition=" '$(Laerdal_Create_Github_Release_Script_Filepath)' == '' ">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.CreateNewReleaseInGithub.sh`))</Laerdal_Create_Github_Release_Script_Filepath>
 
             <_Laerdal_Create_Github_Release_Script_Parameters>$(_Laerdal_Create_Github_Release_Script_Parameters) --git-branch       '$(Laerdal_Source_Branch)'</_Laerdal_Create_Github_Release_Script_Parameters>
             <_Laerdal_Create_Github_Release_Script_Parameters>$(_Laerdal_Create_Github_Release_Script_Parameters) --tag-version      '$(Laerdal_Version_Base)'</_Laerdal_Create_Github_Release_Script_Parameters>
@@ -288,7 +289,7 @@
         <Exec Command="   bash    '$(Laerdal_Create_Github_Release_Script_Filepath)'   $(_Laerdal_Create_Github_Release_Script_Parameters) "
               EchoOff="true"
               ConsoleToMSBuild="true"
-              WorkingDirectory="$(MSBuildThisFileDirectory)"/>
+              WorkingDirectory="$(MSBuildThisFileDirectory)/.."/>
     </Target>
 
 </Project>
diff --git a/Laerdal.SetupBuildEnvironment.sh b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh
old mode 100755
new mode 100644
similarity index 100%
rename from Laerdal.SetupBuildEnvironment.sh
rename to Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh
diff --git a/Laerdal.Version.sh b/Laerdal.Scripts/Laerdal.Version.sh
similarity index 100%
rename from Laerdal.Version.sh
rename to Laerdal.Scripts/Laerdal.Version.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 71422e8d..6a79969c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -74,7 +74,7 @@ jobs:
         persistCredentials: True
 
       - task: Bash@3
-        displayName: 'Setup Build Environment for "Laerdal.Helpers"'
+        displayName: '🛠 Setup Build Environment'
         inputs:
           targetType: filePath
           filePath: 'Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh'
@@ -90,7 +90,7 @@ jobs:
         inputs:
           command: 'custom'
           custom: 'msbuild'
-          arguments: 'Laerdal.McuMgr.Builder.targets    -m:1  -p:ShouldSkipMacCatalyst="true"  -p:Laerdal_Gradle_Path="/usr/local/opt/gradle@7/bin/gradle"  -p:Laerdal_Test_Results_Folderpath="$(Laerdal_Test_Results_Folderpath)"     -p:Laerdal_Github_Access_Token="$(Github.ComponentsTeam.AccessToken)"   -p:Laerdal_Repository_Path="$(Repository.Path)"     -p:Laerdal_Source_Branch="$(Build.SourceBranch)"    -p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/Artifacts/" '
+          arguments: 'Laerdal.Scripts/Laerdal.McuMgr.Builder.targets    -m:1  -p:ShouldSkipMacCatalyst="true"  -p:Laerdal_Gradle_Path="/usr/local/opt/gradle@7/bin/gradle"  -p:Laerdal_Test_Results_Folderpath="$(Laerdal_Test_Results_Folderpath)"     -p:Laerdal_Github_Access_Token="$(Github.ComponentsTeam.AccessToken)"   -p:Laerdal_Repository_Path="$(Repository.Path)"     -p:Laerdal_Source_Branch="$(Build.SourceBranch)"    -p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/Artifacts/" '
 
       - task: PublishTestResults@2
         displayName: '📡 Publish Test Results'