diff --git a/src/NET_8/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj b/src/NET_8/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj
index 408e343..07a63d6 100644
--- a/src/NET_8/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj
+++ b/src/NET_8/DateCalculator/DateCalculator.Maui/DateCalculator.Maui.csproj
@@ -61,6 +61,7 @@
         <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
         <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
         <PackageReference Include="CommunityToolkit.Maui" Version="9.*" />
+        <PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.*" />
         <PackageReference Include="VijayAnand.FontAwesome" Version="2.*" />
     </ItemGroup>
 
diff --git a/src/NET_8/DateCalculator/DateCalculator.Maui/MauiProgram.cs b/src/NET_8/DateCalculator/DateCalculator.Maui/MauiProgram.cs
index 794daea..e60e895 100644
--- a/src/NET_8/DateCalculator/DateCalculator.Maui/MauiProgram.cs
+++ b/src/NET_8/DateCalculator/DateCalculator.Maui/MauiProgram.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui;
+using CommunityToolkit.Maui.Markup;
 using CommunityToolkit.Maui.Behaviors;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/NET_8/DateCalculator/DateCalculator.Wpf/App.xaml b/src/NET_8/DateCalculator/DateCalculator.Wpf/App.xaml
index 719b400..f6add57 100644
--- a/src/NET_8/DateCalculator/DateCalculator.Wpf/App.xaml
+++ b/src/NET_8/DateCalculator/DateCalculator.Wpf/App.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:DateCalculator.Wpf"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
-    StartupUri="MainWindow.xaml">
+    StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
         <!-- Update the base FontSize to set it across all Controls styles -->
         <sys:Double x:Key="AppFontSize">14</sys:Double>
diff --git a/src/NET_8/DateCalculator/DateCalculator.Wpf/MainWindow.xaml b/src/NET_8/DateCalculator/DateCalculator.Wpf/Views/MainWindow.xaml
similarity index 99%
rename from src/NET_8/DateCalculator/DateCalculator.Wpf/MainWindow.xaml
rename to src/NET_8/DateCalculator/DateCalculator.Wpf/Views/MainWindow.xaml
index b14d349..14625cd 100644
--- a/src/NET_8/DateCalculator/DateCalculator.Wpf/MainWindow.xaml
+++ b/src/NET_8/DateCalculator/DateCalculator.Wpf/Views/MainWindow.xaml
@@ -1,5 +1,5 @@
 <Window
-    x:Class="DateCalculator.Wpf.MainWindow"
+    x:Class="DateCalculator.Wpf.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:DateCalculator.Wpf.Converters"
diff --git a/src/NET_8/DateCalculator/DateCalculator.Wpf/MainWindow.xaml.cs b/src/NET_8/DateCalculator/DateCalculator.Wpf/Views/MainWindow.xaml.cs
similarity index 85%
rename from src/NET_8/DateCalculator/DateCalculator.Wpf/MainWindow.xaml.cs
rename to src/NET_8/DateCalculator/DateCalculator.Wpf/Views/MainWindow.xaml.cs
index 59f6c76..e834d94 100644
--- a/src/NET_8/DateCalculator/DateCalculator.Wpf/MainWindow.xaml.cs
+++ b/src/NET_8/DateCalculator/DateCalculator.Wpf/Views/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-namespace DateCalculator.Wpf
+namespace DateCalculator.Wpf.Views
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml