diff --git a/app/src/modules/activity/components/navigation/navigation.vue b/app/src/modules/activity/components/navigation.vue
similarity index 99%
rename from app/src/modules/activity/components/navigation/navigation.vue
rename to app/src/modules/activity/components/navigation.vue
index b60d317c31..dd01ce6564 100644
--- a/app/src/modules/activity/components/navigation/navigation.vue
+++ b/app/src/modules/activity/components/navigation.vue
@@ -64,7 +64,6 @@
 				{{ $t('login') }}
 			</v-list-item-content>
 		</v-list-item>
-
 	</v-list>
 </template>
 
diff --git a/app/src/modules/activity/components/navigation/index.ts b/app/src/modules/activity/components/navigation/index.ts
deleted file mode 100644
index cbd68e9b50..0000000000
--- a/app/src/modules/activity/components/navigation/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import ActivityNavigation from './navigation.vue';
-
-export { ActivityNavigation };
-export default ActivityNavigation;
diff --git a/app/src/modules/activity/index.ts b/app/src/modules/activity/index.ts
index 0149cd78c6..cd85757647 100644
--- a/app/src/modules/activity/index.ts
+++ b/app/src/modules/activity/index.ts
@@ -1,6 +1,6 @@
 import { defineModule } from '@/modules/define';
-import ActivityBrowse from './routes/browse/';
-import ActivityDetail from './routes/detail/';
+import ActivityBrowse from './routes/browse.vue';
+import ActivityDetail from './routes/detail.vue';
 
 export default defineModule(({ i18n }) => ({
 	id: 'activity',
diff --git a/app/src/modules/activity/routes/browse/browse.vue b/app/src/modules/activity/routes/browse.vue
similarity index 98%
rename from app/src/modules/activity/routes/browse/browse.vue
rename to app/src/modules/activity/routes/browse.vue
index a8b3df8a7f..1815458208 100644
--- a/app/src/modules/activity/routes/browse/browse.vue
+++ b/app/src/modules/activity/routes/browse.vue
@@ -44,7 +44,7 @@
 
 <script lang="ts">
 import { defineComponent, computed, ref } from '@vue/composition-api';
-import ActivityNavigation from '../../components/navigation/';
+import ActivityNavigation from '../components/navigation.vue';
 import { i18n } from '@/lang';
 import { LayoutComponent } from '@/layouts/types';
 import usePreset from '@/composables/use-collection-preset';
diff --git a/app/src/modules/activity/routes/browse/index.ts b/app/src/modules/activity/routes/browse/index.ts
deleted file mode 100644
index a7b455b14c..0000000000
--- a/app/src/modules/activity/routes/browse/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import ActivityBrowse from './browse.vue';
-
-export { ActivityBrowse };
-export default ActivityBrowse;
diff --git a/app/src/modules/activity/routes/detail/detail.vue b/app/src/modules/activity/routes/detail.vue
similarity index 100%
rename from app/src/modules/activity/routes/detail/detail.vue
rename to app/src/modules/activity/routes/detail.vue
diff --git a/app/src/modules/activity/routes/detail/index.ts b/app/src/modules/activity/routes/detail/index.ts
deleted file mode 100644
index ec28f2f47f..0000000000
--- a/app/src/modules/activity/routes/detail/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import ActivityDetail from './detail.vue';
-
-export { ActivityDetail };
-export default ActivityDetail;
diff --git a/app/src/modules/collections/components/navigation/navigation.vue b/app/src/modules/collections/components/navigation.vue
similarity index 96%
rename from app/src/modules/collections/components/navigation/navigation.vue
rename to app/src/modules/collections/components/navigation.vue
index fa4a72fab6..26d27838d4 100644
--- a/app/src/modules/collections/components/navigation/navigation.vue
+++ b/app/src/modules/collections/components/navigation.vue
@@ -29,7 +29,7 @@
 
 <script lang="ts">
 import { defineComponent, computed } from '@vue/composition-api';
-import useNavigation from '../../composables/use-navigation';
+import useNavigation from '../composables/use-navigation';
 import { usePresetsStore } from '@/stores/';
 
 export default defineComponent({
diff --git a/app/src/modules/collections/components/navigation/index.ts b/app/src/modules/collections/components/navigation/index.ts
deleted file mode 100644
index 35a27edb2a..0000000000
--- a/app/src/modules/collections/components/navigation/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import CollectionsNavigation from './navigation.vue';
-
-export { CollectionsNavigation };
-export default CollectionsNavigation;
diff --git a/app/src/modules/collections/index.ts b/app/src/modules/collections/index.ts
index 1deceaf3de..5386767e8f 100644
--- a/app/src/modules/collections/index.ts
+++ b/app/src/modules/collections/index.ts
@@ -1,8 +1,8 @@
 import { defineModule } from '@/modules/define';
-import CollectionsOverview from './routes/overview/';
-import CollectionsBrowseOrDetail from './routes/browse-or-detail/';
-import CollectionsDetail from './routes/detail/';
-import CollectionsItemNotFound from './routes/not-found';
+import CollectionsOverview from './routes/overview.vue';
+import CollectionsBrowseOrDetail from './routes/browse-or-detail.vue';
+import CollectionsDetail from './routes/detail.vue';
+import CollectionsItemNotFound from './routes/not-found.vue';
 import { NavigationGuard } from 'vue-router';
 
 const checkForSystem: NavigationGuard = (to, from, next) => {
diff --git a/app/src/modules/collections/routes/browse-or-detail/browse-or-detail.vue b/app/src/modules/collections/routes/browse-or-detail.vue
similarity index 92%
rename from app/src/modules/collections/routes/browse-or-detail/browse-or-detail.vue
rename to app/src/modules/collections/routes/browse-or-detail.vue
index 6c26fdfae9..2d44ad376a 100644
--- a/app/src/modules/collections/routes/browse-or-detail/browse-or-detail.vue
+++ b/app/src/modules/collections/routes/browse-or-detail.vue
@@ -5,8 +5,8 @@
 <script lang="ts">
 import { defineComponent, ref, computed } from '@vue/composition-api';
 import Vue from 'vue';
-import CollectionsBrowse from '../browse';
-import CollectionsDetail from '../detail';
+import CollectionsBrowse from './browse.vue';
+import CollectionsDetail from './detail.vue';
 import { useCollectionsStore } from '@/stores/';
 
 export default defineComponent({
diff --git a/app/src/modules/collections/routes/browse-or-detail/index.ts b/app/src/modules/collections/routes/browse-or-detail/index.ts
deleted file mode 100644
index 63f59d1ec7..0000000000
--- a/app/src/modules/collections/routes/browse-or-detail/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import CollectionsBrowseOrDetail from './browse-or-detail.vue';
-
-export { CollectionsBrowseOrDetail };
-export default CollectionsBrowseOrDetail;
diff --git a/app/src/modules/collections/routes/browse-or-detail/readme.md b/app/src/modules/collections/routes/browse-or-detail/readme.md
deleted file mode 100644
index 122c9d56a1..0000000000
--- a/app/src/modules/collections/routes/browse-or-detail/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Browse or Detail
-
-Renders either the browse page or the detail page depending on whether or not the collection is a singleton
diff --git a/app/src/modules/collections/routes/browse/browse.vue b/app/src/modules/collections/routes/browse.vue
similarity index 99%
rename from app/src/modules/collections/routes/browse/browse.vue
rename to app/src/modules/collections/routes/browse.vue
index 2a1de8090a..0a545e2872 100644
--- a/app/src/modules/collections/routes/browse/browse.vue
+++ b/app/src/modules/collections/routes/browse.vue
@@ -214,10 +214,10 @@
 
 <script lang="ts">
 import { defineComponent, computed, ref, watch, toRefs } from '@vue/composition-api';
-import CollectionsNavigation from '../../components/navigation/';
+import CollectionsNavigation from '../components/navigation.vue';
 import api from '@/api';
 import { LayoutComponent } from '@/layouts/types';
-import CollectionsNotFound from '../not-found/';
+import CollectionsNotFound from './not-found.vue';
 import useCollection from '@/composables/use-collection';
 import usePreset from '@/composables/use-collection-preset';
 import LayoutDrawerDetail from '@/views/private/components/layout-drawer-detail';
diff --git a/app/src/modules/collections/routes/browse/index.ts b/app/src/modules/collections/routes/browse/index.ts
deleted file mode 100644
index 58d958a768..0000000000
--- a/app/src/modules/collections/routes/browse/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import CollectionsBrowse from './browse.vue';
-
-export { CollectionsBrowse };
-export default CollectionsBrowse;
diff --git a/app/src/modules/collections/routes/detail/detail.vue b/app/src/modules/collections/routes/detail.vue
similarity index 99%
rename from app/src/modules/collections/routes/detail/detail.vue
rename to app/src/modules/collections/routes/detail.vue
index c068eba0b8..02b88079fa 100644
--- a/app/src/modules/collections/routes/detail/detail.vue
+++ b/app/src/modules/collections/routes/detail.vue
@@ -178,9 +178,9 @@
 <script lang="ts">
 import { defineComponent, computed, toRefs, ref } from '@vue/composition-api';
 
-import CollectionsNavigation from '../../components/navigation/';
+import CollectionsNavigation from '../components/navigation.vue';
 import router from '@/router';
-import CollectionsNotFound from '../not-found/';
+import CollectionsNotFound from './not-found.vue';
 import useCollection from '@/composables/use-collection';
 import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail';
 import CommentsDrawerDetail from '@/views/private/components/comments-drawer-detail';
diff --git a/app/src/modules/collections/routes/detail/index.ts b/app/src/modules/collections/routes/detail/index.ts
deleted file mode 100644
index e5efcf8b5c..0000000000
--- a/app/src/modules/collections/routes/detail/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import CollectionsDetail from './detail.vue';
-
-export { CollectionsDetail };
-export default CollectionsDetail;
diff --git a/app/src/modules/collections/routes/not-found/not-found.vue b/app/src/modules/collections/routes/not-found.vue
similarity index 90%
rename from app/src/modules/collections/routes/not-found/not-found.vue
rename to app/src/modules/collections/routes/not-found.vue
index 405c3c3ad3..16d79cc144 100644
--- a/app/src/modules/collections/routes/not-found/not-found.vue
+++ b/app/src/modules/collections/routes/not-found.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts">
 import { defineComponent } from '@vue/composition-api';
-import CollectionsNavigation from '../../components/navigation/';
+import CollectionsNavigation from '../components/navigation.vue';
 
 export default defineComponent({
 	components: { CollectionsNavigation },
diff --git a/app/src/modules/collections/routes/not-found/index.ts b/app/src/modules/collections/routes/not-found/index.ts
deleted file mode 100644
index 49f5c06dd1..0000000000
--- a/app/src/modules/collections/routes/not-found/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import NotFound from './not-found.vue';
-
-export { NotFound };
-export default NotFound;
diff --git a/app/src/modules/collections/routes/overview/overview.vue b/app/src/modules/collections/routes/overview.vue
similarity index 94%
rename from app/src/modules/collections/routes/overview/overview.vue
rename to app/src/modules/collections/routes/overview.vue
index 3c334926a3..772f13b84f 100644
--- a/app/src/modules/collections/routes/overview/overview.vue
+++ b/app/src/modules/collections/routes/overview.vue
@@ -38,9 +38,9 @@
 
 <script lang="ts">
 import { defineComponent, computed } from '@vue/composition-api';
-import CollectionsNavigation from '../../components/navigation/';
+import CollectionsNavigation from '../components/navigation.vue';
 import { i18n } from '@/lang';
-import useNavigation, { NavItem } from '../../composables/use-navigation';
+import useNavigation, { NavItem } from '../composables/use-navigation';
 import router from '@/router';
 import { useUserStore } from '@/stores';
 
diff --git a/app/src/modules/collections/routes/overview/index.ts b/app/src/modules/collections/routes/overview/index.ts
deleted file mode 100644
index bc4c0d9aff..0000000000
--- a/app/src/modules/collections/routes/overview/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import CollectionsOverview from './overview.vue';
-
-export { CollectionsOverview };
-export default CollectionsOverview;
diff --git a/app/src/modules/files/components/add-folder/add-folder.vue b/app/src/modules/files/components/add-folder.vue
similarity index 97%
rename from app/src/modules/files/components/add-folder/add-folder.vue
rename to app/src/modules/files/components/add-folder.vue
index bec92be14e..617753123e 100644
--- a/app/src/modules/files/components/add-folder/add-folder.vue
+++ b/app/src/modules/files/components/add-folder.vue
@@ -23,7 +23,7 @@
 
 <script lang="ts">
 import { defineComponent, ref } from '@vue/composition-api';
-import useFolders from '../../composables/use-folders';
+import useFolders from '../composables/use-folders';
 import api from '@/api';
 import router from '@/router';
 
diff --git a/app/src/modules/files/components/add-folder/index.ts b/app/src/modules/files/components/add-folder/index.ts
deleted file mode 100644
index b3d66976ad..0000000000
--- a/app/src/modules/files/components/add-folder/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import AddFolder from './add-folder.vue';
-
-export { AddFolder };
-export default AddFolder;
diff --git a/app/src/modules/files/routes/detail/components/file-info-drawer-detail.vue b/app/src/modules/files/components/file-info-drawer-detail.vue
similarity index 98%
rename from app/src/modules/files/routes/detail/components/file-info-drawer-detail.vue
rename to app/src/modules/files/components/file-info-drawer-detail.vue
index e4a11cce6f..37ee114347 100644
--- a/app/src/modules/files/routes/detail/components/file-info-drawer-detail.vue
+++ b/app/src/modules/files/components/file-info-drawer-detail.vue
@@ -53,7 +53,7 @@
 			<div>
 				<dt>{{ $t('folder') }}</dt>
 				<dd>
-					<button @click="$emit('move-folder')">{{ (folder) ? folder.name : $t('file_library') }}</button>
+					<button @click="$emit('move-folder')">{{ folder ? folder.name : $t('file_library') }}</button>
 				</dd>
 			</div>
 
@@ -90,7 +90,6 @@
 		<v-divider />
 
 		<div class="page-description" v-html="marked($t('page_help_files_detail'))" />
-
 	</drawer-detail>
 </template>
 
diff --git a/app/src/modules/files/components/folder-picker/folder-picker-list-item.vue b/app/src/modules/files/components/folder-picker-list-item.vue
similarity index 100%
rename from app/src/modules/files/components/folder-picker/folder-picker-list-item.vue
rename to app/src/modules/files/components/folder-picker-list-item.vue
diff --git a/app/src/modules/files/components/folder-picker/folder-picker.vue b/app/src/modules/files/components/folder-picker.vue
similarity index 100%
rename from app/src/modules/files/components/folder-picker/folder-picker.vue
rename to app/src/modules/files/components/folder-picker.vue
diff --git a/app/src/modules/files/components/folder-picker/index.ts b/app/src/modules/files/components/folder-picker/index.ts
deleted file mode 100644
index fcad0716e1..0000000000
--- a/app/src/modules/files/components/folder-picker/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import FolderPicker from './folder-picker.vue';
-
-export default FolderPicker;
-export { FolderPicker };
diff --git a/app/src/modules/files/components/navigation/navigation-folder.vue b/app/src/modules/files/components/navigation-folder.vue
similarity index 98%
rename from app/src/modules/files/components/navigation/navigation-folder.vue
rename to app/src/modules/files/components/navigation-folder.vue
index f82fef8ec0..fd70c2ccaa 100644
--- a/app/src/modules/files/components/navigation/navigation-folder.vue
+++ b/app/src/modules/files/components/navigation-folder.vue
@@ -111,10 +111,10 @@
 
 <script lang="ts">
 import { defineComponent, PropType, ref, watch, computed } from '@vue/composition-api';
-import useFolders, { Folder } from '../../composables/use-folders';
+import useFolders, { Folder } from '../composables/use-folders';
 import notify from '@/utils/notify';
 import api from '@/api';
-import FolderPicker from '../folder-picker';
+import FolderPicker from './folder-picker.vue';
 import router from '@/router';
 
 export default defineComponent({
diff --git a/app/src/modules/files/components/navigation/navigation.vue b/app/src/modules/files/components/navigation.vue
similarity index 98%
rename from app/src/modules/files/components/navigation/navigation.vue
rename to app/src/modules/files/components/navigation.vue
index 7d4c8e8be9..f57d4b2085 100644
--- a/app/src/modules/files/components/navigation/navigation.vue
+++ b/app/src/modules/files/components/navigation.vue
@@ -47,7 +47,7 @@
 
 <script lang="ts">
 import { defineComponent, computed, ref, watch } from '@vue/composition-api';
-import useFolders from '../../composables/use-folders';
+import useFolders from '../composables/use-folders';
 import NavigationFolder from './navigation-folder.vue';
 import arraysAreEqual from '@/utils/arrays-are-equal';
 
diff --git a/app/src/modules/files/components/navigation/index.ts b/app/src/modules/files/components/navigation/index.ts
deleted file mode 100644
index 91a55896d1..0000000000
--- a/app/src/modules/files/components/navigation/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import FilesNavigation from './navigation.vue';
-
-export { FilesNavigation };
-export default FilesNavigation;
diff --git a/app/src/modules/files/index.ts b/app/src/modules/files/index.ts
index 2503a5713a..a5353ee9af 100644
--- a/app/src/modules/files/index.ts
+++ b/app/src/modules/files/index.ts
@@ -1,7 +1,7 @@
 import { defineModule } from '@/modules/define';
-import FilesBrowse from './routes/browse/';
-import FilesDetail from './routes/detail/';
-import FilesAddNew from './routes/add-new/';
+import FilesBrowse from './routes/browse.vue';
+import FilesDetail from './routes/detail.vue';
+import FilesAddNew from './routes/add-new.vue';
 
 export default defineModule(({ i18n }) => ({
 	id: 'files',
diff --git a/app/src/modules/files/routes/add-new/add-new.vue b/app/src/modules/files/routes/add-new.vue
similarity index 100%
rename from app/src/modules/files/routes/add-new/add-new.vue
rename to app/src/modules/files/routes/add-new.vue
diff --git a/app/src/modules/files/routes/add-new/index.ts b/app/src/modules/files/routes/add-new/index.ts
deleted file mode 100644
index d49e12ec8e..0000000000
--- a/app/src/modules/files/routes/add-new/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import AddNew from './add-new.vue';
-
-export { AddNew };
-export default AddNew;
diff --git a/app/src/modules/files/routes/browse/browse.vue b/app/src/modules/files/routes/browse.vue
similarity index 97%
rename from app/src/modules/files/routes/browse/browse.vue
rename to app/src/modules/files/routes/browse.vue
index ae9309445f..b05d7f3fd9 100644
--- a/app/src/modules/files/routes/browse/browse.vue
+++ b/app/src/modules/files/routes/browse.vue
@@ -138,23 +138,23 @@
 
 <script lang="ts">
 import { defineComponent, computed, ref, PropType, onMounted, onUnmounted } from '@vue/composition-api';
-import FilesNavigation from '../../components/navigation/';
+import FilesNavigation from '../components/navigation.vue';
 import { i18n } from '@/lang';
 import api from '@/api';
 import { LayoutComponent } from '@/layouts/types';
 import usePreset from '@/composables/use-collection-preset';
 import FilterDrawerDetail from '@/views/private/components/filter-drawer-detail';
 import LayoutDrawerDetail from '@/views/private/components/layout-drawer-detail';
-import AddFolder from '../../components/add-folder';
+import AddFolder from '../components/add-folder.vue';
 import SearchInput from '@/views/private/components/search-input';
 import marked from 'marked';
-import FolderPicker from '../../components/folder-picker';
+import FolderPicker from '../components/folder-picker.vue';
 import emitter, { Events } from '@/events';
 import router from '@/router';
 import Vue from 'vue';
 import { useUserStore } from '@/stores';
 import { subDays } from 'date-fns';
-import useFolders from '../../composables/use-folders';
+import useFolders from '../composables/use-folders';
 
 type Item = {
 	[field: string]: any;
diff --git a/app/src/modules/files/routes/browse/index.ts b/app/src/modules/files/routes/browse/index.ts
deleted file mode 100644
index c0ef6ea919..0000000000
--- a/app/src/modules/files/routes/browse/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import FilesBrowse from './browse.vue';
-
-export { FilesBrowse };
-export default FilesBrowse;
diff --git a/app/src/modules/files/routes/detail/detail.vue b/app/src/modules/files/routes/detail.vue
similarity index 97%
rename from app/src/modules/files/routes/detail/detail.vue
rename to app/src/modules/files/routes/detail.vue
index b78f4dfc41..dc659b0907 100644
--- a/app/src/modules/files/routes/detail/detail.vue
+++ b/app/src/modules/files/routes/detail.vue
@@ -169,7 +169,7 @@
 
 <script lang="ts">
 import { defineComponent, computed, toRefs, ref, watch } from '@vue/composition-api';
-import FilesNavigation from '../../components/navigation/';
+import FilesNavigation from '../components/navigation.vue';
 import { i18n } from '@/lang';
 import router from '@/router';
 import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail';
@@ -182,12 +182,12 @@ import { nanoid } from 'nanoid';
 import FileLightbox from '@/views/private/components/file-lightbox';
 import { useFieldsStore } from '@/stores/';
 import { Field } from '@/types';
-import FileInfoDrawerDetail from './components/file-info-drawer-detail.vue';
+import FileInfoDrawerDetail from '../components/file-info-drawer-detail.vue';
 import useFormFields from '@/composables/use-form-fields';
-import FolderPicker from '../../components/folder-picker';
+import FolderPicker from '../components/folder-picker.vue';
 import api from '@/api';
 import getRootPath from '@/utils/get-root-path';
-import FilesNotFound from '../not-found/';
+import FilesNotFound from './not-found.vue';
 import useShortcut from '@/composables/use-shortcut';
 
 type Values = {
diff --git a/app/src/modules/files/routes/detail/index.ts b/app/src/modules/files/routes/detail/index.ts
deleted file mode 100644
index 99de591237..0000000000
--- a/app/src/modules/files/routes/detail/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import FilesDetail from './detail.vue';
-
-export { FilesDetail };
-export default FilesDetail;
diff --git a/app/src/modules/files/routes/not-found/not-found.vue b/app/src/modules/files/routes/not-found.vue
similarity index 90%
rename from app/src/modules/files/routes/not-found/not-found.vue
rename to app/src/modules/files/routes/not-found.vue
index 7f1f4a1f52..e4da9842a8 100644
--- a/app/src/modules/files/routes/not-found/not-found.vue
+++ b/app/src/modules/files/routes/not-found.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts">
 import { defineComponent } from '@vue/composition-api';
-import FilesNavigation from '../../components/navigation/';
+import FilesNavigation from '../components/navigation.vue';
 
 export default defineComponent({
 	components: { FilesNavigation },
diff --git a/app/src/modules/files/routes/not-found/index.ts b/app/src/modules/files/routes/not-found/index.ts
deleted file mode 100644
index 49f5c06dd1..0000000000
--- a/app/src/modules/files/routes/not-found/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import NotFound from './not-found.vue';
-
-export { NotFound };
-export default NotFound;
diff --git a/app/src/modules/users/components/navigation/navigation.vue b/app/src/modules/users/components/navigation.vue
similarity index 95%
rename from app/src/modules/users/components/navigation/navigation.vue
rename to app/src/modules/users/components/navigation.vue
index 0c6df8ade4..cab510bdb5 100644
--- a/app/src/modules/users/components/navigation/navigation.vue
+++ b/app/src/modules/users/components/navigation.vue
@@ -29,7 +29,7 @@
 <script lang="ts">
 import { defineComponent } from '@vue/composition-api';
 
-import useNavigation from '../../composables/use-navigation';
+import useNavigation from '../composables/use-navigation';
 
 export default defineComponent({
 	props: {
diff --git a/app/src/modules/users/components/navigation/index.ts b/app/src/modules/users/components/navigation/index.ts
deleted file mode 100644
index 7842de1d2d..0000000000
--- a/app/src/modules/users/components/navigation/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import UsersNavigation from './navigation.vue';
-
-export { UsersNavigation };
-export default UsersNavigation;
diff --git a/app/src/modules/users/routes/detail/components/user-info-drawer-detail.vue b/app/src/modules/users/components/user-info-drawer-detail.vue
similarity index 100%
rename from app/src/modules/users/routes/detail/components/user-info-drawer-detail.vue
rename to app/src/modules/users/components/user-info-drawer-detail.vue
diff --git a/app/src/modules/users/index.ts b/app/src/modules/users/index.ts
index ff1a74bfa8..b563d86fab 100644
--- a/app/src/modules/users/index.ts
+++ b/app/src/modules/users/index.ts
@@ -1,7 +1,7 @@
 import { defineModule } from '@/modules/define';
 
-import UsersBrowse from './routes/browse/';
-import UsersDetail from './routes/detail/';
+import UsersBrowse from './routes/browse.vue';
+import UsersDetail from './routes/detail.vue';
 
 export default defineModule(({ i18n }) => ({
 	id: 'users',
diff --git a/app/src/modules/users/routes/browse/browse.vue b/app/src/modules/users/routes/browse.vue
similarity index 98%
rename from app/src/modules/users/routes/browse/browse.vue
rename to app/src/modules/users/routes/browse.vue
index 2d7d064164..0e3f44ecf8 100644
--- a/app/src/modules/users/routes/browse/browse.vue
+++ b/app/src/modules/users/routes/browse.vue
@@ -103,7 +103,7 @@
 
 <script lang="ts">
 import { defineComponent, computed, ref, PropType } from '@vue/composition-api';
-import UsersNavigation from '../../components/navigation/';
+import UsersNavigation from '../components/navigation.vue';
 
 import { i18n } from '@/lang';
 import api from '@/api';
@@ -112,7 +112,7 @@ import usePreset from '@/composables/use-collection-preset';
 import LayoutDrawerDetail from '@/views/private/components/layout-drawer-detail';
 import SearchInput from '@/views/private/components/search-input';
 import marked from 'marked';
-import useNavigation from '../../composables/use-navigation';
+import useNavigation from '../composables/use-navigation';
 
 type Item = {
 	[field: string]: any;
diff --git a/app/src/modules/users/routes/browse/index.ts b/app/src/modules/users/routes/browse/index.ts
deleted file mode 100644
index 873f2a6398..0000000000
--- a/app/src/modules/users/routes/browse/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import UsersBrowse from './browse.vue';
-
-export { UsersBrowse };
-export default UsersBrowse;
diff --git a/app/src/modules/users/routes/detail/detail.vue b/app/src/modules/users/routes/detail.vue
similarity index 98%
rename from app/src/modules/users/routes/detail/detail.vue
rename to app/src/modules/users/routes/detail.vue
index 9543398fd6..f0d833b1bf 100644
--- a/app/src/modules/users/routes/detail/detail.vue
+++ b/app/src/modules/users/routes/detail.vue
@@ -128,7 +128,7 @@
 <script lang="ts">
 import { defineComponent, computed, toRefs, ref, watch } from '@vue/composition-api';
 
-import UsersNavigation from '../../components/navigation/';
+import UsersNavigation from '../components/navigation.vue';
 import { i18n } from '@/lang';
 import router from '@/router';
 import RevisionsDrawerDetail from '@/views/private/components/revisions-drawer-detail';
@@ -139,7 +139,7 @@ import api from '@/api';
 import { useFieldsStore } from '@/stores/';
 import useFormFields from '@/composables/use-form-fields';
 import { Field } from '@/types';
-import UserInfoDrawerDetail from './components/user-info-drawer-detail.vue';
+import UserInfoDrawerDetail from '../components/user-info-drawer-detail.vue';
 import { getRootPath } from '@/utils/get-root-path';
 import useShortcut from '@/composables/use-shortcut';
 
@@ -381,10 +381,6 @@ export default defineComponent({
 	border: 2px solid var(--border-normal);
 	border-radius: var(--border-radius);
 
-	@include breakpoint(small) {
-		height: 172px;
-	}
-
 	.avatar {
 		--v-icon-color: var(--foreground-subdued);
 
@@ -400,12 +396,6 @@ export default defineComponent({
 		border: solid var(--border-width) var(--border-normal);
 		border-radius: var(--border-radius);
 
-		@include breakpoint(small) {
-			width: 144px;
-			height: 144px;
-			margin-right: 22px;
-		}
-
 		.v-skeleton-loader {
 			width: 100%;
 			height: 100%;
@@ -416,6 +406,12 @@ export default defineComponent({
 			height: 100%;
 			object-fit: cover;
 		}
+
+		@include breakpoint(small) {
+			width: 144px;
+			height: 144px;
+			margin-right: 22px;
+		}
 	}
 
 	.user-box-content {
@@ -430,13 +426,13 @@ export default defineComponent({
 		}
 
 		.v-chip {
-			margin-top: 4px;
-
 			--v-chip-color: var(--foreground-subdued);
 			--v-chip-background-color: var(--background-subdued);
 			--v-chip-color-hover: var(--foreground-subdued);
 			--v-chip-background-color-hover: var(--background-subdued);
 
+			margin-top: 4px;
+
 			&.active {
 				--v-chip-color: var(--primary);
 				--v-chip-background-color: var(--primary-25);
@@ -448,5 +444,9 @@ export default defineComponent({
 			color: var(--foreground-subdued);
 		}
 	}
+
+	@include breakpoint(small) {
+		height: 172px;
+	}
 }
 </style>
diff --git a/app/src/modules/users/routes/detail/index.ts b/app/src/modules/users/routes/detail/index.ts
deleted file mode 100644
index 1e2c7cedf1..0000000000
--- a/app/src/modules/users/routes/detail/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import UsersDetail from './detail.vue';
-
-export { UsersDetail };
-export default UsersDetail;