diff --git a/phronCare.UIBlazor/Data/Login/Login2FAVM.cs b/phronCare.UIBlazor/Data/Login/Login2FAVM.cs
deleted file mode 100644
index 0287704..0000000
--- a/phronCare.UIBlazor/Data/Login/Login2FAVM.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace phronCare.UIBlazor.Data.Login
-{
-    public class Login2FAVM
-    {
-        public string UserName { get; set; } = string.Empty;
-        public string Password { get; set; } = string.Empty;
-        public string Code { get; set; } = string.Empty;
-    }
-}
diff --git a/phronCare.UIBlazor/Data/Login/LoginVM.cs b/phronCare.UIBlazor/Models/Auth/Login.cs
similarity index 66%
rename from phronCare.UIBlazor/Data/Login/LoginVM.cs
rename to phronCare.UIBlazor/Models/Auth/Login.cs
index 039be25..9e647f2 100644
--- a/phronCare.UIBlazor/Data/Login/LoginVM.cs
+++ b/phronCare.UIBlazor/Models/Auth/Login.cs
@@ -1,6 +1,6 @@
-namespace phronCare.UIBlazor.Data.Login
+namespace phronCare.UIBlazor.Models.Login
 {
-    public class LoginVM
+    public class Login
     {
         public string UserName { get; set; } = string.Empty;
         public string Password { get; set; } = string.Empty;
diff --git a/phronCare.UIBlazor/Models/Auth/Login2FA.cs b/phronCare.UIBlazor/Models/Auth/Login2FA.cs
new file mode 100644
index 0000000..4060fe4
--- /dev/null
+++ b/phronCare.UIBlazor/Models/Auth/Login2FA.cs
@@ -0,0 +1,7 @@
+namespace phronCare.UIBlazor.Models.Login
+{
+    public class Login2FA: Login
+    {
+        public string Code { get; set; } = string.Empty;
+    }
+}
diff --git a/phronCare.UIBlazor/Data/Response.cs b/phronCare.UIBlazor/Models/Response.cs
similarity index 80%
rename from phronCare.UIBlazor/Data/Response.cs
rename to phronCare.UIBlazor/Models/Response.cs
index a84e73d..53cd2ed 100644
--- a/phronCare.UIBlazor/Data/Response.cs
+++ b/phronCare.UIBlazor/Models/Response.cs
@@ -1,4 +1,4 @@
-namespace phronCare.UIBlazor.Data
+namespace phronCare.UIBlazor.Models
 {
     public class Response
     {
diff --git a/phronCare.UIBlazor/Pages/Authorization/Login.razor b/phronCare.UIBlazor/Pages/Authorization/LoginPage.razor
similarity index 93%
rename from phronCare.UIBlazor/Pages/Authorization/Login.razor
rename to phronCare.UIBlazor/Pages/Authorization/LoginPage.razor
index 9707478..fafe97f 100644
--- a/phronCare.UIBlazor/Pages/Authorization/Login.razor
+++ b/phronCare.UIBlazor/Pages/Authorization/LoginPage.razor
@@ -1,20 +1,18 @@
 @page "/login"
-@using System.Text;
 @using System.Text.Json;
+@using System.Text;
 @using System.Net;
 @using System.ComponentModel.DataAnnotations;
-@using phronCare.UIBlazor.Data.Login;
+@using phronCare.UIBlazor.Models
 @using phronCare.UIBlazor.Services.Authorization;
+@using phronCare.UIBlazor.Models.Login;
 
-@inject HttpClient _httpClient
 @inject NavigationManager _navigationManager
+@inject HttpClient _httpClient
 @inject ILoginService _iLoginService
 @inject IToastService toastService
 
 <div class="row" style="margin-top: 30px;">
-@*     <div class="col-md-3 col-sm-12" style="background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); border-radius: 10px; color: white; padding: 20px; margin: 0 auto auto auto;">
-        <img src="images/Logo.png" class="img-fluid" />
- *@
     <div class="col-md-3 col-sm-12" style="background-color: rgb(39, 54, 97); border-radius: 10px; color: white; padding: 20px; margin: 0 auto auto auto;">
                 <img src="images/Logo.png" class="img-fluid" />
         @if (!isSecret)
@@ -75,8 +73,8 @@
                 <br/>
                 <div class="col-12" style="text-align:center;">
                         <button type="submit" class="btn btn-primary"><span class="fa fa-vault"></span> Restablecer</button>
-                        <button class="btn btn-warning btn-circle" style="float:right;" @onclick="ToggleIsSecret">
-                        <span class="fa fa-circle-left"></span>
+                        <button class="btn btn-warning btn-circle" style="fData.Login.Loginght;" @olick="ToggleIsSecret">
+                      <span class="fa fa-circle-left"></span>
                         </button>
                 </div>
             </EditForm>
@@ -85,8 +83,8 @@
 </div>
 
 @code {
-    LoginVM loginModel = new LoginVM();
-    Login2FAVM login2FAModel = new Login2FAVM();
+    Login loginModel = new Login();
+    Login2FA login2FAModel = new Login2FA();
     ResetPassword resetPassword = new ResetPassword();
     public bool isSecret = false;
     bool codeTwoFactor = false;
diff --git a/phronCare.UIBlazor/Pages/Authorization/Login.razor.css b/phronCare.UIBlazor/Pages/Authorization/LoginPage.razor.css
similarity index 100%
rename from phronCare.UIBlazor/Pages/Authorization/Login.razor.css
rename to phronCare.UIBlazor/Pages/Authorization/LoginPage.razor.css
diff --git a/phronCare.UIBlazor/Pages/Index.razor b/phronCare.UIBlazor/Pages/Index.razor
index 9f2bf2e..c5ffef9 100644
--- a/phronCare.UIBlazor/Pages/Index.razor
+++ b/phronCare.UIBlazor/Pages/Index.razor
@@ -1,4 +1,5 @@
 @page "/"
+@using phronCare.UIBlazor.Pages.Authorization
 
 <PageTitle>PhronCare</PageTitle>
 <AuthorizeView>
@@ -36,7 +37,7 @@
 
     </Authorized>
     <NotAuthorized>
-        <Login/>
+        <LoginPage/>
     </NotAuthorized>
 </AuthorizeView>
 @code
diff --git a/phronCare.UIBlazor/Pages/Sales/CustomerForm.razor b/phronCare.UIBlazor/Pages/Sales/CustomerForm.razor
index 32cb2d8..ceb64e7 100644
--- a/phronCare.UIBlazor/Pages/Sales/CustomerForm.razor
+++ b/phronCare.UIBlazor/Pages/Sales/CustomerForm.razor
@@ -1,16 +1,17 @@
 @page "/sales/customerform"
 @page "/sales/customerform/{CustomerId:int}"
 @using System.ComponentModel.DataAnnotations
-@using phronCare.UIBlazor.Pages.Shared.Modals
 @using phronCare.UIBlazor.Services.Sales
-@inject IModalService Modal
-@inject IToastService toastService
+@using phronCare.UIBlazor.Shared.Modals
+
 @inject HttpClient _httpClient
 @inject NavigationManager Navigation
 @inject AuthenticationStateProvider authenticationStateProvider
 @inject AccountTypeService accountTypeService
 @inject TaxConditionService taxConditionService
 @inject DocumentTypeService documentTypeService
+@inject IToastService toastService
+@inject IModalService Modal
 
 <div class="card" style="zoom:80%">
     <div class="card-header d-flex justify-content-center align-items-center">
diff --git a/phronCare.UIBlazor/Pages/Sales/Customers.razor b/phronCare.UIBlazor/Pages/Sales/Customers.razor
index 34f15ef..7d5d6c7 100644
--- a/phronCare.UIBlazor/Pages/Sales/Customers.razor
+++ b/phronCare.UIBlazor/Pages/Sales/Customers.razor
@@ -1,6 +1,5 @@
 @page "/sales/customers"
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Data
 @using Domain.Entities
 @using Domain.Generics
 @inject IToastService toastService
diff --git a/phronCare.UIBlazor/Pages/Sales/InstitutionForm.razor b/phronCare.UIBlazor/Pages/Sales/InstitutionForm.razor
index 6b388a1..a86291c 100644
--- a/phronCare.UIBlazor/Pages/Sales/InstitutionForm.razor
+++ b/phronCare.UIBlazor/Pages/Sales/InstitutionForm.razor
@@ -2,11 +2,11 @@
 @page "/sales/institutionform/{InstitutionId:int?}"
 @using System.ComponentModel.DataAnnotations
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Pages.Shared.Modals
+@using phronCare.UIBlazor.Shared.Modals
 
 @inject InstitutionService institutionService
-@inject IToastService ToastService
 @inject NavigationManager Navigation
+@inject IToastService ToastService
 @inject IModalService Modal
 
 <div class="card" style="zoom:80%">
diff --git a/phronCare.UIBlazor/Pages/Sales/Institutions.razor b/phronCare.UIBlazor/Pages/Sales/Institutions.razor
index d4a0630..8172b25 100644
--- a/phronCare.UIBlazor/Pages/Sales/Institutions.razor
+++ b/phronCare.UIBlazor/Pages/Sales/Institutions.razor
@@ -1,6 +1,5 @@
 @page "/sales/institutions"
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Data
 @using Domain.Entities
 @using Domain.Generics
 @using Domain.SearchParams
diff --git a/phronCare.UIBlazor/Pages/Sales/PatientForm.razor b/phronCare.UIBlazor/Pages/Sales/PatientForm.razor
index ca92400..0354384 100644
--- a/phronCare.UIBlazor/Pages/Sales/PatientForm.razor
+++ b/phronCare.UIBlazor/Pages/Sales/PatientForm.razor
@@ -2,12 +2,12 @@
 @page "/sales/patientform/{PatientId:int?}"
 @using System.ComponentModel.DataAnnotations
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Pages.Shared.Modals
+@using phronCare.UIBlazor.Shared.Modals
 
-@inject PatientService patientService
 @inject DocumentTypeService documentTypeService
-@inject IToastService ToastService
+@inject PatientService patientService
 @inject NavigationManager Navigation
+@inject IToastService ToastService
 @inject IModalService Modal
 
 <div class="card" style="zoom:80%">
diff --git a/phronCare.UIBlazor/Pages/Sales/Patients.razor b/phronCare.UIBlazor/Pages/Sales/Patients.razor
index 79c5f48..c97e42f 100644
--- a/phronCare.UIBlazor/Pages/Sales/Patients.razor
+++ b/phronCare.UIBlazor/Pages/Sales/Patients.razor
@@ -1,6 +1,5 @@
 @page "/sales/patients"
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Data
 @using Domain.Entities
 @using Domain.Generics
 @using Domain.SearchParams
diff --git a/phronCare.UIBlazor/Pages/Sales/PersonForm.razor b/phronCare.UIBlazor/Pages/Sales/PersonForm.razor
index b98ad21..9e8b5b9 100644
--- a/phronCare.UIBlazor/Pages/Sales/PersonForm.razor
+++ b/phronCare.UIBlazor/Pages/Sales/PersonForm.razor
@@ -2,14 +2,14 @@
 @page "/sales/personform/{PersonId:int}"
 
 @using System.ComponentModel.DataAnnotations
-@using phronCare.UIBlazor.Pages.Shared.Modals
 @using phronCare.UIBlazor.Services.Sales
+@using phronCare.UIBlazor.Shared.Modals
 
-@inject IModalService Modal
-@inject IToastService toastService
-@inject PeopleService peopleService
-@inject NavigationManager Navigation
 @inject BusinessUnitService businessUnitService
+@inject NavigationManager Navigation
+@inject PeopleService peopleService
+@inject IToastService toastService
+@inject IModalService Modal
 
 <div class="card" style="zoom:80%">
     <div class="card-header d-flex justify-content-center align-items-center">
diff --git a/phronCare.UIBlazor/Pages/Sales/ProductForm.razor b/phronCare.UIBlazor/Pages/Sales/ProductForm.razor
index 1644af5..87bb808 100644
--- a/phronCare.UIBlazor/Pages/Sales/ProductForm.razor
+++ b/phronCare.UIBlazor/Pages/Sales/ProductForm.razor
@@ -2,13 +2,13 @@
 @page "/sales/productform/{ProductId:int?}"
 @using System.ComponentModel.DataAnnotations
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Pages.Shared.Modals
+@using phronCare.UIBlazor.Shared.Modals
 
-@inject ProductService ProductService
 @inject ProductCategoryService ProductCategoryService
 @inject BusinessUnitService BusinessUnitService
-@inject IToastService ToastService
+@inject ProductService ProductService
 @inject NavigationManager Navigation
+@inject IToastService ToastService
 @inject IModalService Modal
 
 <div class="card" style="zoom:80%">
diff --git a/phronCare.UIBlazor/Pages/Sales/Products.razor b/phronCare.UIBlazor/Pages/Sales/Products.razor
index 9bac85f..8d8260c 100644
--- a/phronCare.UIBlazor/Pages/Sales/Products.razor
+++ b/phronCare.UIBlazor/Pages/Sales/Products.razor
@@ -1,6 +1,5 @@
 @page "/sales/products"
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Data
 @using Domain.Entities
 @using Domain.Generics
 @inject IToastService toastService
diff --git a/phronCare.UIBlazor/Pages/Sales/Professionals.razor b/phronCare.UIBlazor/Pages/Sales/Professionals.razor
index 7917478..1a1ff5e 100644
--- a/phronCare.UIBlazor/Pages/Sales/Professionals.razor
+++ b/phronCare.UIBlazor/Pages/Sales/Professionals.razor
@@ -1,11 +1,10 @@
 @page "/sales/professionals"
 @using phronCare.UIBlazor.Services.Sales
-@using phronCare.UIBlazor.Data
 @using Domain.Entities
 @using Domain.Generics
-@inject IToastService toastService
-@inject NavigationManager Navigation
 @inject ProfessionalService professionalService
+@inject NavigationManager Navigation
+@inject IToastService toastService
 
 <div class="card">
     <div class="card-header d-flex justify-content-center align-items-center" style="zoom:80%;">
diff --git a/phronCare.UIBlazor/Pages/Shared/Modals/ConfirmModal.razor b/phronCare.UIBlazor/Shared/Modals/ConfirmModal.razor
similarity index 100%
rename from phronCare.UIBlazor/Pages/Shared/Modals/ConfirmModal.razor
rename to phronCare.UIBlazor/Shared/Modals/ConfirmModal.razor
diff --git a/phronCare.UIBlazor/_Imports.razor b/phronCare.UIBlazor/_Imports.razor
index 4d52337..dbf05bc 100644
--- a/phronCare.UIBlazor/_Imports.razor
+++ b/phronCare.UIBlazor/_Imports.razor
@@ -8,12 +8,12 @@
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.JSInterop
 @using phronCare.UIBlazor
-@using phronCare.UIBlazor.Data
+@using phronCare.UIBlazor.Models.Login
 @using phronCare.UIBlazor.Shared
 @using phronCare.UIBlazor.Shared.Components
 @using phronCare.UIBlazor.Services.Tickets
 @using phronCare.UIBlazor.Services.Authorization
-@using phronCare.UIBlazor.Pages.Authorization
+@* @using phronCare.UIBlazor.Pages.Authorization *@
 @using phronCare.UIBlazor.Services.UI
 @using Domain;
 @using Domain.Entities;
diff --git a/phronCare.UIBlazor/phronCare.UIBlazor.csproj b/phronCare.UIBlazor/phronCare.UIBlazor.csproj
index fa3226a..1f00485 100644
--- a/phronCare.UIBlazor/phronCare.UIBlazor.csproj
+++ b/phronCare.UIBlazor/phronCare.UIBlazor.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Services\NewFolder\" />
+    <Folder Include="Interfaces\" />
   </ItemGroup>
 
 </Project>
diff --git a/phronCare.UIBlazor/wwwroot/index.html b/phronCare.UIBlazor/wwwroot/index.html
index 4a7ff6d..8854890 100644
--- a/phronCare.UIBlazor/wwwroot/index.html
+++ b/phronCare.UIBlazor/wwwroot/index.html
@@ -51,40 +51,4 @@
 
 </body>
 
-</html>
-
-<!--<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <title>phronCare.UIBlazor</title>
-    <base href="/" />
-    <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
-    <link href="css/app.css" rel="stylesheet" />
-    <link href="css/fontawesome-free-6.4.2-web/css/all.min.css" rel="stylesheet" />
-    <link rel="icon" type="image/png" href="favicon.png" />
-    <link href="phronCare.UIBlazor.styles.css" rel="stylesheet" />
-</head>
-
-<body>
-    <div id="app">
-        <svg class="loading-progress">
-            <circle r="40%" cx="50%" cy="50%" />
-            <circle r="40%" cx="50%" cy="50%" />
-        </svg>
-        <div class="loading-progress-text"></div>
-    </div>
-
-    <div id="blazor-error-ui">
-        An unhandled error has occurred.
-        <a href="" class="reload">Reload</a>
-        <a class="dismiss">🗙</a>
-    </div>
-    <script src="_framework/blazor.webassembly.js"></script>
-    <script src="css/fontawesome-free-6.4.2-web/js/all.min.js"></script>
-    <script src="js/services.js"></script>
-</body>
-
-</html>-->
+</html>
\ No newline at end of file