diff --git a/Marechai.App/App.xaml.cs b/Marechai.App/App.xaml.cs
index 61bae854..83eb47ab 100644
--- a/Marechai.App/App.xaml.cs
+++ b/Marechai.App/App.xaml.cs
@@ -1,4 +1,6 @@
 using System.Net.Http;
+using Marechai.App.Presentation.ViewModels;
+using Marechai.App.Presentation.Views;
 using Marechai.App.Services;
 using Microsoft.UI.Xaml;
 using Uno.Extensions;
@@ -8,6 +10,11 @@ using Uno.Extensions.Http;
 using Uno.Extensions.Localization;
 using Uno.Extensions.Navigation;
 using Uno.UI;
+using ComputersListViewModel = Marechai.App.Presentation.ViewModels.ComputersListViewModel;
+using ComputersViewModel = Marechai.App.Presentation.ViewModels.ComputersViewModel;
+using MachineViewViewModel = Marechai.App.Presentation.ViewModels.MachineViewViewModel;
+using MainViewModel = Marechai.App.Presentation.ViewModels.MainViewModel;
+using NewsViewModel = Marechai.App.Presentation.ViewModels.NewsViewModel;
 
 namespace Marechai.App;
 
diff --git a/Marechai.App/Helpers/UntypedNodeExtractor.cs b/Marechai.App/Helpers/UntypedNodeExtractor.cs
index 762554cc..11a0f4cb 100644
--- a/Marechai.App/Helpers/UntypedNodeExtractor.cs
+++ b/Marechai.App/Helpers/UntypedNodeExtractor.cs
@@ -1,6 +1,6 @@
 using Microsoft.Kiota.Abstractions.Serialization;
 
-namespace Marechai.App.Services;
+namespace Marechai.App.Helpers;
 
 /// <summary>
 ///     Helper class for extracting values from Kiota UntypedNode objects.
diff --git a/Marechai.App/Marechai.App.csproj b/Marechai.App/Marechai.App.csproj
index 1f8beaf9..9be6967d 100644
--- a/Marechai.App/Marechai.App.csproj
+++ b/Marechai.App/Marechai.App.csproj
@@ -44,5 +44,39 @@
   <ItemGroup>
     <PackageReference Include="Humanizer"/>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Presentation\Views\Shell.xaml.cs">
+      <DependentUpon>Shell.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+    <Compile Update="Presentation\Views\SecondPage.xaml.cs">
+      <DependentUpon>SecondPage.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+    <Compile Update="Presentation\Views\ComputersPage.xaml.cs">
+      <DependentUpon>ComputersPage.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+    <Compile Update="Presentation\Views\MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+    <Compile Update="Presentation\Views\ComputersListPage.xaml.cs">
+      <DependentUpon>ComputersListPage.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+    <Compile Update="Presentation\Views\NewsPage.xaml.cs">
+      <DependentUpon>NewsPage.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+    <Compile Update="Presentation\Views\MachineViewPage.xaml.cs">
+      <DependentUpon>MachineViewPage.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+    <Compile Update="Presentation\Components\Sidebar.xaml.cs">
+      <DependentUpon>Sidebar.xaml</DependentUpon>
+      <IsDefaultItem>true</IsDefaultItem>
+    </Compile>
+  </ItemGroup>
 
 </Project>
diff --git a/Marechai.App/Presentation/Components/Sidebar.xaml b/Marechai.App/Presentation/Components/Sidebar.xaml
index a3dceb7f..b5da531a 100644
--- a/Marechai.App/Presentation/Components/Sidebar.xaml
+++ b/Marechai.App/Presentation/Components/Sidebar.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0"
       encoding="utf-8"?>
 
-<UserControl x:Class="Marechai.App.Presentation.Sidebar"
+<UserControl x:Class="Marechai.App.Presentation.Components.Sidebar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Marechai.App/Presentation/Components/Sidebar.xaml.cs b/Marechai.App/Presentation/Components/Sidebar.xaml.cs
index ca7bd64f..72a10b76 100644
--- a/Marechai.App/Presentation/Components/Sidebar.xaml.cs
+++ b/Marechai.App/Presentation/Components/Sidebar.xaml.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml.Controls;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Components;
 
 public sealed partial class Sidebar : UserControl
 {
diff --git a/Marechai.App/Presentation/Models/MachineViewNavigationParameter.cs b/Marechai.App/Presentation/Models/MachineViewNavigationParameter.cs
index 382e0c99..afd55f58 100644
--- a/Marechai.App/Presentation/Models/MachineViewNavigationParameter.cs
+++ b/Marechai.App/Presentation/Models/MachineViewNavigationParameter.cs
@@ -23,7 +23,7 @@
 // Copyright © 2003-2026 Natalia Portillo
 *******************************************************************************/
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Models;
 
 /// <summary>
 ///     Navigation parameter for the MachineViewPage containing both the machine ID and the navigation source.
diff --git a/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs b/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
index dd9dfdaa..2fa92341 100644
--- a/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
@@ -6,10 +6,12 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using Marechai.App.Helpers;
+using Marechai.App.Presentation.Models;
 using Marechai.App.Services;
 using Uno.Extensions.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.ViewModels;
 
 /// <summary>
 ///     ViewModel for displaying a filtered list of computers
diff --git a/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs b/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
index 5a917965..649826a9 100644
--- a/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
@@ -5,7 +5,7 @@ using System.Windows.Input;
 using Marechai.App.Services;
 using Uno.Extensions.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.ViewModels;
 
 public partial class ComputersViewModel : ObservableObject
 {
diff --git a/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs b/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
index 675f564b..a6209a36 100644
--- a/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
@@ -30,12 +30,13 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
 using Humanizer;
+using Marechai.App.Helpers;
 using Marechai.App.Services;
 using Marechai.Data;
 using Microsoft.UI.Xaml;
 using Uno.Extensions.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.ViewModels;
 
 public partial class MachineViewViewModel : ObservableObject
 {
diff --git a/Marechai.App/Presentation/ViewModels/MainViewModel.cs b/Marechai.App/Presentation/ViewModels/MainViewModel.cs
index 0d3c6172..8a23d5cd 100644
--- a/Marechai.App/Presentation/ViewModels/MainViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/MainViewModel.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Uno.Extensions.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.ViewModels;
 
 public partial class MainViewModel : ObservableObject
 {
diff --git a/Marechai.App/Presentation/ViewModels/NewsViewModel.cs b/Marechai.App/Presentation/ViewModels/NewsViewModel.cs
index 9267a4e6..3e67c51a 100644
--- a/Marechai.App/Presentation/ViewModels/NewsViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/NewsViewModel.cs
@@ -2,11 +2,13 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+using Marechai.App.Helpers;
+using Marechai.App.Presentation.Models;
 using Marechai.App.Services;
 using Marechai.Data;
 using Uno.Extensions.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.ViewModels;
 
 /// <summary>
 ///     Wrapper for NewsDto with generated display text
diff --git a/Marechai.App/Presentation/ViewModels/SecondViewModel.cs b/Marechai.App/Presentation/ViewModels/SecondViewModel.cs
index cd90246d..f59b44d4 100644
--- a/Marechai.App/Presentation/ViewModels/SecondViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/SecondViewModel.cs
@@ -1,5 +1,3 @@
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.ViewModels;
 
-public partial record SecondViewModel(Entity Entity)
-{
-}
+public record SecondViewModel(Entity Entity) {}
\ No newline at end of file
diff --git a/Marechai.App/Presentation/ViewModels/ShellViewModel.cs b/Marechai.App/Presentation/ViewModels/ShellViewModel.cs
index 38c4b1a6..13edb3f6 100644
--- a/Marechai.App/Presentation/ViewModels/ShellViewModel.cs
+++ b/Marechai.App/Presentation/ViewModels/ShellViewModel.cs
@@ -1,15 +1,12 @@
 using Uno.Extensions.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.ViewModels;
 
 public class ShellViewModel
 {
     private readonly INavigator _navigator;
 
-    public ShellViewModel(
-        INavigator navigator)
-    {
-        _navigator = navigator;
-        // Add code here to initialize or attach event handlers to singleton services
-    }
-}
+    public ShellViewModel(INavigator navigator) => _navigator = navigator;
+
+    // Add code here to initialize or attach event handlers to singleton services
+}
\ No newline at end of file
diff --git a/Marechai.App/Presentation/Views/ComputersListPage.xaml b/Marechai.App/Presentation/Views/ComputersListPage.xaml
index d07b048b..e98f1551 100644
--- a/Marechai.App/Presentation/Views/ComputersListPage.xaml
+++ b/Marechai.App/Presentation/Views/ComputersListPage.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0"
       encoding="utf-8"?>
 
-<Page x:Class="Marechai.App.Presentation.ComputersListPage"
+<Page x:Class="Marechai.App.Presentation.Views.ComputersListPage"
       x:Name="PageRoot"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/Marechai.App/Presentation/Views/ComputersListPage.xaml.cs b/Marechai.App/Presentation/Views/ComputersListPage.xaml.cs
index 4b907dea..db1de9f3 100644
--- a/Marechai.App/Presentation/Views/ComputersListPage.xaml.cs
+++ b/Marechai.App/Presentation/Views/ComputersListPage.xaml.cs
@@ -1,7 +1,8 @@
+using Marechai.App.Presentation.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Views;
 
 /// <summary>
 ///     Professional list view for displaying computers filtered by letter, year, or all.
diff --git a/Marechai.App/Presentation/Views/ComputersPage.xaml b/Marechai.App/Presentation/Views/ComputersPage.xaml
index 8e6b91c6..abafb0b8 100644
--- a/Marechai.App/Presentation/Views/ComputersPage.xaml
+++ b/Marechai.App/Presentation/Views/ComputersPage.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0"
       encoding="utf-8"?>
 
-<Page x:Class="Marechai.App.Presentation.ComputersPage"
+<Page x:Class="Marechai.App.Presentation.Views.ComputersPage"
       x:Name="PageRoot"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -128,156 +128,6 @@
 
     <Page.Resources>
         <!-- Keyboard Key Button Style (revised: more padding, simplified borders to avoid clipping, darker scheme) -->
-        <Style x:Key="KeyboardKeyButtonStyle"
-               TargetType="Button">
-            <!-- Base appearance -->
-            <Setter Property="Foreground"
-                    Value="#1A1A1A" />
-            <Setter Property="Background">
-                <Setter.Value>
-                    <LinearGradientBrush StartPoint="0,0"
-                                         EndPoint="0,1">
-                        <GradientStop Color="#D6D6D6"
-                                      Offset="0" />
-                        <GradientStop Color="#C2C2C2"
-                                      Offset="0.55" />
-                        <GradientStop Color="#B0B0B0"
-                                      Offset="1" />
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="BorderBrush"
-                    Value="#7A7A7A" />
-            <Setter Property="BorderThickness"
-                    Value="1" />
-            <Setter Property="CornerRadius"
-                    Value="6" />
-            <Setter Property="Padding"
-                    Value="14,12" /> <!-- Increased vertical padding to prevent cutoff -->
-            <Setter Property="Margin"
-                    Value="4" />
-            <Setter Property="FontFamily"
-                    Value="Segoe UI" />
-            <Setter Property="FontWeight"
-                    Value="SemiBold" />
-            <Setter Property="FontSize"
-                    Value="15" />
-            <Setter Property="HorizontalAlignment"
-                    Value="Stretch" />
-            <Setter Property="VerticalAlignment"
-                    Value="Stretch" />
-            <Setter Property="HorizontalContentAlignment"
-                    Value="Center" />
-            <Setter Property="VerticalContentAlignment"
-                    Value="Center" />
-            <Setter Property="MinWidth"
-                    Value="52" />
-            <Setter Property="MinHeight"
-                    Value="52" /> <!-- Larger min height avoids clipping ascenders/descenders -->
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Grid>
-                            <!-- Shadow (simple) -->
-                            <Border x:Name="Shadow"
-                                    CornerRadius="6"
-                                    Background="#33000000"
-                                    Margin="2,4,4,2" />
-                            <!-- Key surface -->
-                            <Border x:Name="KeyBorder"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding CornerRadius}">
-                                <!-- Inner highlight & content -->
-                                <Grid>
-                                    <Border CornerRadius="{TemplateBinding CornerRadius}"
-                                            BorderBrush="#60FFFFFF"
-                                            BorderThickness="1,1,0,0" />
-                                    <Border CornerRadius="{TemplateBinding CornerRadius}"
-                                            BorderBrush="#30000000"
-                                            BorderThickness="0,0,1,1" />
-                                    <ContentPresenter x:Name="ContentPresenter"
-                                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                      Margin="0"
-                                                      TextWrapping="NoWrap" />
-                                </Grid>
-                            </Border>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal" />
-                                    <VisualState x:Name="PointerOver">
-                                        <VisualState.Setters>
-                                            <Setter Target="KeyBorder.Background">
-                                                <Setter.Value>
-                                                    <LinearGradientBrush StartPoint="0,0"
-                                                                         EndPoint="0,1">
-                                                        <GradientStop Color="#E0E0E0"
-                                                                      Offset="0" />
-                                                        <GradientStop Color="#CFCFCF"
-                                                                      Offset="0.55" />
-                                                        <GradientStop Color="#BDBDBD"
-                                                                      Offset="1" />
-                                                    </LinearGradientBrush>
-                                                </Setter.Value>
-                                            </Setter>
-                                            <Setter Target="KeyBorder.BorderBrush"
-                                                    Value="#5F5F5F" />
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="Pressed">
-                                        <VisualState.Setters>
-                                            <Setter Target="KeyBorder.Background">
-                                                <Setter.Value>
-                                                    <LinearGradientBrush StartPoint="0,0"
-                                                                         EndPoint="0,1">
-                                                        <GradientStop Color="#9C9C9C"
-                                                                      Offset="0" />
-                                                        <GradientStop Color="#A8A8A8"
-                                                                      Offset="0.55" />
-                                                        <GradientStop Color="#B4B4B4"
-                                                                      Offset="1" />
-                                                    </LinearGradientBrush>
-                                                </Setter.Value>
-                                            </Setter>
-                                            <Setter Target="KeyBorder.BorderBrush"
-                                                    Value="#4A4A4A" />
-                                            <Setter Target="KeyBorder.RenderTransform">
-                                                <Setter.Value>
-                                                    <TranslateTransform Y="2" />
-                                                </Setter.Value>
-                                            </Setter>
-                                            <Setter Target="Shadow.Opacity"
-                                                    Value="0.15" />
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="Disabled">
-                                        <VisualState.Setters>
-                                            <Setter Target="KeyBorder.Opacity"
-                                                    Value="0.45" />
-                                            <Setter Target="ContentPresenter.Foreground"
-                                                    Value="#777777" />
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="FocusStates">
-                                    <VisualState x:Name="Focused">
-                                        <VisualState.Setters>
-                                            <Setter Target="KeyBorder.BorderBrush"
-                                                    Value="#3A7AFE" />
-                                            <Setter Target="KeyBorder.BorderThickness"
-                                                    Value="2" />
-                                        </VisualState.Setters>
-                                    </VisualState>
-                                    <VisualState x:Name="Unfocused" />
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
 
         <!-- Responsive Grid Layouts -->
         <UniformGridLayout x:Key="LettersGridLayout"
diff --git a/Marechai.App/Presentation/Views/ComputersPage.xaml.cs b/Marechai.App/Presentation/Views/ComputersPage.xaml.cs
index 5aa3f365..6593dc5b 100644
--- a/Marechai.App/Presentation/Views/ComputersPage.xaml.cs
+++ b/Marechai.App/Presentation/Views/ComputersPage.xaml.cs
@@ -1,8 +1,9 @@
+using Marechai.App.Presentation.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Views;
 
 public sealed partial class ComputersPage : Page
 {
diff --git a/Marechai.App/Presentation/Views/MachineViewPage.xaml b/Marechai.App/Presentation/Views/MachineViewPage.xaml
index a2887f5c..b3a8c7ce 100644
--- a/Marechai.App/Presentation/Views/MachineViewPage.xaml
+++ b/Marechai.App/Presentation/Views/MachineViewPage.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0"
       encoding="utf-8"?>
 
-<Page x:Class="Marechai.App.Presentation.MachineViewPage"
+<Page x:Class="Marechai.App.Presentation.Views.MachineViewPage"
       x:Name="PageRoot"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/Marechai.App/Presentation/Views/MachineViewPage.xaml.cs b/Marechai.App/Presentation/Views/MachineViewPage.xaml.cs
index 6a804bb7..e2f7bcb6 100644
--- a/Marechai.App/Presentation/Views/MachineViewPage.xaml.cs
+++ b/Marechai.App/Presentation/Views/MachineViewPage.xaml.cs
@@ -25,11 +25,13 @@
 
 #nullable enable
 
+using Marechai.App.Presentation.Models;
+using Marechai.App.Presentation.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Views;
 
 public sealed partial class MachineViewPage : Page
 {
diff --git a/Marechai.App/Presentation/Views/MainPage.xaml b/Marechai.App/Presentation/Views/MainPage.xaml
index 38224443..8369d7a0 100644
--- a/Marechai.App/Presentation/Views/MainPage.xaml
+++ b/Marechai.App/Presentation/Views/MainPage.xaml
@@ -1,12 +1,12 @@
 <?xml version="1.0"
       encoding="utf-8"?>
 
-<Page x:Class="Marechai.App.Presentation.MainPage"
+<Page x:Class="Marechai.App.Presentation.Views.MainPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Marechai.App.Presentation"
       xmlns:utu="using:Uno.Toolkit.UI"
       xmlns:uen="using:Uno.Extensions.Navigation.UI"
+      xmlns:components="clr-namespace:Marechai.App.Presentation.Components"
       NavigationCacheMode="Required"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
@@ -27,9 +27,9 @@
               Grid.Column="0"
               Width="280"
               HorizontalAlignment="Left">
-            <local:Sidebar x:Name="SidebarPanel"
-                           DataContext="{Binding}"
-                           VerticalAlignment="Stretch" />
+            <components:Sidebar x:Name="SidebarPanel"
+                                DataContext="{Binding}"
+                                VerticalAlignment="Stretch" />
         </Grid>
 
         <!-- Header -->
diff --git a/Marechai.App/Presentation/Views/MainPage.xaml.cs b/Marechai.App/Presentation/Views/MainPage.xaml.cs
index 120b51ca..85cfe3fa 100644
--- a/Marechai.App/Presentation/Views/MainPage.xaml.cs
+++ b/Marechai.App/Presentation/Views/MainPage.xaml.cs
@@ -1,9 +1,10 @@
 using System;
 using System.ComponentModel;
+using Marechai.App.Presentation.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Views;
 
 public sealed partial class MainPage : Page
 {
diff --git a/Marechai.App/Presentation/Views/NewsPage.xaml b/Marechai.App/Presentation/Views/NewsPage.xaml
index 0f1521cf..3cfd3c4a 100644
--- a/Marechai.App/Presentation/Views/NewsPage.xaml
+++ b/Marechai.App/Presentation/Views/NewsPage.xaml
@@ -1,7 +1,7 @@
 <?xml version="1.0"
       encoding="utf-8"?>
 
-<Page x:Class="Marechai.App.Presentation.NewsPage"
+<Page x:Class="Marechai.App.Presentation.Views.NewsPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:utu="using:Uno.Toolkit.UI"
diff --git a/Marechai.App/Presentation/Views/NewsPage.xaml.cs b/Marechai.App/Presentation/Views/NewsPage.xaml.cs
index 387df8fd..297d4e09 100644
--- a/Marechai.App/Presentation/Views/NewsPage.xaml.cs
+++ b/Marechai.App/Presentation/Views/NewsPage.xaml.cs
@@ -1,10 +1,11 @@
 using System;
 using Windows.Foundation;
+using Marechai.App.Presentation.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Views;
 
 public sealed partial class NewsPage : Page
 {
diff --git a/Marechai.App/Presentation/Views/SecondPage.xaml b/Marechai.App/Presentation/Views/SecondPage.xaml
index 7f5f8274..ad4a7845 100644
--- a/Marechai.App/Presentation/Views/SecondPage.xaml
+++ b/Marechai.App/Presentation/Views/SecondPage.xaml
@@ -1,27 +1,22 @@
-<Page x:Class="Marechai.App.Presentation.SecondPage"
+<Page x:Class="Marechai.App.Presentation.Views.SecondPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Marechai.App.Presentation"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:uen="using:Uno.Extensions.Navigation.UI"
       xmlns:utu="using:Uno.Toolkit.UI"
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-  <Grid utu:SafeArea.Insets="VisibleBounds">
-    <Grid.RowDefinitions>
-      <RowDefinition Height="Auto" />
-      <RowDefinition />
-    </Grid.RowDefinitions>
-    <utu:NavigationBar Content="Second Page" />
-    <StackPanel Grid.Row="1"
-          HorizontalAlignment="Center"
-          VerticalAlignment="Center">
-      <TextBlock Text="{Binding Entity.Name}"
-        HorizontalAlignment="Center"
-        VerticalAlignment="Center"
-        Margin="8" />
-    </StackPanel>
+    <Grid utu:SafeArea.Insets="VisibleBounds">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" /> <RowDefinition />
+        </Grid.RowDefinitions>
+        <utu:NavigationBar Content="Second Page" />
+        <StackPanel Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+            <TextBlock Text="{Binding Entity.Name}"
+                       HorizontalAlignment="Center"
+                       VerticalAlignment="Center"
+                       Margin="8" />
+        </StackPanel>
 
-  </Grid>
-</Page>
+    </Grid>
+</Page>
\ No newline at end of file
diff --git a/Marechai.App/Presentation/Views/SecondPage.xaml.cs b/Marechai.App/Presentation/Views/SecondPage.xaml.cs
index 8d0eff64..cb728081 100644
--- a/Marechai.App/Presentation/Views/SecondPage.xaml.cs
+++ b/Marechai.App/Presentation/Views/SecondPage.xaml.cs
@@ -1,11 +1,11 @@
 using Microsoft.UI.Xaml.Controls;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Views;
 
 public sealed partial class SecondPage : Page
 {
     public SecondPage()
     {
-        this.InitializeComponent();
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/Marechai.App/Presentation/Views/Shell.xaml b/Marechai.App/Presentation/Views/Shell.xaml
index 7cc97d14..57fda752 100644
--- a/Marechai.App/Presentation/Views/Shell.xaml
+++ b/Marechai.App/Presentation/Views/Shell.xaml
@@ -1,36 +1,34 @@
-<UserControl x:Class="Marechai.App.Presentation.Shell"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:local="using:Marechai.App.Presentation"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:utu="using:Uno.Toolkit.UI"
-      mc:Ignorable="d"
-      d:DesignHeight="300"
-      d:DesignWidth="400">
-  <Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-    <utu:ExtendedSplashScreen x:Name="Splash"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                HorizontalContentAlignment="Stretch"
-                VerticalContentAlignment="Stretch">
-      <utu:ExtendedSplashScreen.LoadingContentTemplate>
-        <DataTemplate>
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="2*" />
-              <RowDefinition />
-            </Grid.RowDefinitions>
+<UserControl x:Class="Marechai.App.Presentation.Views.Shell"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:utu="using:Uno.Toolkit.UI"
+             mc:Ignorable="d"
+             d:DesignHeight="300"
+             d:DesignWidth="400">
+    <Border Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+        <utu:ExtendedSplashScreen x:Name="Splash"
+                                  HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  HorizontalContentAlignment="Stretch"
+                                  VerticalContentAlignment="Stretch">
+            <utu:ExtendedSplashScreen.LoadingContentTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="2*" /> <RowDefinition />
+                        </Grid.RowDefinitions>
 
-            <ProgressRing IsActive="True"
-                  Grid.Row="1"
-                  VerticalAlignment="Center"
-                  HorizontalAlignment="Center"
-                  Height="100"
-                  Width="100" />
-          </Grid>
-        </DataTemplate>
-      </utu:ExtendedSplashScreen.LoadingContentTemplate>
-    </utu:ExtendedSplashScreen>
-  </Border>
-</UserControl>
+                        <ProgressRing IsActive="True"
+                                      Grid.Row="1"
+                                      VerticalAlignment="Center"
+                                      HorizontalAlignment="Center"
+                                      Height="100"
+                                      Width="100" />
+                    </Grid>
+                </DataTemplate>
+            </utu:ExtendedSplashScreen.LoadingContentTemplate>
+        </utu:ExtendedSplashScreen>
+    </Border>
+</UserControl>
\ No newline at end of file
diff --git a/Marechai.App/Presentation/Views/Shell.xaml.cs b/Marechai.App/Presentation/Views/Shell.xaml.cs
index 2306cba3..cf0e1bf1 100644
--- a/Marechai.App/Presentation/Views/Shell.xaml.cs
+++ b/Marechai.App/Presentation/Views/Shell.xaml.cs
@@ -1,14 +1,14 @@
 using Microsoft.UI.Xaml.Controls;
 using Uno.Extensions.Hosting;
 
-namespace Marechai.App.Presentation;
+namespace Marechai.App.Presentation.Views;
 
 public sealed partial class Shell : UserControl, IContentControlProvider
 {
     public Shell()
     {
-        this.InitializeComponent();
+        InitializeComponent();
     }
 
     public ContentControl ContentControl => Splash;
-}
+}
\ No newline at end of file
diff --git a/Marechai.App/Services/ComputersService.cs b/Marechai.App/Services/ComputersService.cs
index 5548683b..b6f03d3f 100644
--- a/Marechai.App/Services/ComputersService.cs
+++ b/Marechai.App/Services/ComputersService.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Marechai.App.Helpers;
 using Microsoft.Kiota.Abstractions.Serialization;
 
 namespace Marechai.App.Services;