diff --git a/src/views/Settings/SettingsAccountView.vue b/src/components/Settings/SettingsAccount.vue
similarity index 97%
rename from src/views/Settings/SettingsAccountView.vue
rename to src/components/Settings/SettingsAccount.vue
index 51b570cb6735dead3bff0f9e57ae0efd73906895..9e01429f4c3d343d1277fcaa29b35d0e8bdae044 100644
--- a/src/views/Settings/SettingsAccountView.vue
+++ b/src/components/Settings/SettingsAccount.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import BaseInput from '@/components/InputFields/BaseInput.vue';
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue';
 import { useUserInfoStore } from "@/stores/UserStore";
 import { UserService } from '@/api';
 import type { UserUpdateDTO } from '@/api';
diff --git a/src/views/Settings/SettingsBankView.vue b/src/components/Settings/SettingsBank.vue
similarity index 97%
rename from src/views/Settings/SettingsBankView.vue
rename to src/components/Settings/SettingsBank.vue
index 2e06887cf01332788c77cf5993da92582aa74689..d5142d2130fd5ae83927cd8d2da5fce6bca311bb 100644
--- a/src/views/Settings/SettingsBankView.vue
+++ b/src/components/Settings/SettingsBank.vue
@@ -36,7 +36,7 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import BaseInput from '@/components/InputFields/BaseInput.vue';
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue';
 import type { BankAccountDTO } from '@/api';
 import { UserService } from '@/api';
 
diff --git a/src/views/Settings/SettingsNotificationView.vue b/src/components/Settings/SettingsNotification.vue
similarity index 100%
rename from src/views/Settings/SettingsNotificationView.vue
rename to src/components/Settings/SettingsNotification.vue
diff --git a/src/views/Settings/SettingsProfileView.vue b/src/components/Settings/SettingsProfile.vue
similarity index 96%
rename from src/views/Settings/SettingsProfileView.vue
rename to src/components/Settings/SettingsProfile.vue
index 21377e099ff64fb2de1f10c6f74977db4e525cde..c45371b6e47382aeb3f3a402a65791700be2f6b5 100644
--- a/src/views/Settings/SettingsProfileView.vue
+++ b/src/components/Settings/SettingsProfile.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import BaseInput from '@/components/InputFields/BaseInput.vue';
+import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue';
 import { useUserInfoStore } from "@/stores/UserStore";
 import { UserService, ImageService } from '@/api';
 import type { UserUpdateDTO } from '@/api';
@@ -110,7 +110,7 @@ onMounted(() => {
         <img :src="iconSrc" alt="Brukeravatar" style="width: 300px">
         <div class="mt-2">
           <button type="button" class="btn btn-primary" @click="triggerFileUpload"><img
-              src="@/assets/icons/download.svg"> Last opp bilde</button>
+              src="../../assets/icons/download.svg"> Last opp bilde</button>
         </div>
       </div>
       <div class="form-group">
diff --git a/src/views/Settings/SettingsSecurityView.vue b/src/components/Settings/SettingsSecurity.vue
similarity index 97%
rename from src/views/Settings/SettingsSecurityView.vue
rename to src/components/Settings/SettingsSecurity.vue
index f6352b210bbf65f6698cbb04d78cb615120f04e9..8eab51063b9684504beea4d6e375a1c4b536e3a4 100644
--- a/src/views/Settings/SettingsSecurityView.vue
+++ b/src/components/Settings/SettingsSecurity.vue
@@ -35,7 +35,7 @@
 
 <script setup lang="ts">
     import { ref } from 'vue'
-    import BaseInput from '@/components/InputFields/BaseInput.vue'
+    import BaseInput from '@/components/BaseComponents/Input/BaseInput.vue'
     import { type PasswordUpdateDTO, UserService } from '@/api'
 
     const oldPasswordRef = ref('');
diff --git a/src/views/SettingsView.vue b/src/views/Settings/SettingsView.vue
similarity index 100%
rename from src/views/SettingsView.vue
rename to src/views/Settings/SettingsView.vue