diff --git a/ChipGroupSample/.vs/ProjectEvaluation/chipgroupsample.app.metadata.v6.1 b/ChipGroupSample/.vs/ProjectEvaluation/chipgroupsample.app.metadata.v6.1
deleted file mode 100644
index bec6be3..0000000
Binary files a/ChipGroupSample/.vs/ProjectEvaluation/chipgroupsample.app.metadata.v6.1 and /dev/null differ
diff --git a/ChipGroupSample/.vs/ProjectEvaluation/chipgroupsample.app.projects.v6.1 b/ChipGroupSample/.vs/ProjectEvaluation/chipgroupsample.app.projects.v6.1
deleted file mode 100644
index 1fcf7da..0000000
Binary files a/ChipGroupSample/.vs/ProjectEvaluation/chipgroupsample.app.projects.v6.1 and /dev/null differ
diff --git a/ChipGroupSample/ChipGroupSample.csproj.user b/ChipGroupSample/ChipGroupSample.csproj.user
deleted file mode 100644
index eb4f91b..0000000
--- a/ChipGroupSample/ChipGroupSample.csproj.user
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
-    <ActiveDebugFramework>net7.0-android</ActiveDebugFramework>
-    <ActiveDebugProfile>Pixel 5 - API 33 New1 (Android 13.0 - API 33)</ActiveDebugProfile>
-    <SelectedPlatformGroup>Emulator</SelectedPlatformGroup>
-    <DefaultDevice>pixel_5_-_api_33_new1</DefaultDevice>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/ChipGroupSample.sln b/ChipGroupSample/ChipGroupSample.sln
similarity index 100%
rename from ChipGroupSample.sln
rename to ChipGroupSample/ChipGroupSample.sln
diff --git a/ChipGroupSample/App.xaml b/ChipGroupSample/ChipGroupSample/App.xaml
similarity index 100%
rename from ChipGroupSample/App.xaml
rename to ChipGroupSample/ChipGroupSample/App.xaml
diff --git a/ChipGroupSample/App.xaml.cs b/ChipGroupSample/ChipGroupSample/App.xaml.cs
similarity index 100%
rename from ChipGroupSample/App.xaml.cs
rename to ChipGroupSample/ChipGroupSample/App.xaml.cs
diff --git a/ChipGroupSample/AppShell.xaml b/ChipGroupSample/ChipGroupSample/AppShell.xaml
similarity index 100%
rename from ChipGroupSample/AppShell.xaml
rename to ChipGroupSample/ChipGroupSample/AppShell.xaml
diff --git a/ChipGroupSample/AppShell.xaml.cs b/ChipGroupSample/ChipGroupSample/AppShell.xaml.cs
similarity index 100%
rename from ChipGroupSample/AppShell.xaml.cs
rename to ChipGroupSample/ChipGroupSample/AppShell.xaml.cs
diff --git a/ChipGroupSample/ChipGroupSample.csproj b/ChipGroupSample/ChipGroupSample/ChipGroupSample.csproj
similarity index 81%
rename from ChipGroupSample/ChipGroupSample.csproj
rename to ChipGroupSample/ChipGroupSample/ChipGroupSample.csproj
index b65b620..2e2df3b 100644
--- a/ChipGroupSample/ChipGroupSample.csproj
+++ b/ChipGroupSample/ChipGroupSample/ChipGroupSample.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>ChipGroupSample</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -22,8 +22,8 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
@@ -49,8 +49,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="*" />
+		<PackageReference Include="Newtonsoft.Json" Version="*" />
 		<PackageReference Include="Syncfusion.Maui.Core" Version="*" />
 	</ItemGroup>
 
diff --git a/ChipGroupSample/MainPage.xaml b/ChipGroupSample/ChipGroupSample/MainPage.xaml
similarity index 100%
rename from ChipGroupSample/MainPage.xaml
rename to ChipGroupSample/ChipGroupSample/MainPage.xaml
diff --git a/ChipGroupSample/MainPage.xaml.cs b/ChipGroupSample/ChipGroupSample/MainPage.xaml.cs
similarity index 100%
rename from ChipGroupSample/MainPage.xaml.cs
rename to ChipGroupSample/ChipGroupSample/MainPage.xaml.cs
diff --git a/ChipGroupSample/MauiProgram.cs b/ChipGroupSample/ChipGroupSample/MauiProgram.cs
similarity index 100%
rename from ChipGroupSample/MauiProgram.cs
rename to ChipGroupSample/ChipGroupSample/MauiProgram.cs
diff --git a/ChipGroupSample/Model.cs b/ChipGroupSample/ChipGroupSample/Model.cs
similarity index 100%
rename from ChipGroupSample/Model.cs
rename to ChipGroupSample/ChipGroupSample/Model.cs
diff --git a/ChipGroupSample/Platforms/Android/AndroidManifest.xml b/ChipGroupSample/ChipGroupSample/Platforms/Android/AndroidManifest.xml
similarity index 100%
rename from ChipGroupSample/Platforms/Android/AndroidManifest.xml
rename to ChipGroupSample/ChipGroupSample/Platforms/Android/AndroidManifest.xml
diff --git a/ChipGroupSample/Platforms/Android/MainActivity.cs b/ChipGroupSample/ChipGroupSample/Platforms/Android/MainActivity.cs
similarity index 100%
rename from ChipGroupSample/Platforms/Android/MainActivity.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/Android/MainActivity.cs
diff --git a/ChipGroupSample/Platforms/Android/MainApplication.cs b/ChipGroupSample/ChipGroupSample/Platforms/Android/MainApplication.cs
similarity index 100%
rename from ChipGroupSample/Platforms/Android/MainApplication.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/Android/MainApplication.cs
diff --git a/ChipGroupSample/Platforms/Android/Resources/values/colors.xml b/ChipGroupSample/ChipGroupSample/Platforms/Android/Resources/values/colors.xml
similarity index 100%
rename from ChipGroupSample/Platforms/Android/Resources/values/colors.xml
rename to ChipGroupSample/ChipGroupSample/Platforms/Android/Resources/values/colors.xml
diff --git a/ChipGroupSample/Platforms/MacCatalyst/AppDelegate.cs b/ChipGroupSample/ChipGroupSample/Platforms/MacCatalyst/AppDelegate.cs
similarity index 100%
rename from ChipGroupSample/Platforms/MacCatalyst/AppDelegate.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/MacCatalyst/AppDelegate.cs
diff --git a/ChipGroupSample/Platforms/MacCatalyst/Info.plist b/ChipGroupSample/ChipGroupSample/Platforms/MacCatalyst/Info.plist
similarity index 100%
rename from ChipGroupSample/Platforms/MacCatalyst/Info.plist
rename to ChipGroupSample/ChipGroupSample/Platforms/MacCatalyst/Info.plist
diff --git a/ChipGroupSample/Platforms/MacCatalyst/Program.cs b/ChipGroupSample/ChipGroupSample/Platforms/MacCatalyst/Program.cs
similarity index 100%
rename from ChipGroupSample/Platforms/MacCatalyst/Program.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/MacCatalyst/Program.cs
diff --git a/ChipGroupSample/Platforms/Tizen/Main.cs b/ChipGroupSample/ChipGroupSample/Platforms/Tizen/Main.cs
similarity index 100%
rename from ChipGroupSample/Platforms/Tizen/Main.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/Tizen/Main.cs
diff --git a/ChipGroupSample/Platforms/Tizen/tizen-manifest.xml b/ChipGroupSample/ChipGroupSample/Platforms/Tizen/tizen-manifest.xml
similarity index 100%
rename from ChipGroupSample/Platforms/Tizen/tizen-manifest.xml
rename to ChipGroupSample/ChipGroupSample/Platforms/Tizen/tizen-manifest.xml
diff --git a/ChipGroupSample/Platforms/Windows/App.xaml b/ChipGroupSample/ChipGroupSample/Platforms/Windows/App.xaml
similarity index 100%
rename from ChipGroupSample/Platforms/Windows/App.xaml
rename to ChipGroupSample/ChipGroupSample/Platforms/Windows/App.xaml
diff --git a/ChipGroupSample/Platforms/Windows/App.xaml.cs b/ChipGroupSample/ChipGroupSample/Platforms/Windows/App.xaml.cs
similarity index 100%
rename from ChipGroupSample/Platforms/Windows/App.xaml.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/Windows/App.xaml.cs
diff --git a/ChipGroupSample/Platforms/Windows/Package.appxmanifest b/ChipGroupSample/ChipGroupSample/Platforms/Windows/Package.appxmanifest
similarity index 100%
rename from ChipGroupSample/Platforms/Windows/Package.appxmanifest
rename to ChipGroupSample/ChipGroupSample/Platforms/Windows/Package.appxmanifest
diff --git a/ChipGroupSample/Platforms/Windows/app.manifest b/ChipGroupSample/ChipGroupSample/Platforms/Windows/app.manifest
similarity index 100%
rename from ChipGroupSample/Platforms/Windows/app.manifest
rename to ChipGroupSample/ChipGroupSample/Platforms/Windows/app.manifest
diff --git a/ChipGroupSample/Platforms/iOS/AppDelegate.cs b/ChipGroupSample/ChipGroupSample/Platforms/iOS/AppDelegate.cs
similarity index 100%
rename from ChipGroupSample/Platforms/iOS/AppDelegate.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/iOS/AppDelegate.cs
diff --git a/ChipGroupSample/Platforms/iOS/Info.plist b/ChipGroupSample/ChipGroupSample/Platforms/iOS/Info.plist
similarity index 100%
rename from ChipGroupSample/Platforms/iOS/Info.plist
rename to ChipGroupSample/ChipGroupSample/Platforms/iOS/Info.plist
diff --git a/ChipGroupSample/Platforms/iOS/Program.cs b/ChipGroupSample/ChipGroupSample/Platforms/iOS/Program.cs
similarity index 100%
rename from ChipGroupSample/Platforms/iOS/Program.cs
rename to ChipGroupSample/ChipGroupSample/Platforms/iOS/Program.cs
diff --git a/ChipGroupSample/Properties/launchSettings.json b/ChipGroupSample/ChipGroupSample/Properties/launchSettings.json
similarity index 100%
rename from ChipGroupSample/Properties/launchSettings.json
rename to ChipGroupSample/ChipGroupSample/Properties/launchSettings.json
diff --git a/ChipGroupSample/Resources/AppIcon/appicon.svg b/ChipGroupSample/ChipGroupSample/Resources/AppIcon/appicon.svg
similarity index 100%
rename from ChipGroupSample/Resources/AppIcon/appicon.svg
rename to ChipGroupSample/ChipGroupSample/Resources/AppIcon/appicon.svg
diff --git a/ChipGroupSample/Resources/AppIcon/appiconfg.svg b/ChipGroupSample/ChipGroupSample/Resources/AppIcon/appiconfg.svg
similarity index 100%
rename from ChipGroupSample/Resources/AppIcon/appiconfg.svg
rename to ChipGroupSample/ChipGroupSample/Resources/AppIcon/appiconfg.svg
diff --git a/ChipGroupSample/Resources/Fonts/OpenSans-Regular.ttf b/ChipGroupSample/ChipGroupSample/Resources/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from ChipGroupSample/Resources/Fonts/OpenSans-Regular.ttf
rename to ChipGroupSample/ChipGroupSample/Resources/Fonts/OpenSans-Regular.ttf
diff --git a/ChipGroupSample/Resources/Fonts/OpenSans-Semibold.ttf b/ChipGroupSample/ChipGroupSample/Resources/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from ChipGroupSample/Resources/Fonts/OpenSans-Semibold.ttf
rename to ChipGroupSample/ChipGroupSample/Resources/Fonts/OpenSans-Semibold.ttf
diff --git a/ChipGroupSample/Resources/Images/dotnet_bot.svg b/ChipGroupSample/ChipGroupSample/Resources/Images/dotnet_bot.svg
similarity index 100%
rename from ChipGroupSample/Resources/Images/dotnet_bot.svg
rename to ChipGroupSample/ChipGroupSample/Resources/Images/dotnet_bot.svg
diff --git a/ChipGroupSample/Resources/Raw/AboutAssets.txt b/ChipGroupSample/ChipGroupSample/Resources/Raw/AboutAssets.txt
similarity index 100%
rename from ChipGroupSample/Resources/Raw/AboutAssets.txt
rename to ChipGroupSample/ChipGroupSample/Resources/Raw/AboutAssets.txt
diff --git a/ChipGroupSample/Resources/Splash/splash.svg b/ChipGroupSample/ChipGroupSample/Resources/Splash/splash.svg
similarity index 100%
rename from ChipGroupSample/Resources/Splash/splash.svg
rename to ChipGroupSample/ChipGroupSample/Resources/Splash/splash.svg
diff --git a/ChipGroupSample/Resources/Styles/Colors.xaml b/ChipGroupSample/ChipGroupSample/Resources/Styles/Colors.xaml
similarity index 100%
rename from ChipGroupSample/Resources/Styles/Colors.xaml
rename to ChipGroupSample/ChipGroupSample/Resources/Styles/Colors.xaml
diff --git a/ChipGroupSample/Resources/Styles/Styles.xaml b/ChipGroupSample/ChipGroupSample/Resources/Styles/Styles.xaml
similarity index 100%
rename from ChipGroupSample/Resources/Styles/Styles.xaml
rename to ChipGroupSample/ChipGroupSample/Resources/Styles/Styles.xaml
diff --git a/ChipGroupSample/ViewModel.cs b/ChipGroupSample/ChipGroupSample/ViewModel.cs
similarity index 100%
rename from ChipGroupSample/ViewModel.cs
rename to ChipGroupSample/ChipGroupSample/ViewModel.cs