diff --git a/website/client/src/pages/settings/inlineSettings/_currentPasswordInput.vue b/website/client/src/pages/settings/components/_currentPasswordInput.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/_currentPasswordInput.vue
rename to website/client/src/pages/settings/components/_currentPasswordInput.vue
diff --git a/website/client/src/pages/settings/inlineSettings/_saveCancelButtons.vue b/website/client/src/pages/settings/components/_saveCancelButtons.vue
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/_saveCancelButtons.vue
rename to website/client/src/pages/settings/components/_saveCancelButtons.vue
diff --git a/website/client/src/pages/settings/inlineSettings/genericSettingMixin.js b/website/client/src/pages/settings/components/genericSettingMixin.js
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/genericSettingMixin.js
rename to website/client/src/pages/settings/components/genericSettingMixin.js
diff --git a/website/client/src/pages/settings/inlineSettings/inlineSettingMixin.js b/website/client/src/pages/settings/components/inlineSettingMixin.js
similarity index 100%
rename from website/client/src/pages/settings/inlineSettings/inlineSettingMixin.js
rename to website/client/src/pages/settings/components/inlineSettingMixin.js
diff --git a/website/client/src/pages/settings/generalSettings.vue b/website/client/src/pages/settings/generalSettings.vue
index ceb6e6816e..2007dadb1b 100644
--- a/website/client/src/pages/settings/generalSettings.vue
+++ b/website/client/src/pages/settings/generalSettings.vue
@@ -128,7 +128,7 @@ import DisplayNameSetting from './inlineSettings/displayNameSetting';
 import PasswordSetting from './inlineSettings/passwordSetting';
 import ResetAccount from './inlineSettings/resetAccount';
 import DeleteAccount from './inlineSettings/deleteAccount';
-import { sharedInlineSettingStore } from './inlineSettings/inlineSettingMixin';
+import { sharedInlineSettingStore } from './components/inlineSettingMixin';
 import LanguageSetting from './inlineSettings/languageSetting';
 
 export default {
diff --git a/website/client/src/pages/settings/inlineSettings/deleteAccount.vue b/website/client/src/pages/settings/inlineSettings/deleteAccount.vue
index 32991a18ab..61df218df0 100644
--- a/website/client/src/pages/settings/inlineSettings/deleteAccount.vue
+++ b/website/client/src/pages/settings/inlineSettings/deleteAccount.vue
@@ -79,9 +79,9 @@
 import axios from 'axios';
 import { mapState } from '@/libs/store';
 
-import { InlineSettingMixin } from './inlineSettingMixin';
-import SaveCancelButtons from './_saveCancelButtons';
-import CurrentPasswordInput from './_currentPasswordInput';
+import { InlineSettingMixin } from '../components/inlineSettingMixin';
+import SaveCancelButtons from '../components/_saveCancelButtons';
+import CurrentPasswordInput from '../components/_currentPasswordInput';
 
 
 export default {
diff --git a/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue b/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue
index d5c4c0b311..8b9f273d69 100644
--- a/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue
@@ -136,8 +136,8 @@ import debounce from 'lodash/debounce';
 import { mapState } from '@/libs/store';
 
 import checkIcon from '@/assets/svg/check.svg';
-import SaveCancelButtons from './_saveCancelButtons';
-import { InlineSettingMixin } from './inlineSettingMixin';
+import SaveCancelButtons from '../components/_saveCancelButtons';
+import { InlineSettingMixin } from '../components/inlineSettingMixin';
 
 export default {
   components: { SaveCancelButtons },
diff --git a/website/client/src/pages/settings/inlineSettings/languageSetting.vue b/website/client/src/pages/settings/inlineSettings/languageSetting.vue
index 8fb657c874..ca4461ff92 100644
--- a/website/client/src/pages/settings/inlineSettings/languageSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/languageSetting.vue
@@ -86,10 +86,10 @@ input {
 <script>
 import { mapState } from '@/libs/store';
 
-import SaveCancelButtons from './_saveCancelButtons';
-import { InlineSettingMixin } from './inlineSettingMixin';
+import SaveCancelButtons from '../components/_saveCancelButtons';
+import { InlineSettingMixin } from '../components/inlineSettingMixin';
 import SelectList from '@/components/ui/selectList';
-import { GenericSettingMixin } from './genericSettingMixin';
+import { GenericSettingMixin } from '../components/genericSettingMixin';
 
 export default {
   components: { SelectList, SaveCancelButtons },
diff --git a/website/client/src/pages/settings/inlineSettings/passwordSetting.vue b/website/client/src/pages/settings/inlineSettings/passwordSetting.vue
index 68347aa2ac..10d7406492 100644
--- a/website/client/src/pages/settings/inlineSettings/passwordSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/passwordSetting.vue
@@ -113,9 +113,9 @@ input {
 <script>
 import axios from 'axios';
 
-import SaveCancelButtons from './_saveCancelButtons';
-import { InlineSettingMixin } from './inlineSettingMixin';
-import CurrentPasswordInput from './_currentPasswordInput';
+import SaveCancelButtons from '../components/_saveCancelButtons';
+import { InlineSettingMixin } from '../components/inlineSettingMixin';
+import CurrentPasswordInput from '../components/_currentPasswordInput';
 
 export default {
   components: { CurrentPasswordInput, SaveCancelButtons },
diff --git a/website/client/src/pages/settings/inlineSettings/resetAccount.vue b/website/client/src/pages/settings/inlineSettings/resetAccount.vue
index dde252508c..d05e48a4da 100644
--- a/website/client/src/pages/settings/inlineSettings/resetAccount.vue
+++ b/website/client/src/pages/settings/inlineSettings/resetAccount.vue
@@ -85,9 +85,9 @@
 import axios from 'axios';
 import { mapState } from '@/libs/store';
 
-import { InlineSettingMixin } from './inlineSettingMixin';
-import SaveCancelButtons from './_saveCancelButtons';
-import CurrentPasswordInput from './_currentPasswordInput';
+import { InlineSettingMixin } from '../components/inlineSettingMixin';
+import SaveCancelButtons from '../components/_saveCancelButtons';
+import CurrentPasswordInput from '../components/_currentPasswordInput';
 
 
 export default {
diff --git a/website/client/src/pages/settings/inlineSettings/userEmailSetting.vue b/website/client/src/pages/settings/inlineSettings/userEmailSetting.vue
index c0e4d60384..e118827a4b 100644
--- a/website/client/src/pages/settings/inlineSettings/userEmailSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/userEmailSetting.vue
@@ -133,9 +133,9 @@ import * as validator from 'validator';
 import { mapState } from '@/libs/store';
 
 import checkIcon from '@/assets/svg/check.svg';
-import SaveCancelButtons from './_saveCancelButtons';
-import { InlineSettingMixin } from './inlineSettingMixin';
-import CurrentPasswordInput from './_currentPasswordInput';
+import SaveCancelButtons from '../components/_saveCancelButtons';
+import { InlineSettingMixin } from '../components/inlineSettingMixin';
+import CurrentPasswordInput from '../components/_currentPasswordInput';
 
 export default {
   components: { CurrentPasswordInput, SaveCancelButtons },
diff --git a/website/client/src/pages/settings/inlineSettings/userNameSetting.vue b/website/client/src/pages/settings/inlineSettings/userNameSetting.vue
index d4d739352e..87fcd93825 100644
--- a/website/client/src/pages/settings/inlineSettings/userNameSetting.vue
+++ b/website/client/src/pages/settings/inlineSettings/userNameSetting.vue
@@ -137,8 +137,8 @@ import debounce from 'lodash/debounce';
 import { mapState } from '@/libs/store';
 
 import checkIcon from '@/assets/svg/check.svg';
-import { InlineSettingMixin } from './inlineSettingMixin';
-import SaveCancelButtons from './_saveCancelButtons';
+import { InlineSettingMixin } from '../components/inlineSettingMixin';
+import SaveCancelButtons from '../components/_saveCancelButtons';
 
 // TODO extract usernameIssues/checks to a mixin to share between this and the authForm