diff --git a/src/layouts/AdminLayout.vue b/src/layouts/AdminLayout.vue
index 7e1d18a..383f14f 100644
--- a/src/layouts/AdminLayout.vue
+++ b/src/layouts/AdminLayout.vue
@@ -2,7 +2,7 @@
     import LoadingModal from '../components/ui/LoadingModal.vue';
     import NavBar from '../components/NavBar.vue';
     import Sidebar from '../components/Sidebar.vue';
-    import ProfilePopup from '../components/ProfilePopup.vue';
+    import ProfilePopup from '../views/profile/modals/ProfilePopup.vue';
     import NotificationsPopup from '../components/NotificationsPopup.vue';
 
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index 3b717cc..d507444 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,27 +14,27 @@ const router = createRouter({
         {
           path: '',
           name: 'login',
-          component: () => import('../views/LoginView.vue'),
+          component: () => import('../views/auth/LoginView.vue'),
         },
         {
           path: 'registro',
           name: 'register',
-          component: () => import('../views/RegisterView.vue'),
+          component: () => import('../views/auth/RegisterView.vue'),
         },
         {
           path: 'recuperar-cuenta',
           name: 'recovery',
-          component: () => import('../views/RecoveryPasswordView.vue'),
+          component: () => import('../views/auth/RecoveryPasswordView.vue'),
         },
         {
           path: 'registro-empresa',
           name: 'register-company',
-          component: () => import('../views/CompleteRegisterView.vue')
+          component: () => import('../views/auth/CompleteRegisterView.vue')
         },
         {
           path: '/:pathMatch(.*)*',
           name: 'not-found',
-          component: () => import('../views/LoginView.vue'),
+          component: () => import('../views/auth/LoginView.vue'),
         }
       ]
     },
@@ -46,27 +46,27 @@ const router = createRouter({
         {
           path: 'terminos-y-condiciones',
           name: 'terms-conditions',
-          component: () => import('../views/TermsAndConditionsView.vue')
+          component: () => import('../views/publics/TermsAndConditionsView.vue')
         },
         {
           path: 'aviso-de-privacidad',
           name: 'notice-privacy',
-          component: () => import('../views/NoticeOfPrivacyView.vue')
+          component: () => import('../views/publics/NoticeOfPrivacyView.vue')
         },
         {
           path: 'tracking/:code',
           name: 'tracking-load',
-          component: () => import('../views/TrackingLoadView.vue'),
+          component: () => import('../views/loads/TrackingLoadView.vue'),
         },
         {
           path: 'carga/:code',
           name: 'share-load',
-          component: () => import('../views/ShareLoadView.vue'),
+          component: () => import('../views/loads/ShareLoadView.vue'),
         },
         {
           path: 'faqs',
           name: 'faqs',
-          component: () => import('../views/FaqsView.vue')
+          component: () => import('../views/publics/FaqsView.vue')
         }
       ]
     },
@@ -83,13 +83,13 @@ const router = createRouter({
           path: 'inicio',
           name: 'home',
           meta: { permissions: ['role_shipper', 'role_carrier'] },
-          component: () => import('../views/HomeView.vue'),
+          component: () => import('../views/dashboard/HomeView.vue'),
         },
         {
           path: 'empresa',
           name: 'company',
           meta: { permissions: ['role_shipper', 'role_carrier'] },
-          component: () => import('../views/MyCompanyView.vue'),
+          component: () => import('../views/company/MyCompanyView.vue'),
         },
         {
           path: 'profile',
@@ -98,37 +98,37 @@ const router = createRouter({
             permissions: ['role_shipper', 'role_carrier'],
             roles: ['manager', 'staff', 'owner', 'warehouse']
           },
-          component: () => import('../views/EditProfileView.vue'),
+          component: () => import('../views/profile/EditProfileView.vue'),
         },
         {
           path: 'empresa/:id',
           name: 'public-users',
           meta: { permissions: ['role_shipper', 'role_carrier'] },
-          component: () => import('../views/PublicUsersCompanyView.vue'),
+          component: () => import('../views/users/PublicUsersCompanyView.vue'),
         },
         {
           path: 'ubicaciones',
           name: 'locations',
           meta: { permissions: ['role_shipper', 'role_carrier'] },
-          component: () => import('../views/LocationsView.vue'),
+          component: () => import('../views/warehouses/LocationsView.vue'),
         },
         {
           path: 'ofertas',
           name: 'published-trucks',
           meta: { permissions: ['role_carrier'] },
-          component: () => import('../views/TrucksPublishedView.vue'),
+          component: () => import('../views/proposals/TrucksPublishedView.vue'),
         },
         {
           path: 'usuarios',
           name: 'users',
           meta: { permissions: ['role_shipper', 'role_carrier'] },
-          component: () => import('../views/UsersView.vue'),
+          component: () => import('../views/users/UsersView.vue'),
         },
         {
           path: 'calculadora',
           name: 'calculator',
           meta: { permissions: ['role_carrier'] },
-          component: () => import('../views/CalculatorView.vue'),
+          component: () => import('../views/calculator/CalculatorView.vue'),
         },
         {
           path: 'reportes',
@@ -158,48 +158,48 @@ const router = createRouter({
           path: 'cargas',
           meta: { permissions: ['role_shipper'] },
           name: 'published-loads',
-          component: () => import('../views/LoadsPublishedView.vue'),
+          component: () => import('../views/loads/LoadsPublishedView.vue'),
         },
         {
           path: 'vehiculos',
           name: 'vehicles',
           meta: { permissions: ['role_carrier'] },
-          component: () => import('../views/VehiclesView.vue'),
+          component: () => import('../views/vehicles/VehiclesView.vue'),
         },
         {
           path: 'transportistas',
           name: 'carriers',
           meta: { permissions: ['role_shipper'] },
-          component: () => import('../views/CarriersView.vue'),
+          component: () => import('../views/searchs/CarriersView.vue'),
         },
         {
           path: 'embarcadores',
           name: 'shippers',
           meta: { permissions: ['role_carrier'] },
-          component: () => import('../views/ShippersView.vue'),
+          component: () => import('../views/searchs/ShippersView.vue'),
         },
         {
           path: 'buscar-cargas',
           name: 'search-loads',
           meta: { permissions: ['role_carrier'] },
-          component: () => import('../views/SearchLoadsView.vue'),
+          component: () => import('../views/searchs/SearchLoadsView.vue'),
         },
         {
           path: 'buscar-vehiculos',
           name: 'search-vehicles',
           meta: { permissions: ['role_shipper'] },
-          component: () => import('../views/SearchVehiclesView.vue'),
+          component: () => import('../views/searchs/SearchVehiclesView.vue'),
         },
         {
           path: '403',
           name: '403',
           meta: { permissions: ['role_shipper', 'role_carrier'] },
-          component: () => import('../views/NotFoundView.vue'),
+          component: () => import('../views/publics/NotFoundView.vue'),
         },
         {
           path: '/:pathMatch(.*)*',
           name: 'not-found',
-          component: () => import('../views/HomeView.vue'),
+          component: () => import('../views/dashboard/HomeView.vue'),
         }
       ]
     }
diff --git a/src/views/CompleteRegisterView.vue b/src/views/auth/CompleteRegisterView.vue
similarity index 93%
rename from src/views/CompleteRegisterView.vue
rename to src/views/auth/CompleteRegisterView.vue
index 5aba344..c89957f 100644
--- a/src/views/CompleteRegisterView.vue
+++ b/src/views/auth/CompleteRegisterView.vue
@@ -1,19 +1,19 @@
 <script setup>
     import { reactive, ref } from 'vue';
-    import CustomRadioInput from '../components/ui/CustomRadioInput.vue';
-    import Custominput from '../components/ui/CustomInput.vue';
-    import Segments from '../components/ui/Segments.vue';
-    import States from '../components/ui/States.vue';
-    import Cities from '../components/ui/Cities.vue';
-    import TruckTypes from '../components/ui/TruckTypes.vue';
-    import NotificationBadge from '../components/ui/NotificationBadge.vue';
-    import {validRFC} from '../helpers/validations';
+    import CustomRadioInput from '../../components/ui/CustomRadioInput.vue';
+    import Custominput from '../../components/ui/CustomInput.vue';
+    import Segments from '../../components/ui/Segments.vue';
+    import States from '../../components/ui/States.vue';
+    import Cities from '../../components/ui/Cities.vue';
+    import TruckTypes from '../../components/ui/TruckTypes.vue';
+    import NotificationBadge from '../../components/ui/NotificationBadge.vue';
+    import {validRFC} from '../../helpers/validations';
     import { useRouter } from 'vue-router';
-    import { useNotificationsStore } from '../stores/notifications';
-    import { useAuthStore } from '../stores/auth';
-    import { complete_registry } from "../services/auth";
-    import { updateMyUserProfile } from "../services/company"
-    import Spiner from '../components/ui/Spiner.vue';
+    import { useNotificationsStore } from '../../stores/notifications';
+    import { useAuthStore } from '../../stores/auth';
+    import { complete_registry } from "../../services/auth";
+    import { updateMyUserProfile } from "../../services/company"
+    import Spiner from '../../components/ui/Spiner.vue';
     import { useI18n } from 'vue-i18n';
 
     const notifications = useNotificationsStore();
diff --git a/src/views/LoginView.vue b/src/views/auth/LoginView.vue
similarity index 92%
rename from src/views/LoginView.vue
rename to src/views/auth/LoginView.vue
index fef0369..1dadd01 100644
--- a/src/views/LoginView.vue
+++ b/src/views/auth/LoginView.vue
@@ -1,12 +1,12 @@
 <script setup>
     import { reactive, ref } from 'vue';
-    import CustomInput from '../components/ui/CustomInput.vue';
-    import NotificationBadge from '../components/ui/NotificationBadge.vue';
-    import {validateEmail} from '../helpers/validations';
-    import Spiner from '../components/ui/Spiner.vue';
-    import { login } from '../services/auth';
+    import CustomInput from '../../components/ui/CustomInput.vue';
+    import NotificationBadge from '../../components/ui/NotificationBadge.vue';
+    import {validateEmail} from '../../helpers/validations';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import { login } from '../../services/auth';
     import { RouterLink, useRouter } from 'vue-router';
-    import { useAuthStore } from '../stores/auth';
+    import { useAuthStore } from '../../stores/auth';
     import { useI18n } from 'vue-i18n';
 
     const form = reactive({
diff --git a/src/views/RecoveryPasswordView.vue b/src/views/auth/RecoveryPasswordView.vue
similarity index 95%
rename from src/views/RecoveryPasswordView.vue
rename to src/views/auth/RecoveryPasswordView.vue
index f75d41e..04e9fad 100644
--- a/src/views/RecoveryPasswordView.vue
+++ b/src/views/auth/RecoveryPasswordView.vue
@@ -1,12 +1,12 @@
 <script setup>
     import { reactive, ref } from 'vue';
-    import CustomInput from '../components/ui/CustomInput.vue';
-    import NotificationBadge from '../components/ui/NotificationBadge.vue';
-    import {validateEmail} from '../helpers/validations';
-    import {recoveryPassword, recoveryPasswordConfirm} from "../services/auth";
-    import Spiner from '../components/ui/Spiner.vue';
+    import CustomInput from '../../components/ui/CustomInput.vue';
+    import NotificationBadge from '../../components/ui/NotificationBadge.vue';
+    import {validateEmail} from '../../helpers/validations';
+    import {recoveryPassword, recoveryPasswordConfirm} from "../../services/auth";
+    import Spiner from '../../components/ui/Spiner.vue';
     import { useRouter } from 'vue-router';
-    import { useNotificationsStore } from '../stores/notifications';
+    import { useNotificationsStore } from '../../stores/notifications';
     import { useI18n } from 'vue-i18n';
 
     const router = useRouter();
diff --git a/src/views/RegisterView.vue b/src/views/auth/RegisterView.vue
similarity index 95%
rename from src/views/RegisterView.vue
rename to src/views/auth/RegisterView.vue
index d020a86..1bfc570 100644
--- a/src/views/RegisterView.vue
+++ b/src/views/auth/RegisterView.vue
@@ -1,13 +1,13 @@
 <script setup>
     import { reactive, ref } from 'vue';
-    import CustomInput from '../components/ui/CustomInput.vue';
-    import NotificationBadge from '../components/ui/NotificationBadge.vue';
-    import {validateEmail} from '../helpers/validations';
-    import {regiter, regiterConfirm} from "../services/auth";
-    import Spiner from '../components/ui/Spiner.vue';
+    import CustomInput from '../../components/ui/CustomInput.vue';
+    import NotificationBadge from '../../components/ui/NotificationBadge.vue';
+    import {validateEmail} from '../../helpers/validations';
+    import {regiter, regiterConfirm} from "../../services/auth";
+    import Spiner from '../../components/ui/Spiner.vue';
     import { useRouter } from 'vue-router';
-    import { useNotificationsStore } from '../stores/notifications';
-    import { useAuthStore } from '../stores/auth';
+    import { useNotificationsStore } from '../../stores/notifications';
+    import { useAuthStore } from '../../stores/auth';
     import { useI18n } from 'vue-i18n';
 
     const router = useRouter();
diff --git a/src/views/CalculatorView.vue b/src/views/calculator/CalculatorView.vue
similarity index 92%
rename from src/views/CalculatorView.vue
rename to src/views/calculator/CalculatorView.vue
index 6fadffe..8c79614 100644
--- a/src/views/CalculatorView.vue
+++ b/src/views/calculator/CalculatorView.vue
@@ -1,12 +1,12 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import { useCompanyStore } from '../stores/company';
-    import { useAuthStore } from '../stores/auth';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardBudget from '../components/CardBudget.vue';
-    import CardEmpty from '../components/CardEmpty.vue';
-    import CreateBudgetModal from '../components/CreateBudgetModal.vue';
-    import Pagination from '../components/Pagination.vue';
+    import { useCompanyStore } from '../../stores/company';
+    import { useAuthStore } from '../../stores/auth';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardBudget from './components/CardBudget.vue';
+    import CardEmpty from '../../components/CardEmpty.vue';
+    import CreateBudgetModal from './modals/CreateBudgetModal.vue';
+    import Pagination from '../../components/Pagination.vue';
     import { useI18n } from 'vue-i18n';
 
     const companyStore = useCompanyStore();
diff --git a/src/components/CardBudget.vue b/src/views/calculator/components/CardBudget.vue
similarity index 97%
rename from src/components/CardBudget.vue
rename to src/views/calculator/components/CardBudget.vue
index c52f967..c876f12 100644
--- a/src/components/CardBudget.vue
+++ b/src/views/calculator/components/CardBudget.vue
@@ -1,9 +1,9 @@
 <script setup>
     import Swal from 'sweetalert2';
-    import { useCompanyStore } from '../stores/company';
+    import { useCompanyStore } from '../../../stores/company';
     import { useI18n } from 'vue-i18n';
     import { computed } from 'vue';
-    import { formatCurrency } from '../helpers/format_currency';
+    import { formatCurrency } from '../../../helpers/format_currency';
 
     const props = defineProps({
         budget: {
diff --git a/src/components/CreateBudgetModal.vue b/src/views/calculator/modals/CreateBudgetModal.vue
similarity index 98%
rename from src/components/CreateBudgetModal.vue
rename to src/views/calculator/modals/CreateBudgetModal.vue
index 92a3122..4028804 100644
--- a/src/components/CreateBudgetModal.vue
+++ b/src/views/calculator/modals/CreateBudgetModal.vue
@@ -1,16 +1,16 @@
 <script setup>
     import { computed, onMounted, reactive, ref } from 'vue';
-    import CustomInput from './ui/CustomInput.vue';
-    import Products from './ui/Products.vue';
-    import TruckTypes from './ui/TruckTypes.vue';
-    import { useAuthStore } from '../stores/auth';
-    import { useCompanyStore } from '../stores/company';
+    import CustomInput from '../../../components/ui/CustomInput.vue';
+    import Products from '../../../components/ui/Products.vue';
+    import TruckTypes from '../../../components/ui/TruckTypes.vue';
+    import { useAuthStore } from '../../../stores/auth';
+    import { useCompanyStore } from '../../../stores/company';
     import Swal from 'sweetalert2';
-    import Spiner from './ui/Spiner.vue';
-    import Cities from './ui/Cities.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import Cities from '../../../components/ui/Cities.vue';
     import html2pdf from 'html2pdf.js';
     import { useI18n } from 'vue-i18n';
-    import { formatCurrency } from '../helpers/format_currency';
+    import { formatCurrency } from '../../../helpers/format_currency';
 
     const props = defineProps({
         budget: {
diff --git a/src/views/MyCompanyView.vue b/src/views/company/MyCompanyView.vue
similarity index 92%
rename from src/views/MyCompanyView.vue
rename to src/views/company/MyCompanyView.vue
index 3011154..d3cbede 100644
--- a/src/views/MyCompanyView.vue
+++ b/src/views/company/MyCompanyView.vue
@@ -1,11 +1,11 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import {useCompanyStore} from '../stores/company';
-    import {useAuthStore} from '../stores/auth';
-    import Spiner from '../components/ui/Spiner.vue';
-    import {getTypeCompany} from '../helpers/type_company'
-    import {getDateMonthDay} from '../helpers/date_formats'
-    import EditCompanyModal from '../components/ui/EditCompanyModal.vue';
+    import {useCompanyStore} from '../../stores/company';
+    import {useAuthStore} from '../../stores/auth';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import {getTypeCompany} from '../../helpers/type_company'
+    import {getDateMonthDay} from '../../helpers/date_formats'
+    import EditCompanyModal from './modals/EditCompanyModal.vue';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/ui/EditCompanyModal.vue b/src/views/company/modals/EditCompanyModal.vue
similarity index 90%
rename from src/components/ui/EditCompanyModal.vue
rename to src/views/company/modals/EditCompanyModal.vue
index cfce49e..5884c0b 100644
--- a/src/components/ui/EditCompanyModal.vue
+++ b/src/views/company/modals/EditCompanyModal.vue
@@ -1,14 +1,14 @@
 <script setup>
     import { onMounted, reactive, ref } from 'vue';
-    import Spiner from '../ui/Spiner.vue';
-    import NotificationBadge from './NotificationBadge.vue';
-    import Segments from './Segments.vue';
-    import TruckTypes from './TruckTypes.vue';
-    import Cities from './Cities.vue';
-    import States from './States.vue';
-    import Custominput from './CustomInput.vue';
-    import { useCompanyStore } from '../../stores/company';
-    import { useNotificationsStore } from '../../stores/notifications';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import NotificationBadge from '../../../components/ui/NotificationBadge.vue';
+    import Segments from '../../../components/ui/Segments.vue';
+    import TruckTypes from '../../../components/ui/TruckTypes.vue';
+    import Cities from '../../../components/ui/Cities.vue';
+    import States from '../../../components/ui/States.vue';
+    import Custominput from '../../../components/ui/CustomInput.vue';
+    import { useCompanyStore } from '../../../stores/company';
+    import { useNotificationsStore } from '../../../stores/notifications';
     import { useI18n } from 'vue-i18n';
 
     const companyStore = useCompanyStore()
diff --git a/src/views/HomeView.vue b/src/views/dashboard/HomeView.vue
similarity index 91%
rename from src/views/HomeView.vue
rename to src/views/dashboard/HomeView.vue
index 2ed0908..1dfeed8 100644
--- a/src/views/HomeView.vue
+++ b/src/views/dashboard/HomeView.vue
@@ -1,13 +1,13 @@
 <script setup>
-  import segments from '../data/segments.json';
-  import loadsType from '../data/loadsType.json';
-  import BarChartStatistics from '../components/BarChartStatistics.vue';
-  import DoughnutChartStatistics from '../components/DoughnutChartStatistics.vue';
-  import { useLoadsStore } from '../stores/loads';
+  import segments from '../../data/segments.json';
+  import loadsType from '../../data/loadsType.json';
+  import BarChartStatistics from './components/BarChartStatistics.vue';
+  import DoughnutChartStatistics from './components/DoughnutChartStatistics.vue';
+  import { useLoadsStore } from '../../stores/loads';
   import { onMounted, ref, watch } from 'vue';
-  import Spiner from '../components/ui/Spiner.vue';
-  import CardEmpty from '../components/CardEmpty.vue';
-  import { useAuthStore } from '../stores/auth';
+  import Spiner from '../../components/ui/Spiner.vue';
+  import CardEmpty from '../../components/CardEmpty.vue';
+  import { useAuthStore } from '../../stores/auth';
   import { storeToRefs } from 'pinia';
   import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/BarChartStatistics.vue b/src/views/dashboard/components/BarChartStatistics.vue
similarity index 100%
rename from src/components/BarChartStatistics.vue
rename to src/views/dashboard/components/BarChartStatistics.vue
diff --git a/src/components/DoughnutChartStatistics.vue b/src/views/dashboard/components/DoughnutChartStatistics.vue
similarity index 100%
rename from src/components/DoughnutChartStatistics.vue
rename to src/views/dashboard/components/DoughnutChartStatistics.vue
diff --git a/src/views/LoadsPublishedView.vue b/src/views/loads/LoadsPublishedView.vue
similarity index 90%
rename from src/views/LoadsPublishedView.vue
rename to src/views/loads/LoadsPublishedView.vue
index 2e3f6bb..71e9756 100644
--- a/src/views/LoadsPublishedView.vue
+++ b/src/views/loads/LoadsPublishedView.vue
@@ -1,15 +1,15 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardLoad from '../components/CardLoad.vue';
-    import AttachmentsModal from '../components/AttachmentsModal.vue';
-    import { useLoadsStore } from '../stores/loads';
-    import FormLoadModal from '../components/FormLoadModal.vue';
-    import ProposalsModal from '../components/ProposalsModal.vue';
-    import CardEmpty from '../components/CardEmpty.vue';
-    import Pagination from '../components/Pagination.vue';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardLoad from '../../components/CardLoad.vue';
+    import AttachmentsModal from '../../components/AttachmentsModal.vue';
+    import { useLoadsStore } from '../../stores/loads';
+    import FormLoadModal from './modals/FormLoadModal.vue';
+    import ProposalsModal from './modals/ProposalsModal.vue';
+    import CardEmpty from '../../components/CardEmpty.vue';
+    import Pagination from '../../components/Pagination.vue';
     import { useI18n } from 'vue-i18n';
-import CarrierInfoModal from '../components/CarrierInfoModal.vue';
+import CarrierInfoModal from '../../components/CarrierInfoModal.vue';
 
     const loadStore = useLoadsStore();
     const loading = ref(false);
diff --git a/src/views/ShareLoadView.vue b/src/views/loads/ShareLoadView.vue
similarity index 91%
rename from src/views/ShareLoadView.vue
rename to src/views/loads/ShareLoadView.vue
index f0b1e35..a9c84d7 100644
--- a/src/views/ShareLoadView.vue
+++ b/src/views/loads/ShareLoadView.vue
@@ -1,14 +1,14 @@
 <script setup>
     import { onMounted, ref, computed } from 'vue';
     import { useRoute, RouterLink } from 'vue-router';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardLoad from '../components/CardLoad.vue';
-    import useDirectionsRender from '../composables/useDirectionRender';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardLoad from '../../components/CardLoad.vue';
+    import useDirectionsRender from '../../composables/useDirectionRender';
     import { GoogleMap, Marker, CustomMarker, Polyline } from 'vue3-google-map';
-    import CardEmpty from '../components/CardEmpty.vue';
-    import useTrackingLoad from '../composables/useTrackingLoad';
+    import CardEmpty from '../../components/CardEmpty.vue';
+    import useTrackingLoad from '../../composables/useTrackingLoad';
     import { useI18n } from 'vue-i18n';
-    import MakeProposalModal from '../components/MakeProposalModal.vue';
+    import MakeProposalModal from '../../components/MakeProposalModal.vue';
 
     const mapKey = import.meta.env.VITE_MAP_KEY;
 
diff --git a/src/views/TrackingLoadView.vue b/src/views/loads/TrackingLoadView.vue
similarity index 91%
rename from src/views/TrackingLoadView.vue
rename to src/views/loads/TrackingLoadView.vue
index c72706d..14b0197 100644
--- a/src/views/TrackingLoadView.vue
+++ b/src/views/loads/TrackingLoadView.vue
@@ -1,16 +1,16 @@
 <script setup>
     import { onMounted, ref } from 'vue';
     import { useRoute } from 'vue-router';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardLoad from '../components/CardLoad.vue';
-    import useDirectionsRender from '../composables/useDirectionRender';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardLoad from '../../components/CardLoad.vue';
+    import useDirectionsRender from '../../composables/useDirectionRender';
     import { GoogleMap, Marker, CustomMarker, Polyline } from 'vue3-google-map';
-    import CardEmpty from '../components/CardEmpty.vue';
-    import useTrackingLoad from '../composables/useTrackingLoad';
+    import CardEmpty from '../../components/CardEmpty.vue';
+    import useTrackingLoad from '../../composables/useTrackingLoad';
     import { useI18n } from 'vue-i18n';
-    import AttachmentsModal from '../components/AttachmentsModal.vue';
-    import { useLoadsStore } from '../stores/loads';
-    import CarrierInfoModal from '../components/CarrierInfoModal.vue';
+    import AttachmentsModal from '../../components/AttachmentsModal.vue';
+    import { useLoadsStore } from '../../stores/loads';
+    import CarrierInfoModal from '../../components/CarrierInfoModal.vue';
 
     const mapKey = import.meta.env.VITE_MAP_KEY;
 
diff --git a/src/components/FormLoadModal.vue b/src/views/loads/modals/FormLoadModal.vue
similarity index 97%
rename from src/components/FormLoadModal.vue
rename to src/views/loads/modals/FormLoadModal.vue
index 2a7db5d..6292177 100644
--- a/src/components/FormLoadModal.vue
+++ b/src/views/loads/modals/FormLoadModal.vue
@@ -1,22 +1,22 @@
 <script setup>
     import { reactive, ref, onMounted, watch } from 'vue';
-    import { useLoadsStore } from '../stores/loads';
-    import Custominput from './ui/CustomInput.vue';
-    import Segments from './ui/Segments.vue';
-    import TruckTypes from './ui/TruckTypes.vue';
-    import Spiner from './ui/Spiner.vue';
-    import Products from './ui/Products.vue';
+    import { useLoadsStore } from '../../../stores/loads';
+    import Custominput from '../../../components/ui/CustomInput.vue';
+    import Segments from '../../../components/ui/Segments.vue';
+    import TruckTypes from '../../../components/ui/TruckTypes.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import Products from '../../../components/ui/Products.vue';
     import { GoogleMap, Marker, Polyline } from "vue3-google-map";
-    import useDirectionsRender from '../composables/useDirectionRender';
-    import { useAuthStore } from '../stores/auth';
+    import useDirectionsRender from '../../../composables/useDirectionRender';
+    import { useAuthStore } from '../../../stores/auth';
     import Swal from 'sweetalert2';
-    import { useNotificationsStore } from '../stores/notifications';
-    import { useCompanyStore } from '../stores/company';
+    import { useNotificationsStore } from '../../../stores/notifications';
+    import { useCompanyStore } from '../../../stores/company';
     import { useI18n } from 'vue-i18n';
     import { computed } from 'vue';
-    import {getDateTime } from '../helpers/date_formats';
-    import { validateEmail } from '../helpers/validations';
-    import AddressPreview from './AddressPreview.vue';
+    import {getDateTime } from '../../../helpers/date_formats';
+    import { validateEmail } from '../../../helpers/validations';
+    import AddressPreview from '../../../components/AddressPreview.vue';
 
 
     const loadStore = useLoadsStore();
diff --git a/src/components/ProposalsModal.vue b/src/views/loads/modals/ProposalsModal.vue
similarity index 96%
rename from src/components/ProposalsModal.vue
rename to src/views/loads/modals/ProposalsModal.vue
index ef22f86..28db72f 100644
--- a/src/components/ProposalsModal.vue
+++ b/src/views/loads/modals/ProposalsModal.vue
@@ -1,12 +1,12 @@
 <script setup>
     import { onMounted, ref } from 'vue';
-    import { useLoadsStore } from '../stores/loads';
-    import { useAuthStore } from '../stores/auth';
-    import Spiner from './ui/Spiner.vue';
-    import { getDateMonthDay } from '../helpers/date_formats';
-    import VehicleInfo from './VehicleInfo.vue';
+    import { useLoadsStore } from '../../../stores/loads';
+    import { useAuthStore } from '../../../stores/auth';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import { getDateMonthDay } from '../../../helpers/date_formats';
+    import VehicleInfo from '../../../components/VehicleInfo.vue';
     import Swal from 'sweetalert2'
-    import CardEmpty from './CardEmpty.vue';
+    import CardEmpty from '../../../components/CardEmpty.vue';
     import { useI18n } from 'vue-i18n';
 
     const loadsStore = useLoadsStore();
diff --git a/src/views/EditProfileView.vue b/src/views/profile/EditProfileView.vue
similarity index 93%
rename from src/views/EditProfileView.vue
rename to src/views/profile/EditProfileView.vue
index f77df9a..75661c6 100644
--- a/src/views/EditProfileView.vue
+++ b/src/views/profile/EditProfileView.vue
@@ -1,12 +1,12 @@
 <script setup>
     import { onMounted, reactive, ref, watch } from 'vue';
-    import { useAuthStore } from '../stores/auth';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CustomInput from '../components/ui/CustomInput.vue';
+    import { useAuthStore } from '../../stores/auth';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CustomInput from '../../components/ui/CustomInput.vue';
     import { storeToRefs } from 'pinia';
-    import NotificationBadge from '../components/ui/NotificationBadge.vue';
-    import FormChangePassword from '../components/FormChangePassword.vue';
-    import FormChangeEmail from '../components/FormChangeEmail.vue';
+    import NotificationBadge from '../../components/ui/NotificationBadge.vue';
+    import FormChangePassword from './views/FormChangePassword.vue';
+    import FormChangeEmail from './views/FormChangeEmail.vue';
     import { useI18n } from 'vue-i18n';
 
     const auth = useAuthStore();
diff --git a/src/components/ProfilePopup.vue b/src/views/profile/modals/ProfilePopup.vue
similarity index 94%
rename from src/components/ProfilePopup.vue
rename to src/views/profile/modals/ProfilePopup.vue
index 4e6a6aa..ab98135 100644
--- a/src/components/ProfilePopup.vue
+++ b/src/views/profile/modals/ProfilePopup.vue
@@ -1,11 +1,11 @@
 <script setup>
     import { useRouter } from 'vue-router';
-    import { useAuthStore } from '../stores/auth';
-    import { useNotificationsStore } from '../stores/notifications';
+    import { useAuthStore } from '../../../stores/auth';
+    import { useNotificationsStore } from '../../../stores/notifications';
     import { useI18n } from 'vue-i18n';
     import { ref } from 'vue';
     import { onMounted } from 'vue';
-    import CustomRadioInput from './ui/CustomRadioInput.vue';
+    import CustomRadioInput from '../../../components/ui/CustomRadioInput.vue';
     import { watch } from 'vue';
 
     const lang = ref(null);
diff --git a/src/components/FormChangeEmail.vue b/src/views/profile/views/FormChangeEmail.vue
similarity index 92%
rename from src/components/FormChangeEmail.vue
rename to src/views/profile/views/FormChangeEmail.vue
index 8285cc9..d482256 100644
--- a/src/components/FormChangeEmail.vue
+++ b/src/views/profile/views/FormChangeEmail.vue
@@ -1,12 +1,12 @@
 <script setup>
     import {reactive, ref} from 'vue';
-    import CustomInput from './ui/CustomInput.vue';
-    import Spiner from './ui/Spiner.vue';
-    import NotificationBadge from './ui/NotificationBadge.vue';
-    import { validateEmail } from '../helpers/validations';
+    import CustomInput from '../../../components/ui/CustomInput.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import NotificationBadge from '../../../components/ui/NotificationBadge.vue';
+    import { validateEmail } from '../../../helpers/validations';
     import Swal from 'sweetalert2';
-    import { useAuthStore } from '../stores/auth';
-    import { useNotificationsStore } from '../stores/notifications';
+    import { useAuthStore } from '../../../stores/auth';
+    import { useNotificationsStore } from '../../../stores/notifications';
     import { useRouter } from 'vue-router';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/FormChangePassword.vue b/src/views/profile/views/FormChangePassword.vue
similarity index 95%
rename from src/components/FormChangePassword.vue
rename to src/views/profile/views/FormChangePassword.vue
index b7d54d0..8a15634 100644
--- a/src/components/FormChangePassword.vue
+++ b/src/views/profile/views/FormChangePassword.vue
@@ -1,12 +1,12 @@
 <script setup>
     import {reactive, ref} from 'vue';
-    import CustomInput from './ui/CustomInput.vue';
-    import Spiner from './ui/Spiner.vue';
-    import NotificationBadge from './ui/NotificationBadge.vue';
-    import { recoveryPassword, recoveryPasswordConfirm, regiter } from '../services/auth';
-    import { useAuthStore } from '../stores/auth';
+    import CustomInput from '../../../components/ui/CustomInput.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import NotificationBadge from '../../../components/ui/NotificationBadge.vue';
+    import { recoveryPassword, recoveryPasswordConfirm, regiter } from '../../../services/auth';
+    import { useAuthStore } from '../../../stores/auth';
     import { useRouter } from 'vue-router';
-    import { useNotificationsStore } from '../stores/notifications';
+    import { useNotificationsStore } from '../../../stores/notifications';
     import { useI18n } from 'vue-i18n';
     
     const pwdForm = reactive({
diff --git a/src/views/TrucksPublishedView.vue b/src/views/proposals/TrucksPublishedView.vue
similarity index 90%
rename from src/views/TrucksPublishedView.vue
rename to src/views/proposals/TrucksPublishedView.vue
index 07630d1..3d64456 100644
--- a/src/views/TrucksPublishedView.vue
+++ b/src/views/proposals/TrucksPublishedView.vue
@@ -1,16 +1,16 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import { useCompanyStore } from '../stores/company';
-    import { useAuthStore } from '../stores/auth';
-    import { useLoadsStore } from '../stores/loads';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardProposal from '../components/CardProposal.vue';
-    import LoadDetailModal from '../components/LoadDetailModal.vue';
-    import MakeProposalModal from '../components/MakeProposalModal.vue';
-    import Pagination from '../components/Pagination.vue';
-    import AttachmentsModal from '../components/AttachmentsModal.vue';
+    import { useCompanyStore } from '../../stores/company';
+    import { useAuthStore } from '../../stores/auth';
+    import { useLoadsStore } from '../../stores/loads';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardProposal from './components/CardProposal.vue';
+    import LoadDetailModal from './modals/LoadDetailModal.vue';
+    import MakeProposalModal from '../../components/MakeProposalModal.vue';
+    import Pagination from '../../components/Pagination.vue';
+    import AttachmentsModal from '../../components/AttachmentsModal.vue';
     import { useI18n } from 'vue-i18n';
-import CustomPopup from '../components/CustomPopup.vue';
+import CustomPopup from '../../components/CustomPopup.vue';
 
     const companyStore = useCompanyStore();
     const authStore = useAuthStore();
diff --git a/src/components/CardProposal.vue b/src/views/proposals/components/CardProposal.vue
similarity index 96%
rename from src/components/CardProposal.vue
rename to src/views/proposals/components/CardProposal.vue
index 742b433..6351d95 100644
--- a/src/components/CardProposal.vue
+++ b/src/views/proposals/components/CardProposal.vue
@@ -1,10 +1,10 @@
 <script setup>
     import Swal from 'sweetalert2';
-    import { getDateOnly } from '../helpers/date_formats';
-    import { getStatusLoad } from '../helpers/status';
-    import { useCompanyStore } from '../stores/company';
-    import { useAuthStore } from '../stores/auth';
-    import { useLoadsStore } from '../stores/loads';
+    import { getDateOnly } from '../../../helpers/date_formats';
+    import { getStatusLoad } from '../../../helpers/status';
+    import { useCompanyStore } from '../../../stores/company';
+    import { useAuthStore } from '../../../stores/auth';
+    import { useLoadsStore } from '../../../stores/loads';
     import { useI18n } from 'vue-i18n';
     
     const props = defineProps({
diff --git a/src/components/LoadDetailModal.vue b/src/views/proposals/modals/LoadDetailModal.vue
similarity index 95%
rename from src/components/LoadDetailModal.vue
rename to src/views/proposals/modals/LoadDetailModal.vue
index efa07c7..8b0b252 100644
--- a/src/components/LoadDetailModal.vue
+++ b/src/views/proposals/modals/LoadDetailModal.vue
@@ -1,12 +1,12 @@
 <script setup>
     import { ref, onMounted } from 'vue';
-    import CardEmpty from './CardEmpty.vue';
-    import Spiner from './ui/Spiner.vue';
+    import CardEmpty from '../../../components/CardEmpty.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
     import { GoogleMap, Marker, CustomMarker, Polyline } from 'vue3-google-map';
-    import useDirectionsRender from '../composables/useDirectionRender';
-    import Cardload from './CardLoad.vue';
-    import { useLoadsStore } from '../stores/loads';
-    import { useNotificationsStore } from '../stores/notifications';
+    import useDirectionsRender from '../../../composables/useDirectionRender';
+    import Cardload from '../../../components/CardLoad.vue';
+    import { useLoadsStore } from '../../../stores/loads';
+    import { useNotificationsStore } from '../../../stores/notifications';
     import { useI18n } from 'vue-i18n';
 
     const mapKey = import.meta.env.VITE_MAP_KEY;
diff --git a/src/views/FaqsView.vue b/src/views/publics/FaqsView.vue
similarity index 83%
rename from src/views/FaqsView.vue
rename to src/views/publics/FaqsView.vue
index 70db3f5..2ad44f7 100644
--- a/src/views/FaqsView.vue
+++ b/src/views/publics/FaqsView.vue
@@ -1,6 +1,6 @@
 <script setup>
-    import CardFaq from '../components/CardFaq.vue';
-    import faqs from '../data/faqs.json';
+    import CardFaq from './components/CardFaq.vue';
+    import faqs from '../../data/faqs.json';
 
 </script>
 
diff --git a/src/views/NotFoundView.vue b/src/views/publics/NotFoundView.vue
similarity index 100%
rename from src/views/NotFoundView.vue
rename to src/views/publics/NotFoundView.vue
diff --git a/src/views/NoticeOfPrivacyView.vue b/src/views/publics/NoticeOfPrivacyView.vue
similarity index 100%
rename from src/views/NoticeOfPrivacyView.vue
rename to src/views/publics/NoticeOfPrivacyView.vue
diff --git a/src/views/TermsAndConditionsView.vue b/src/views/publics/TermsAndConditionsView.vue
similarity index 100%
rename from src/views/TermsAndConditionsView.vue
rename to src/views/publics/TermsAndConditionsView.vue
diff --git a/src/components/CardFaq.vue b/src/views/publics/components/CardFaq.vue
similarity index 100%
rename from src/components/CardFaq.vue
rename to src/views/publics/components/CardFaq.vue
diff --git a/src/views/CarriersView.vue b/src/views/searchs/CarriersView.vue
similarity index 93%
rename from src/views/CarriersView.vue
rename to src/views/searchs/CarriersView.vue
index 91cc3b6..d8791d9 100644
--- a/src/views/CarriersView.vue
+++ b/src/views/searchs/CarriersView.vue
@@ -1,13 +1,13 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import Spiner from '../components/ui/Spiner.vue';
-    import useDirectory from '../composables/useDirectory';
-    import CardCompany from '../components/CardCompany.vue';
-    import TruckTypes from '../components/ui/TruckTypes.vue';
-    import Segments from '../components/ui/Segments.vue';
-    import States from '../components/ui/States.vue';
-    import Cities from '../components/ui/Cities.vue';
-    import Pagination from '../components/Pagination.vue';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import useDirectory from '../../composables/useDirectory';
+    import CardCompany from './components/CardCompany.vue';
+    import TruckTypes from '../../components/ui/TruckTypes.vue';
+    import Segments from '../../components/ui/Segments.vue';
+    import States from '../../components/ui/States.vue';
+    import Cities from '../../components/ui/Cities.vue';
+    import Pagination from '../../components/Pagination.vue';
     import { useI18n } from 'vue-i18n';
 
     const {loading, companies, getCompaniesData, companiesTotal, currentCompaniesPage} = useDirectory();
diff --git a/src/views/SearchLoadsView.vue b/src/views/searchs/SearchLoadsView.vue
similarity index 92%
rename from src/views/SearchLoadsView.vue
rename to src/views/searchs/SearchLoadsView.vue
index a700ec5..0d11026 100644
--- a/src/views/SearchLoadsView.vue
+++ b/src/views/searchs/SearchLoadsView.vue
@@ -1,15 +1,15 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import useSearchLoads from '../composables/userSearchLoads';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardLoad from '../components/CardLoad.vue'
-    import CardEmpty from '../components/CardEmpty.vue'
-    import TruckTypes from '../components/ui/TruckTypes.vue';
-    import Segments from '../components/ui/Segments.vue';
-    import States from '../components/ui/States.vue';
-    import Cities from '../components/ui/Cities.vue';
-    import MakeProposalModal from '../components/MakeProposalModal.vue';
-    import Pagination from '../components/Pagination.vue';
+    import useSearchLoads from '../../composables/userSearchLoads';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardLoad from '../../components/CardLoad.vue'
+    import CardEmpty from '../../components/CardEmpty.vue'
+    import TruckTypes from '../../components/ui/TruckTypes.vue';
+    import Segments from '../../components/ui/Segments.vue';
+    import States from '../../components/ui/States.vue';
+    import Cities from '../../components/ui/Cities.vue';
+    import MakeProposalModal from '../../components/MakeProposalModal.vue';
+    import Pagination from '../../components/Pagination.vue';
     import { useI18n } from 'vue-i18n';
 
     const filterQuery = ref([]);
diff --git a/src/views/SearchVehiclesView.vue b/src/views/searchs/SearchVehiclesView.vue
similarity index 92%
rename from src/views/SearchVehiclesView.vue
rename to src/views/searchs/SearchVehiclesView.vue
index f830eec..34f17aa 100644
--- a/src/views/SearchVehiclesView.vue
+++ b/src/views/searchs/SearchVehiclesView.vue
@@ -1,14 +1,14 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import useSearchVehicles from '../composables/useSearchVehicles';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardVehicle from '../components/CardVehicle.vue';
-    import CardEmpty from '../components/CardEmpty.vue'
-    import TruckTypes from '../components/ui/TruckTypes.vue';
-    import Segments from '../components/ui/Segments.vue';
-    import States from '../components/ui/States.vue';
-    import Cities from '../components/ui/Cities.vue';
-    import Pagination from '../components/Pagination.vue';
+    import useSearchVehicles from '../../composables/useSearchVehicles';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardVehicle from '../../components/CardVehicle.vue';
+    import CardEmpty from '../../components/CardEmpty.vue'
+    import TruckTypes from '../../components/ui/TruckTypes.vue';
+    import Segments from '../../components/ui/Segments.vue';
+    import States from '../../components/ui/States.vue';
+    import Cities from '../../components/ui/Cities.vue';
+    import Pagination from '../../components/Pagination.vue';
     import { useI18n } from 'vue-i18n';
 
     const filterQuery = ref([]);
diff --git a/src/views/ShippersView.vue b/src/views/searchs/ShippersView.vue
similarity index 92%
rename from src/views/ShippersView.vue
rename to src/views/searchs/ShippersView.vue
index 3f2ed98..0a69510 100644
--- a/src/views/ShippersView.vue
+++ b/src/views/searchs/ShippersView.vue
@@ -1,13 +1,13 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import Spiner from '../components/ui/Spiner.vue';
-    import useDirectory from '../composables/useDirectory';
-    import CardCompany from '../components/CardCompany.vue';
-    import TruckTypes from '../components/ui/TruckTypes.vue';
-    import Segments from '../components/ui/Segments.vue';
-    import States from '../components/ui/States.vue';
-    import Cities from '../components/ui/Cities.vue';
-    import Pagination from '../components/Pagination.vue';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import useDirectory from '../../composables/useDirectory';
+    import CardCompany from './components/CardCompany.vue';
+    import TruckTypes from '../../components/ui/TruckTypes.vue';
+    import Segments from '../../components/ui/Segments.vue';
+    import States from '../../components/ui/States.vue';
+    import Cities from '../../components/ui/Cities.vue';
+    import Pagination from '../../components/Pagination.vue';
 
     const {loading, companies, getCompaniesData, companiesTotal, currentCompaniesPage} = useDirectory();
     const query = ref('');
diff --git a/src/components/CardCompany.vue b/src/views/searchs/components/CardCompany.vue
similarity index 96%
rename from src/components/CardCompany.vue
rename to src/views/searchs/components/CardCompany.vue
index 15e1792..56f489d 100644
--- a/src/components/CardCompany.vue
+++ b/src/views/searchs/components/CardCompany.vue
@@ -1,6 +1,6 @@
 <script setup>
     import { RouterLink } from 'vue-router';
-    import { getDateMonthDay } from '../helpers/date_formats';
+    import { getDateMonthDay } from '../../../helpers/date_formats';
     import { useI18n } from 'vue-i18n';
 
     defineProps({
diff --git a/src/views/PublicUsersCompanyView.vue b/src/views/users/PublicUsersCompanyView.vue
similarity index 84%
rename from src/views/PublicUsersCompanyView.vue
rename to src/views/users/PublicUsersCompanyView.vue
index fc49d40..618723d 100644
--- a/src/views/PublicUsersCompanyView.vue
+++ b/src/views/users/PublicUsersCompanyView.vue
@@ -1,9 +1,9 @@
 <script setup>
     import { onMounted, ref } from 'vue';
-    import Spiner from '../components/ui/Spiner.vue';
+    import Spiner from '../../components/ui/Spiner.vue';
     import { useRoute } from 'vue-router';
-    import useDirectory from '../composables/useDirectory';
-    import CardUser from '../components/CardUser.vue';
+    import useDirectory from '../../composables/useDirectory';
+    import CardUser from './components/CardUser.vue';
     import { useI18n } from 'vue-i18n';
 
     const {loading, users, getUsersData} = useDirectory();
diff --git a/src/views/UsersView.vue b/src/views/users/UsersView.vue
similarity index 86%
rename from src/views/UsersView.vue
rename to src/views/users/UsersView.vue
index 447331e..63e2eb8 100644
--- a/src/views/UsersView.vue
+++ b/src/views/users/UsersView.vue
@@ -1,11 +1,11 @@
 <script setup>
     import { onMounted, ref } from 'vue';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardUser from '../components/CardUser.vue';
-    import { useCompanyStore } from '../stores/company';
-    import CreateUserModal from '../components/CreateUserModal.vue';
-    import Pagination from '../components/Pagination.vue';
-    import { useAuthStore } from '../stores/auth';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardUser from './components/CardUser.vue';
+    import { useCompanyStore } from '../../stores/company';
+    import CreateUserModal from './modals/CreateUserModal.vue';
+    import Pagination from '../../components/Pagination.vue';
+    import { useAuthStore } from '../../stores/auth';
     import { useI18n } from 'vue-i18n';
 
     const companyStore = useCompanyStore();
diff --git a/src/components/CardUser.vue b/src/views/users/components/CardUser.vue
similarity index 96%
rename from src/components/CardUser.vue
rename to src/views/users/components/CardUser.vue
index b479aae..1161975 100644
--- a/src/components/CardUser.vue
+++ b/src/views/users/components/CardUser.vue
@@ -1,9 +1,9 @@
 <script setup>
     import Swal from 'sweetalert2';
-    import { getDateOnly } from '../helpers/date_formats';
-    import { getTypeUser } from '../helpers/type_user';
-    import { useCompanyStore } from '../stores/company';
-    import { useAuthStore } from '../stores/auth';
+    import { getDateOnly } from '../../../helpers/date_formats';
+    import { getTypeUser } from '../../../helpers/type_user';
+    import { useCompanyStore } from '../../../stores/company';
+    import { useAuthStore } from '../../../stores/auth';
     import { useI18n } from 'vue-i18n';
     import {computed } from 'vue'
     
diff --git a/src/components/CreateUserModal.vue b/src/views/users/modals/CreateUserModal.vue
similarity index 96%
rename from src/components/CreateUserModal.vue
rename to src/views/users/modals/CreateUserModal.vue
index c628f93..06483a8 100644
--- a/src/components/CreateUserModal.vue
+++ b/src/views/users/modals/CreateUserModal.vue
@@ -1,14 +1,14 @@
 <script setup>
     import { computed, onMounted, reactive, ref } from 'vue';
-    import CustomInput from './ui/CustomInput.vue';
-    import States from './ui/States.vue';
-    import Cities from './ui/Cities.vue';
-    import Segments from './ui/Segments.vue';
-    import TruckTypes from './ui/TruckTypes.vue';
-    import Spiner from './ui/Spiner.vue';
-    import { validateEmail } from '../helpers/validations';
-    import { useAuthStore } from '../stores/auth';
-    import { useCompanyStore } from '../stores/company';
+    import CustomInput from '../../../components/ui/CustomInput.vue';
+    import States from '../../../components/ui/States.vue';
+    import Cities from '../../../components/ui/Cities.vue';
+    import Segments from '../../../components/ui/Segments.vue';
+    import TruckTypes from '../../../components/ui/TruckTypes.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import { validateEmail } from '../../../helpers/validations';
+    import { useAuthStore } from '../../../stores/auth';
+    import { useCompanyStore } from '../../../stores/company';
     import Swal from 'sweetalert2';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/views/VehiclesView.vue b/src/views/vehicles/VehiclesView.vue
similarity index 91%
rename from src/views/VehiclesView.vue
rename to src/views/vehicles/VehiclesView.vue
index 4cbb179..2f27017 100644
--- a/src/views/VehiclesView.vue
+++ b/src/views/vehicles/VehiclesView.vue
@@ -1,14 +1,14 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import { useCompanyStore } from '../stores/company';
-    import Spiner from '../components/ui/Spiner.vue';
-    import { useVehiclesStore } from '../stores/vehicles';
-    import CardVehicle from '../components/CardVehicle.vue';
-    import CardEmpty from '../components/CardEmpty.vue';
-    import CreateVehicleModal from '../components/CreateVehicleModal.vue';
-    import StatusVehicleModal from '../components/StatusVehicleModal.vue';
-    import DriverVehicleModal from '../components/DriverVehicleModal.vue';
-    import Pagination from '../components/Pagination.vue';
+    import { useCompanyStore } from '../../stores/company';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import { useVehiclesStore } from '../../stores/vehicles';
+    import CardVehicle from '../../components/CardVehicle.vue';
+    import CardEmpty from '../../components/CardEmpty.vue';
+    import CreateVehicleModal from './modals/CreateVehicleModal.vue';
+    import StatusVehicleModal from './modals/StatusVehicleModal.vue';
+    import DriverVehicleModal from './modals/DriverVehicleModal.vue';
+    import Pagination from '../../components/Pagination.vue';
     import { useI18n } from 'vue-i18n';
 
     const companyStore = useCompanyStore();
diff --git a/src/components/CreateVehicleModal.vue b/src/views/vehicles/modals/CreateVehicleModal.vue
similarity index 96%
rename from src/components/CreateVehicleModal.vue
rename to src/views/vehicles/modals/CreateVehicleModal.vue
index 40b9efa..34e6df7 100644
--- a/src/components/CreateVehicleModal.vue
+++ b/src/views/vehicles/modals/CreateVehicleModal.vue
@@ -1,14 +1,14 @@
 <script setup>
     import { computed, onMounted, reactive, ref } from 'vue';
-    import CustomInput from './ui/CustomInput.vue';
-    import TruckTypes from './ui/TruckTypes.vue';
-    import { useAuthStore } from '../stores/auth';
-    import Segments from './ui/Segments.vue';
-    import States from './ui/States.vue';
-    import Cities from './ui/Cities.vue';
-    import Spiner from './ui/Spiner.vue';
+    import CustomInput from '../../../components/ui/CustomInput.vue';
+    import TruckTypes from '../../../components/ui/TruckTypes.vue';
+    import { useAuthStore } from '../../../stores/auth';
+    import Segments from '../../../components/ui/Segments.vue';
+    import States from '../../../components/ui/States.vue';
+    import Cities from '../../../components/ui/Cities.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
     import Swal from 'sweetalert2';
-    import { useVehiclesStore } from '../stores/vehicles';
+    import { useVehiclesStore } from '../../../stores/vehicles';
     import { useI18n } from 'vue-i18n';
 
     const props = defineProps({
diff --git a/src/components/DriverVehicleModal.vue b/src/views/vehicles/modals/DriverVehicleModal.vue
similarity index 96%
rename from src/components/DriverVehicleModal.vue
rename to src/views/vehicles/modals/DriverVehicleModal.vue
index 4333f16..940b2d4 100644
--- a/src/components/DriverVehicleModal.vue
+++ b/src/views/vehicles/modals/DriverVehicleModal.vue
@@ -1,8 +1,8 @@
 <script setup>
     import { onMounted, ref } from 'vue';
-    import { useCompanyStore } from '../stores/company';
-    import Spiner from './ui/Spiner.vue';
-    import { useVehiclesStore } from '../stores/vehicles';
+    import { useCompanyStore } from '../../../stores/company';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import { useVehiclesStore } from '../../../stores/vehicles';
     import Swal from 'sweetalert2';
     import { useI18n } from 'vue-i18n';
 
diff --git a/src/components/StatusVehicleModal.vue b/src/views/vehicles/modals/StatusVehicleModal.vue
similarity index 95%
rename from src/components/StatusVehicleModal.vue
rename to src/views/vehicles/modals/StatusVehicleModal.vue
index 134702a..7a829ad 100644
--- a/src/components/StatusVehicleModal.vue
+++ b/src/views/vehicles/modals/StatusVehicleModal.vue
@@ -1,13 +1,13 @@
 <script setup>
     import { onMounted, reactive, ref } from 'vue';
-    import Spiner from './ui/Spiner.vue';
-    import CustomRadioInput from './ui/CustomRadioInput.vue';
-    import { useVehiclesStore } from '../stores/vehicles';
-    import CustomInput from './ui/CustomInput.vue';
-    import States from './ui/States.vue';
-    import Cities from './ui/Cities.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import CustomRadioInput from '../../../components/ui/CustomRadioInput.vue';
+    import { useVehiclesStore } from '../../../stores/vehicles';
+    import CustomInput from '../../../components/ui/CustomInput.vue';
+    import States from '../../../components/ui/States.vue';
+    import Cities from '../../../components/ui/Cities.vue';
     import Swal from 'sweetalert2';
-    import { getDateTime } from '../helpers/date_formats';
+    import { getDateTime } from '../../../helpers/date_formats';
     import { useI18n } from 'vue-i18n';
 
 
diff --git a/src/views/LocationsView.vue b/src/views/warehouses/LocationsView.vue
similarity index 94%
rename from src/views/LocationsView.vue
rename to src/views/warehouses/LocationsView.vue
index 25a6f0e..a7e24e8 100644
--- a/src/views/LocationsView.vue
+++ b/src/views/warehouses/LocationsView.vue
@@ -1,12 +1,12 @@
 <script setup>
     import { onMounted, ref, watch } from 'vue';
-    import { useCompanyStore } from '../stores/company';
-    import Spiner from '../components/ui/Spiner.vue';
-    import CardEmpty from '../components/CardEmpty.vue';
-    import CreateLocationModal from '../components/CreateLocationModal.vue';
-    import CardLocation from '../components/CardLocation.vue';
-    import Pagination from '../components/Pagination.vue';
-    import CustomPopup from '../components/CustomPopup.vue';
+    import { useCompanyStore } from '../../stores/company';
+    import Spiner from '../../components/ui/Spiner.vue';
+    import CardEmpty from '../../components/CardEmpty.vue';
+    import CreateLocationModal from './modals/CreateLocationModal.vue';
+    import CardLocation from './components/CardLocation.vue';
+    import Pagination from '../../components/Pagination.vue';
+    import CustomPopup from '../../components/CustomPopup.vue';
     import { useI18n } from 'vue-i18n';
 
     const companyStore = useCompanyStore();
diff --git a/src/components/CardLocation.vue b/src/views/warehouses/components/CardLocation.vue
similarity index 97%
rename from src/components/CardLocation.vue
rename to src/views/warehouses/components/CardLocation.vue
index d48a7fd..2e5885e 100644
--- a/src/components/CardLocation.vue
+++ b/src/views/warehouses/components/CardLocation.vue
@@ -1,7 +1,7 @@
 <script setup>
     import Swal from 'sweetalert2';
-    import { useCompanyStore } from '../stores/company';
-    import { useAuthStore } from '../stores/auth';
+    import { useCompanyStore } from '../../../stores/company';
+    import { useAuthStore } from '../../../stores/auth';
     import { useI18n } from 'vue-i18n';
 
     const props = defineProps({
diff --git a/src/components/CreateLocationModal.vue b/src/views/warehouses/modals/CreateLocationModal.vue
similarity index 96%
rename from src/components/CreateLocationModal.vue
rename to src/views/warehouses/modals/CreateLocationModal.vue
index d9616a2..7810b26 100644
--- a/src/components/CreateLocationModal.vue
+++ b/src/views/warehouses/modals/CreateLocationModal.vue
@@ -1,16 +1,16 @@
 <script setup>
     import { computed, onMounted, reactive, ref } from 'vue';
-    import CustomInput from './ui/CustomInput.vue';
-    import Segments from './ui/Segments.vue';
-    import TruckTypes from './ui/TruckTypes.vue';
-    import States from './ui/States.vue';
-    import Cities from './ui/Cities.vue';
-    import Spiner from './ui/Spiner.vue';
-    import { useAuthStore } from '../stores/auth';
-    import { useCompanyStore } from '../stores/company';
+    import CustomInput from '../../../components/ui/CustomInput.vue';
+    import Segments from '../../../components/ui/Segments.vue';
+    import TruckTypes from '../../../components/ui/TruckTypes.vue';
+    import States from '../../../components/ui/States.vue';
+    import Cities from '../../../components/ui/Cities.vue';
+    import Spiner from '../../../components/ui/Spiner.vue';
+    import { useAuthStore } from '../../../stores/auth';
+    import { useCompanyStore } from '../../../stores/company';
     import Swal from 'sweetalert2';
     import { useI18n } from 'vue-i18n';
-    import { validateEmail } from '../helpers/validations';
+    import { validateEmail } from '../../../helpers/validations';
 
     const props = defineProps({
         location: {