diff --git a/NumericEntrySample.sln b/NumericEntrySample/NumericEntrySample.sln
similarity index 100%
rename from NumericEntrySample.sln
rename to NumericEntrySample/NumericEntrySample.sln
diff --git a/NumericEntrySample/App.xaml b/NumericEntrySample/NumericEntrySample/App.xaml
similarity index 100%
rename from NumericEntrySample/App.xaml
rename to NumericEntrySample/NumericEntrySample/App.xaml
diff --git a/NumericEntrySample/App.xaml.cs b/NumericEntrySample/NumericEntrySample/App.xaml.cs
similarity index 100%
rename from NumericEntrySample/App.xaml.cs
rename to NumericEntrySample/NumericEntrySample/App.xaml.cs
diff --git a/NumericEntrySample/AppShell.xaml b/NumericEntrySample/NumericEntrySample/AppShell.xaml
similarity index 100%
rename from NumericEntrySample/AppShell.xaml
rename to NumericEntrySample/NumericEntrySample/AppShell.xaml
diff --git a/NumericEntrySample/AppShell.xaml.cs b/NumericEntrySample/NumericEntrySample/AppShell.xaml.cs
similarity index 100%
rename from NumericEntrySample/AppShell.xaml.cs
rename to NumericEntrySample/NumericEntrySample/AppShell.xaml.cs
diff --git a/NumericEntrySample/MainPage.xaml b/NumericEntrySample/NumericEntrySample/MainPage.xaml
similarity index 100%
rename from NumericEntrySample/MainPage.xaml
rename to NumericEntrySample/NumericEntrySample/MainPage.xaml
diff --git a/NumericEntrySample/MainPage.xaml.cs b/NumericEntrySample/NumericEntrySample/MainPage.xaml.cs
similarity index 100%
rename from NumericEntrySample/MainPage.xaml.cs
rename to NumericEntrySample/NumericEntrySample/MainPage.xaml.cs
diff --git a/NumericEntrySample/MauiProgram.cs b/NumericEntrySample/NumericEntrySample/MauiProgram.cs
similarity index 100%
rename from NumericEntrySample/MauiProgram.cs
rename to NumericEntrySample/NumericEntrySample/MauiProgram.cs
diff --git a/NumericEntrySample/NumericEntrySample.csproj b/NumericEntrySample/NumericEntrySample/NumericEntrySample.csproj
similarity index 95%
rename from NumericEntrySample/NumericEntrySample.csproj
rename to NumericEntrySample/NumericEntrySample/NumericEntrySample.csproj
index 04a2efc..7eb880c 100644
--- a/NumericEntrySample/NumericEntrySample.csproj
+++ b/NumericEntrySample/NumericEntrySample/NumericEntrySample.csproj
@@ -33,7 +33,7 @@
None
- 15.0
+ 12.2
15.0
21.0
10.0.17763.0
@@ -61,8 +61,8 @@
-
-
+
+
diff --git a/NumericEntrySample/Platforms/Android/AndroidManifest.xml b/NumericEntrySample/NumericEntrySample/Platforms/Android/AndroidManifest.xml
similarity index 100%
rename from NumericEntrySample/Platforms/Android/AndroidManifest.xml
rename to NumericEntrySample/NumericEntrySample/Platforms/Android/AndroidManifest.xml
diff --git a/NumericEntrySample/Platforms/Android/MainActivity.cs b/NumericEntrySample/NumericEntrySample/Platforms/Android/MainActivity.cs
similarity index 100%
rename from NumericEntrySample/Platforms/Android/MainActivity.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/Android/MainActivity.cs
diff --git a/NumericEntrySample/Platforms/Android/MainApplication.cs b/NumericEntrySample/NumericEntrySample/Platforms/Android/MainApplication.cs
similarity index 100%
rename from NumericEntrySample/Platforms/Android/MainApplication.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/Android/MainApplication.cs
diff --git a/NumericEntrySample/Platforms/Android/Resources/values/colors.xml b/NumericEntrySample/NumericEntrySample/Platforms/Android/Resources/values/colors.xml
similarity index 100%
rename from NumericEntrySample/Platforms/Android/Resources/values/colors.xml
rename to NumericEntrySample/NumericEntrySample/Platforms/Android/Resources/values/colors.xml
diff --git a/NumericEntrySample/Platforms/MacCatalyst/AppDelegate.cs b/NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/AppDelegate.cs
similarity index 100%
rename from NumericEntrySample/Platforms/MacCatalyst/AppDelegate.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/AppDelegate.cs
diff --git a/NumericEntrySample/Platforms/MacCatalyst/Entitlements.plist b/NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/Entitlements.plist
similarity index 100%
rename from NumericEntrySample/Platforms/MacCatalyst/Entitlements.plist
rename to NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/Entitlements.plist
diff --git a/NumericEntrySample/Platforms/MacCatalyst/Info.plist b/NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/Info.plist
similarity index 100%
rename from NumericEntrySample/Platforms/MacCatalyst/Info.plist
rename to NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/Info.plist
diff --git a/NumericEntrySample/Platforms/MacCatalyst/Program.cs b/NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/Program.cs
similarity index 100%
rename from NumericEntrySample/Platforms/MacCatalyst/Program.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/MacCatalyst/Program.cs
diff --git a/NumericEntrySample/Platforms/Tizen/Main.cs b/NumericEntrySample/NumericEntrySample/Platforms/Tizen/Main.cs
similarity index 100%
rename from NumericEntrySample/Platforms/Tizen/Main.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/Tizen/Main.cs
diff --git a/NumericEntrySample/Platforms/Tizen/tizen-manifest.xml b/NumericEntrySample/NumericEntrySample/Platforms/Tizen/tizen-manifest.xml
similarity index 100%
rename from NumericEntrySample/Platforms/Tizen/tizen-manifest.xml
rename to NumericEntrySample/NumericEntrySample/Platforms/Tizen/tizen-manifest.xml
diff --git a/NumericEntrySample/Platforms/Windows/App.xaml b/NumericEntrySample/NumericEntrySample/Platforms/Windows/App.xaml
similarity index 100%
rename from NumericEntrySample/Platforms/Windows/App.xaml
rename to NumericEntrySample/NumericEntrySample/Platforms/Windows/App.xaml
diff --git a/NumericEntrySample/Platforms/Windows/App.xaml.cs b/NumericEntrySample/NumericEntrySample/Platforms/Windows/App.xaml.cs
similarity index 100%
rename from NumericEntrySample/Platforms/Windows/App.xaml.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/Windows/App.xaml.cs
diff --git a/NumericEntrySample/Platforms/Windows/Package.appxmanifest b/NumericEntrySample/NumericEntrySample/Platforms/Windows/Package.appxmanifest
similarity index 100%
rename from NumericEntrySample/Platforms/Windows/Package.appxmanifest
rename to NumericEntrySample/NumericEntrySample/Platforms/Windows/Package.appxmanifest
diff --git a/NumericEntrySample/Platforms/Windows/app.manifest b/NumericEntrySample/NumericEntrySample/Platforms/Windows/app.manifest
similarity index 100%
rename from NumericEntrySample/Platforms/Windows/app.manifest
rename to NumericEntrySample/NumericEntrySample/Platforms/Windows/app.manifest
diff --git a/NumericEntrySample/Platforms/iOS/AppDelegate.cs b/NumericEntrySample/NumericEntrySample/Platforms/iOS/AppDelegate.cs
similarity index 100%
rename from NumericEntrySample/Platforms/iOS/AppDelegate.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/iOS/AppDelegate.cs
diff --git a/NumericEntrySample/Platforms/iOS/Info.plist b/NumericEntrySample/NumericEntrySample/Platforms/iOS/Info.plist
similarity index 100%
rename from NumericEntrySample/Platforms/iOS/Info.plist
rename to NumericEntrySample/NumericEntrySample/Platforms/iOS/Info.plist
diff --git a/NumericEntrySample/Platforms/iOS/Program.cs b/NumericEntrySample/NumericEntrySample/Platforms/iOS/Program.cs
similarity index 100%
rename from NumericEntrySample/Platforms/iOS/Program.cs
rename to NumericEntrySample/NumericEntrySample/Platforms/iOS/Program.cs
diff --git a/NumericEntrySample/Platforms/iOS/Resources/PrivacyInfo.xcprivacy b/NumericEntrySample/NumericEntrySample/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
similarity index 100%
rename from NumericEntrySample/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
rename to NumericEntrySample/NumericEntrySample/Platforms/iOS/Resources/PrivacyInfo.xcprivacy
diff --git a/NumericEntrySample/Properties/launchSettings.json b/NumericEntrySample/NumericEntrySample/Properties/launchSettings.json
similarity index 100%
rename from NumericEntrySample/Properties/launchSettings.json
rename to NumericEntrySample/NumericEntrySample/Properties/launchSettings.json
diff --git a/NumericEntrySample/Resources/AppIcon/appicon.svg b/NumericEntrySample/NumericEntrySample/Resources/AppIcon/appicon.svg
similarity index 100%
rename from NumericEntrySample/Resources/AppIcon/appicon.svg
rename to NumericEntrySample/NumericEntrySample/Resources/AppIcon/appicon.svg
diff --git a/NumericEntrySample/Resources/AppIcon/appiconfg.svg b/NumericEntrySample/NumericEntrySample/Resources/AppIcon/appiconfg.svg
similarity index 100%
rename from NumericEntrySample/Resources/AppIcon/appiconfg.svg
rename to NumericEntrySample/NumericEntrySample/Resources/AppIcon/appiconfg.svg
diff --git a/NumericEntrySample/Resources/Fonts/FluentUI.cs b/NumericEntrySample/NumericEntrySample/Resources/Fonts/FluentUI.cs
similarity index 100%
rename from NumericEntrySample/Resources/Fonts/FluentUI.cs
rename to NumericEntrySample/NumericEntrySample/Resources/Fonts/FluentUI.cs
diff --git a/NumericEntrySample/Resources/Fonts/OpenSans-Regular.ttf b/NumericEntrySample/NumericEntrySample/Resources/Fonts/OpenSans-Regular.ttf
similarity index 100%
rename from NumericEntrySample/Resources/Fonts/OpenSans-Regular.ttf
rename to NumericEntrySample/NumericEntrySample/Resources/Fonts/OpenSans-Regular.ttf
diff --git a/NumericEntrySample/Resources/Fonts/OpenSans-Semibold.ttf b/NumericEntrySample/NumericEntrySample/Resources/Fonts/OpenSans-Semibold.ttf
similarity index 100%
rename from NumericEntrySample/Resources/Fonts/OpenSans-Semibold.ttf
rename to NumericEntrySample/NumericEntrySample/Resources/Fonts/OpenSans-Semibold.ttf
diff --git a/NumericEntrySample/Resources/Images/dotnet_bot.png b/NumericEntrySample/NumericEntrySample/Resources/Images/dotnet_bot.png
similarity index 100%
rename from NumericEntrySample/Resources/Images/dotnet_bot.png
rename to NumericEntrySample/NumericEntrySample/Resources/Images/dotnet_bot.png
diff --git a/NumericEntrySample/Resources/Raw/AboutAssets.txt b/NumericEntrySample/NumericEntrySample/Resources/Raw/AboutAssets.txt
similarity index 100%
rename from NumericEntrySample/Resources/Raw/AboutAssets.txt
rename to NumericEntrySample/NumericEntrySample/Resources/Raw/AboutAssets.txt
diff --git a/NumericEntrySample/Resources/SfNumericEntry.de-DE.resx b/NumericEntrySample/NumericEntrySample/Resources/SfNumericEntry.de-DE.resx
similarity index 100%
rename from NumericEntrySample/Resources/SfNumericEntry.de-DE.resx
rename to NumericEntrySample/NumericEntrySample/Resources/SfNumericEntry.de-DE.resx
diff --git a/NumericEntrySample/Resources/SfNumericEntry.en-US.resx b/NumericEntrySample/NumericEntrySample/Resources/SfNumericEntry.en-US.resx
similarity index 100%
rename from NumericEntrySample/Resources/SfNumericEntry.en-US.resx
rename to NumericEntrySample/NumericEntrySample/Resources/SfNumericEntry.en-US.resx
diff --git a/NumericEntrySample/Resources/SfNumericEntry.fr-FR.resx b/NumericEntrySample/NumericEntrySample/Resources/SfNumericEntry.fr-FR.resx
similarity index 100%
rename from NumericEntrySample/Resources/SfNumericEntry.fr-FR.resx
rename to NumericEntrySample/NumericEntrySample/Resources/SfNumericEntry.fr-FR.resx
diff --git a/NumericEntrySample/Resources/Splash/splash.svg b/NumericEntrySample/NumericEntrySample/Resources/Splash/splash.svg
similarity index 100%
rename from NumericEntrySample/Resources/Splash/splash.svg
rename to NumericEntrySample/NumericEntrySample/Resources/Splash/splash.svg
diff --git a/NumericEntrySample/Resources/Styles/Colors.xaml b/NumericEntrySample/NumericEntrySample/Resources/Styles/Colors.xaml
similarity index 100%
rename from NumericEntrySample/Resources/Styles/Colors.xaml
rename to NumericEntrySample/NumericEntrySample/Resources/Styles/Colors.xaml
diff --git a/NumericEntrySample/Resources/Styles/Styles.xaml b/NumericEntrySample/NumericEntrySample/Resources/Styles/Styles.xaml
similarity index 100%
rename from NumericEntrySample/Resources/Styles/Styles.xaml
rename to NumericEntrySample/NumericEntrySample/Resources/Styles/Styles.xaml