diff --git a/src/main/java/com/application/munera/SecurityConfiguration.java b/src/main/java/com/application/munera/SecurityConfiguration.java
index a4b406b..22f9e99 100644
--- a/src/main/java/com/application/munera/SecurityConfiguration.java
+++ b/src/main/java/com/application/munera/SecurityConfiguration.java
@@ -1,6 +1,6 @@
 package com.application.munera;
 
-import com.application.munera.views.LoginView;
+import com.application.munera.views.login.LoginView;
 import com.vaadin.flow.spring.security.VaadinWebSecurity;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/application/munera/views/MainLayout.java b/src/main/java/com/application/munera/views/MainLayout.java
index 2a71d5f..9a63854 100644
--- a/src/main/java/com/application/munera/views/MainLayout.java
+++ b/src/main/java/com/application/munera/views/MainLayout.java
@@ -1,6 +1,10 @@
 package com.application.munera.views;
 
+import com.application.munera.views.categories.CategoriesView;
+import com.application.munera.views.dashboard.DashboardView;
+import com.application.munera.views.events.EventsView;
 import com.application.munera.views.expenses.*;
+import com.application.munera.views.people.PeopleView;
 import com.vaadin.flow.component.applayout.AppLayout;
 import com.vaadin.flow.component.applayout.DrawerToggle;
 import com.vaadin.flow.component.button.Button;
diff --git a/src/main/java/com/application/munera/views/expenses/CategoriesView.java b/src/main/java/com/application/munera/views/categories/CategoriesView.java
similarity index 99%
rename from src/main/java/com/application/munera/views/expenses/CategoriesView.java
rename to src/main/java/com/application/munera/views/categories/CategoriesView.java
index a694221..08ea2ca 100644
--- a/src/main/java/com/application/munera/views/expenses/CategoriesView.java
+++ b/src/main/java/com/application/munera/views/categories/CategoriesView.java
@@ -1,4 +1,4 @@
-package com.application.munera.views.expenses;
+package com.application.munera.views.categories;
 
 import com.application.munera.data.Category;
 import com.application.munera.services.CategoryService;
diff --git a/src/main/java/com/application/munera/views/expenses/DashboardView.java b/src/main/java/com/application/munera/views/dashboard/DashboardView.java
similarity index 99%
rename from src/main/java/com/application/munera/views/expenses/DashboardView.java
rename to src/main/java/com/application/munera/views/dashboard/DashboardView.java
index 7608154..6bb4e4a 100644
--- a/src/main/java/com/application/munera/views/expenses/DashboardView.java
+++ b/src/main/java/com/application/munera/views/dashboard/DashboardView.java
@@ -1,4 +1,4 @@
-package com.application.munera.views.expenses;
+package com.application.munera.views.dashboard;
 
 import com.application.munera.data.Expense;
 import com.application.munera.data.Person;
diff --git a/src/main/java/com/application/munera/views/expenses/EventsView.java b/src/main/java/com/application/munera/views/events/EventsView.java
similarity index 99%
rename from src/main/java/com/application/munera/views/expenses/EventsView.java
rename to src/main/java/com/application/munera/views/events/EventsView.java
index 47aabb3..eb7c074 100644
--- a/src/main/java/com/application/munera/views/expenses/EventsView.java
+++ b/src/main/java/com/application/munera/views/events/EventsView.java
@@ -1,4 +1,4 @@
-package com.application.munera.views.expenses;
+package com.application.munera.views.events;
 
 import com.application.munera.data.Event;
 import com.application.munera.data.Person;
diff --git a/src/main/java/com/application/munera/views/LoginView.java b/src/main/java/com/application/munera/views/login/LoginView.java
similarity index 94%
rename from src/main/java/com/application/munera/views/LoginView.java
rename to src/main/java/com/application/munera/views/login/LoginView.java
index 9d9adcd..40704da 100644
--- a/src/main/java/com/application/munera/views/LoginView.java
+++ b/src/main/java/com/application/munera/views/login/LoginView.java
@@ -1,4 +1,4 @@
-package com.application.munera.views;
+package com.application.munera.views.login;
 
 import com.vaadin.flow.component.html.H1;
 import com.vaadin.flow.component.html.H2;
@@ -19,7 +19,7 @@ import com.vaadin.flow.server.auth.AnonymousAllowed;
 @AnonymousAllowed
 public class LoginView extends VerticalLayout implements BeforeEnterObserver {
 
-    private LoginForm login = new LoginForm();
+    private final LoginForm login = new LoginForm();
 
     public LoginView() {
         addClassName("login-view");
diff --git a/src/main/java/com/application/munera/views/expenses/PeopleView.java b/src/main/java/com/application/munera/views/people/PeopleView.java
similarity index 99%
rename from src/main/java/com/application/munera/views/expenses/PeopleView.java
rename to src/main/java/com/application/munera/views/people/PeopleView.java
index 01af164..2b90b4a 100644
--- a/src/main/java/com/application/munera/views/expenses/PeopleView.java
+++ b/src/main/java/com/application/munera/views/people/PeopleView.java
@@ -1,4 +1,4 @@
-package com.application.munera.views.expenses;
+package com.application.munera.views.people;
 
 import com.application.munera.data.Person;
 import com.application.munera.services.PersonService;