diff --git a/Marechai.App/Services/UntypedNodeExtractor.cs b/Marechai.App/Helpers/UntypedNodeExtractor.cs
similarity index 100%
rename from Marechai.App/Services/UntypedNodeExtractor.cs
rename to Marechai.App/Helpers/UntypedNodeExtractor.cs
diff --git a/Marechai.App/Presentation/Sidebar.xaml b/Marechai.App/Presentation/Components/Sidebar.xaml
similarity index 100%
rename from Marechai.App/Presentation/Sidebar.xaml
rename to Marechai.App/Presentation/Components/Sidebar.xaml
diff --git a/Marechai.App/Presentation/Sidebar.xaml.cs b/Marechai.App/Presentation/Components/Sidebar.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/Sidebar.xaml.cs
rename to Marechai.App/Presentation/Components/Sidebar.xaml.cs
diff --git a/Marechai.App/Presentation/MachineViewNavigationParameter.cs b/Marechai.App/Presentation/Models/MachineViewNavigationParameter.cs
similarity index 100%
rename from Marechai.App/Presentation/MachineViewNavigationParameter.cs
rename to Marechai.App/Presentation/Models/MachineViewNavigationParameter.cs
diff --git a/Marechai.App/Presentation/ComputersListViewModel.cs b/Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
similarity index 100%
rename from Marechai.App/Presentation/ComputersListViewModel.cs
rename to Marechai.App/Presentation/ViewModels/ComputersListViewModel.cs
diff --git a/Marechai.App/Presentation/ComputersViewModel.cs b/Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
similarity index 100%
rename from Marechai.App/Presentation/ComputersViewModel.cs
rename to Marechai.App/Presentation/ViewModels/ComputersViewModel.cs
diff --git a/Marechai.App/Presentation/MachineViewViewModel.cs b/Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
similarity index 100%
rename from Marechai.App/Presentation/MachineViewViewModel.cs
rename to Marechai.App/Presentation/ViewModels/MachineViewViewModel.cs
diff --git a/Marechai.App/Presentation/MainViewModel.cs b/Marechai.App/Presentation/ViewModels/MainViewModel.cs
similarity index 100%
rename from Marechai.App/Presentation/MainViewModel.cs
rename to Marechai.App/Presentation/ViewModels/MainViewModel.cs
diff --git a/Marechai.App/Presentation/NewsViewModel.cs b/Marechai.App/Presentation/ViewModels/NewsViewModel.cs
similarity index 100%
rename from Marechai.App/Presentation/NewsViewModel.cs
rename to Marechai.App/Presentation/ViewModels/NewsViewModel.cs
diff --git a/Marechai.App/Presentation/SecondViewModel.cs b/Marechai.App/Presentation/ViewModels/SecondViewModel.cs
similarity index 100%
rename from Marechai.App/Presentation/SecondViewModel.cs
rename to Marechai.App/Presentation/ViewModels/SecondViewModel.cs
diff --git a/Marechai.App/Presentation/ShellViewModel.cs b/Marechai.App/Presentation/ViewModels/ShellViewModel.cs
similarity index 100%
rename from Marechai.App/Presentation/ShellViewModel.cs
rename to Marechai.App/Presentation/ViewModels/ShellViewModel.cs
diff --git a/Marechai.App/Presentation/ComputersListPage.xaml b/Marechai.App/Presentation/Views/ComputersListPage.xaml
similarity index 100%
rename from Marechai.App/Presentation/ComputersListPage.xaml
rename to Marechai.App/Presentation/Views/ComputersListPage.xaml
diff --git a/Marechai.App/Presentation/ComputersListPage.xaml.cs b/Marechai.App/Presentation/Views/ComputersListPage.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/ComputersListPage.xaml.cs
rename to Marechai.App/Presentation/Views/ComputersListPage.xaml.cs
diff --git a/Marechai.App/Presentation/ComputersPage.xaml b/Marechai.App/Presentation/Views/ComputersPage.xaml
similarity index 100%
rename from Marechai.App/Presentation/ComputersPage.xaml
rename to Marechai.App/Presentation/Views/ComputersPage.xaml
diff --git a/Marechai.App/Presentation/ComputersPage.xaml.cs b/Marechai.App/Presentation/Views/ComputersPage.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/ComputersPage.xaml.cs
rename to Marechai.App/Presentation/Views/ComputersPage.xaml.cs
diff --git a/Marechai.App/Presentation/MachineViewPage.xaml b/Marechai.App/Presentation/Views/MachineViewPage.xaml
similarity index 100%
rename from Marechai.App/Presentation/MachineViewPage.xaml
rename to Marechai.App/Presentation/Views/MachineViewPage.xaml
diff --git a/Marechai.App/Presentation/MachineViewPage.xaml.cs b/Marechai.App/Presentation/Views/MachineViewPage.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/MachineViewPage.xaml.cs
rename to Marechai.App/Presentation/Views/MachineViewPage.xaml.cs
diff --git a/Marechai.App/Presentation/MainPage.xaml b/Marechai.App/Presentation/Views/MainPage.xaml
similarity index 100%
rename from Marechai.App/Presentation/MainPage.xaml
rename to Marechai.App/Presentation/Views/MainPage.xaml
diff --git a/Marechai.App/Presentation/MainPage.xaml.cs b/Marechai.App/Presentation/Views/MainPage.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/MainPage.xaml.cs
rename to Marechai.App/Presentation/Views/MainPage.xaml.cs
diff --git a/Marechai.App/Presentation/NewsPage.xaml b/Marechai.App/Presentation/Views/NewsPage.xaml
similarity index 100%
rename from Marechai.App/Presentation/NewsPage.xaml
rename to Marechai.App/Presentation/Views/NewsPage.xaml
diff --git a/Marechai.App/Presentation/NewsPage.xaml.cs b/Marechai.App/Presentation/Views/NewsPage.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/NewsPage.xaml.cs
rename to Marechai.App/Presentation/Views/NewsPage.xaml.cs
diff --git a/Marechai.App/Presentation/SecondPage.xaml b/Marechai.App/Presentation/Views/SecondPage.xaml
similarity index 100%
rename from Marechai.App/Presentation/SecondPage.xaml
rename to Marechai.App/Presentation/Views/SecondPage.xaml
diff --git a/Marechai.App/Presentation/SecondPage.xaml.cs b/Marechai.App/Presentation/Views/SecondPage.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/SecondPage.xaml.cs
rename to Marechai.App/Presentation/Views/SecondPage.xaml.cs
diff --git a/Marechai.App/Presentation/Shell.xaml b/Marechai.App/Presentation/Views/Shell.xaml
similarity index 100%
rename from Marechai.App/Presentation/Shell.xaml
rename to Marechai.App/Presentation/Views/Shell.xaml
diff --git a/Marechai.App/Presentation/Shell.xaml.cs b/Marechai.App/Presentation/Views/Shell.xaml.cs
similarity index 100%
rename from Marechai.App/Presentation/Shell.xaml.cs
rename to Marechai.App/Presentation/Views/Shell.xaml.cs