diff --git a/src/Api/index.ts b/src/Api/index.ts
index 926730e2a1..2270caa2cb 100644
--- a/src/Api/index.ts
+++ b/src/Api/index.ts
@@ -9,17 +9,17 @@ export type ApiEmailAdressList = {
 	combined: string
 }
 
-export { default as ActivityAPI } from './modules/activity.ts'
-export { default as AdminAPI } from './modules/admin.ts'
-export { default as AppSettingsAPI } from './modules/appSettings.ts'
-export { default as CalendarAPI } from './modules/calendar.ts'
-export { default as CommentsAPI } from './modules/comments.ts'
-export { default as OptionsAPI } from './modules/options.ts'
-export { default as PollsAPI } from './modules/polls.ts'
-export { default as PollGroupsAPI } from './modules/pollGroups.ts'
-export { default as PublicAPI } from './modules/public.ts'
-export { default as SharesAPI } from './modules/shares.ts'
-export { default as UserSettingsAPI } from './modules/userSettings.ts'
-export { default as ValidatorAPI } from './modules/validators.ts'
-export { default as VotesAPI } from './modules/votes.ts'
-export { default as SessionAPI } from './modules/session.ts'
+export { default as ActivityAPI } from './modules/activity'
+export { default as AdminAPI } from './modules/admin'
+export { default as AppSettingsAPI } from './modules/appSettings'
+export { default as CalendarAPI } from './modules/calendar'
+export { default as CommentsAPI } from './modules/comments'
+export { default as OptionsAPI } from './modules/options'
+export { default as PollsAPI } from './modules/polls'
+export { default as PollGroupsAPI } from './modules/pollGroups'
+export { default as PublicAPI } from './modules/public'
+export { default as SharesAPI } from './modules/shares'
+export { default as UserSettingsAPI } from './modules/userSettings'
+export { default as ValidatorAPI } from './modules/validators'
+export { default as VotesAPI } from './modules/votes'
+export { default as SessionAPI } from './modules/session'
diff --git a/src/Api/modules/HttpApi.js b/src/Api/modules/HttpApi.js
index 1d09a89dd4..6a0adb0467 100644
--- a/src/Api/modules/HttpApi.js
+++ b/src/Api/modules/HttpApi.js
@@ -5,7 +5,6 @@
 import axios from '@nextcloud/axios'
 import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 import { useSessionStore } from '../../stores/session.ts'
-// const clientSessionId = Math.random().toString(36).substring(2)
 
 const axiosConfig = {
 	baseURL: generateUrl('apps/polls/'),
diff --git a/src/Api/modules/activity.ts b/src/Api/modules/activity.ts
index af817e00a7..53f077207c 100644
--- a/src/Api/modules/activity.ts
+++ b/src/Api/modules/activity.ts
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { ocsInstance, createCancelTokenHandler } from './HttpApi.js'
+import { ocsInstance, createCancelTokenHandler } from './HttpApi'
 
 const activity = {
 	getActivities(pollId: number) {
diff --git a/src/Api/modules/admin.ts b/src/Api/modules/admin.ts
index 1a6fb74170..e02db978d0 100644
--- a/src/Api/modules/admin.ts
+++ b/src/Api/modules/admin.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
 
 const adminJobs = {
 	runAutoReminder() {
diff --git a/src/Api/modules/api.types.ts b/src/Api/modules/api.types.ts
index a30e1427da..0e470516d5 100644
--- a/src/Api/modules/api.types.ts
+++ b/src/Api/modules/api.types.ts
@@ -3,7 +3,17 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { Comment, Option, Poll, Share, Vote } from '../../Types'
+import type { Option } from '../../stores/options.types'
+import type { Vote } from '../../stores/votes.types'
+import type { Poll } from '../../stores/poll.types'
+import type { Comment } from '../../stores/comments.types'
+import type { Share } from '../../stores/shares.types'
+
+export type ApiEmailAdressList = {
+	displayName: string
+	emailAddress: string
+	combined: string
+}
 
 export type FullPollResponse = {
 	poll: Poll
diff --git a/src/Api/modules/appSettings.ts b/src/Api/modules/appSettings.ts
index 77a064ff14..963603e5c8 100644
--- a/src/Api/modules/appSettings.ts
+++ b/src/Api/modules/appSettings.ts
@@ -2,13 +2,14 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { AppSettings, Group } from '../../stores/appSettings.js'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { ISearchType, User } from '../../Types/index.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+import { ISearchType, User } from '../../Types'
+
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { AppSettingsStore, Group } from '../../stores/appSettings.types'
 
 const appSettings = {
-	getAppSettings(): Promise<AxiosResponse<{ appSettings: AppSettings }>> {
+	getAppSettings(): Promise<AxiosResponse<{ appSettings: AppSettingsStore }>> {
 		return httpInstance.request({
 			method: 'GET',
 			url: 'settings/app',
@@ -21,8 +22,8 @@ const appSettings = {
 	},
 
 	writeAppSettings(
-		appSettings: AppSettings,
-	): Promise<AxiosResponse<{ appSettings: AppSettings }>> {
+		appSettings: AppSettingsStore,
+	): Promise<AxiosResponse<{ appSettings: AppSettingsStore }>> {
 		return httpInstance.request({
 			method: 'POST',
 			url: 'settings/app',
diff --git a/src/Api/modules/calendar.ts b/src/Api/modules/calendar.ts
index 62b841fa87..95e573e6c3 100644
--- a/src/Api/modules/calendar.ts
+++ b/src/Api/modules/calendar.ts
@@ -2,11 +2,12 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { Calendar } from '../../stores/preferences.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
 import { CalendarEvent } from '../../components/Calendar/CalendarPeek.vue'
 
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { Calendar } from '../../stores/preferences.types'
+
 const calendar = {
 	getCalendars(): Promise<AxiosResponse<{ calendars: Calendar[] }>> {
 		return httpInstance.request({
diff --git a/src/Api/modules/comments.ts b/src/Api/modules/comments.ts
index 35e5efff2e..68b5fd67b2 100644
--- a/src/Api/modules/comments.ts
+++ b/src/Api/modules/comments.ts
@@ -3,8 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { AxiosResponse } from '@nextcloud/axios'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { Comment } from '../../stores/comments.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { Comment } from '../../stores/comments.types'
 
 const comments = {
 	getComments(pollId: number): Promise<AxiosResponse<{ comments: Comment[] }>> {
diff --git a/src/Api/modules/options.ts b/src/Api/modules/options.ts
index 18c92e7b3e..4a0bb7418f 100644
--- a/src/Api/modules/options.ts
+++ b/src/Api/modules/options.ts
@@ -2,11 +2,12 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { Option, Sequence, SimpleOption } from '../../stores/options.js'
-import { DateTimeUnit } from '../../constants/dateUnits.js'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { AxiosResponse } from '@nextcloud/axios'
-import { Vote } from '../../stores/votes.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { DateTimeUnit } from '../../constants/dateUnits'
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { Vote } from '../../stores/votes.types'
+import type { Option, Sequence, SimpleOption } from '../../stores/options.types'
 
 const options = {
 	getOptions(pollId: number): Promise<AxiosResponse<{ options: Option[] }>> {
diff --git a/src/Api/modules/pollGroups.ts b/src/Api/modules/pollGroups.ts
index d5f7ead306..4da1a2d152 100644
--- a/src/Api/modules/pollGroups.ts
+++ b/src/Api/modules/pollGroups.ts
@@ -2,10 +2,11 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { Poll } from '../../stores/poll.ts'
-import { PollGroup } from '../../stores/pollGroups.types.ts'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { Poll } from '../../stores/poll.types'
+import type { PollGroup } from '../../stores/pollGroups.types'
 
 const pollGroups = {
 	getPollGroups(): Promise<AxiosResponse<{ pollGroups: PollGroup[] }>> {
diff --git a/src/Api/modules/polls.ts b/src/Api/modules/polls.ts
index 0a4b66b823..6bb8e09275 100644
--- a/src/Api/modules/polls.ts
+++ b/src/Api/modules/polls.ts
@@ -2,12 +2,12 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { Poll, PollConfiguration, PollType } from '../../stores/poll.ts'
-import { AxiosResponse } from '@nextcloud/axios'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { ApiEmailAdressList } from '../../Types/index.ts'
-import { PollGroup } from '../../stores/pollGroups.types.ts'
-import { FullPollResponse } from './api.types.ts'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { ApiEmailAdressList, FullPollResponse } from './api.types'
+import type { PollGroup } from '../../stores/pollGroups.types'
+import type { Poll, PollConfiguration, PollType } from '../../stores/poll.types'
 
 export type Confirmations = {
 	sentMails: { emailAddress: string; displayName: string }[]
diff --git a/src/Api/modules/public.ts b/src/Api/modules/public.ts
index 1e7d02e710..957682dfcc 100644
--- a/src/Api/modules/public.ts
+++ b/src/Api/modules/public.ts
@@ -2,20 +2,22 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { Option, Sequence, SimpleOption } from '../../stores/options.js'
-import { Session } from '../../stores/session.js'
-import { Answer, Vote } from '../../stores/votes.js'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { Comment } from '../../stores/comments.js'
-import { Share } from '../../stores/shares.js'
-import { SentResults } from './shares.js'
-import {
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { SentResults } from './shares'
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { Session } from '../../stores/session.types'
+import type { Comment } from '../../stores/comments.types'
+import type { Share } from '../../stores/shares.types'
+import type { Option, Sequence, SimpleOption } from '../../stores/options.types'
+import type { Answer, Vote } from '../../stores/votes.types'
+
+import type {
 	AddOptionResponse,
 	FullPollResponse,
 	RemoveVotesResponse,
 	setVoteResponse,
-} from './api.types.js'
+} from './api.types'
 
 const publicPoll = {
 	getPoll(shareToken: string): Promise<AxiosResponse<FullPollResponse>> {
diff --git a/src/Api/modules/session.ts b/src/Api/modules/session.ts
index 1d308c1e9c..b2174dbce1 100644
--- a/src/Api/modules/session.ts
+++ b/src/Api/modules/session.ts
@@ -2,9 +2,10 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { Session } from '../../stores/session.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { Session } from '../../stores/session.types'
 
 const session = {
 	getSession(): Promise<AxiosResponse<Session>> {
diff --git a/src/Api/modules/shares.ts b/src/Api/modules/shares.ts
index 7b4d8ce3ed..bdb36265ba 100644
--- a/src/Api/modules/shares.ts
+++ b/src/Api/modules/shares.ts
@@ -2,10 +2,16 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { Share, ShareType, User } from '../../Types/index.js'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { PublicPollEmailConditions, SharePurpose } from '../../stores/shares.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { User } from '../../Types'
+import type {
+	PublicPollEmailConditions,
+	SharePurpose,
+	Share,
+	ShareType,
+} from '../../stores/shares.types'
 
 export type SentResults = {
 	sentMails: { emailAddress: string; displayName: string }[]
diff --git a/src/Api/modules/userSettings.ts b/src/Api/modules/userSettings.ts
index 2b67a92a12..49f9949d56 100644
--- a/src/Api/modules/userSettings.ts
+++ b/src/Api/modules/userSettings.ts
@@ -2,9 +2,10 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { UserPreferences } from '../../stores/preferences.js'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { UserPreferences } from '../../stores/preferences.types'
 
 const userSettings = {
 	getUserSettings(): Promise<AxiosResponse<{ preferences: UserPreferences }>> {
diff --git a/src/Api/modules/validators.ts b/src/Api/modules/validators.ts
index b61056ecbf..232f19aad0 100644
--- a/src/Api/modules/validators.ts
+++ b/src/Api/modules/validators.ts
@@ -2,8 +2,9 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { AxiosResponse } from '@nextcloud/axios'
 
 const validators = {
 	validateEmailAddress(
diff --git a/src/Api/modules/votes.ts b/src/Api/modules/votes.ts
index 0861930add..4e9b269ca3 100644
--- a/src/Api/modules/votes.ts
+++ b/src/Api/modules/votes.ts
@@ -2,10 +2,11 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { AxiosResponse } from '@nextcloud/axios'
-import { Answer, Vote } from '../../stores/votes.js'
-import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { RemoveVotesResponse, setVoteResponse } from './api.types.js'
+import { httpInstance, createCancelTokenHandler } from './HttpApi'
+
+import type { RemoveVotesResponse, setVoteResponse } from './api.types'
+import type { AxiosResponse } from '@nextcloud/axios'
+import type { Answer, Vote } from '../../stores/votes.types'
 
 const votes = {
 	getVotes(pollId: number): Promise<AxiosResponse<{ votes: Vote[] }>> {
diff --git a/src/App.vue b/src/App.vue
index 16c566ba37..2f9a9eab34 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,21 +4,28 @@
 -->
 
 <script setup lang="ts">
-import { ref, computed, onMounted, onUnmounted, watchEffect } from 'vue'
-import { debounce } from 'lodash'
+import {
+	ref,
+	computed,
+	defineAsyncComponent,
+	onMounted,
+	onUnmounted,
+	watchEffect,
+} from 'vue'
+import debounce from 'lodash/debounce'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
 import NcContent from '@nextcloud/vue/components/NcContent'
 
-import UserSettingsDlg from './components/Settings/UserSettingsDlg.vue'
+// import UserSettingsDlg from './components/Settings/UserSettingsDlg.vue'
 
 import { usePollWatcher } from './composables/usePollWatcher'
 
-import { useSessionStore } from './stores/session.ts'
-import { usePollStore } from './stores/poll.ts'
-import { usePollGroupsStore } from './stores/pollGroups.ts'
+import { useSessionStore } from './stores/session'
+import { usePollStore } from './stores/poll'
+import { usePollGroupsStore } from './stores/pollGroups'
 import { showSuccess } from '@nextcloud/dialogs'
-import { Event } from './Types/index.ts'
+import { Event } from './Types'
 
 import '@nextcloud/dialogs/style.css'
 import './assets/scss/vars.scss'
@@ -43,6 +50,10 @@ const appClass = computed(() => [
 	},
 ])
 
+const UserSettingsDlg = defineAsyncComponent(
+	() => import('./components/Settings/UserSettingsDlg.vue'),
+)
+
 const useNavigation = computed(() => sessionStore.userStatus.isLoggedin)
 const useSidebar = computed(
 	() =>
diff --git a/src/Types/index.ts b/src/Types/index.ts
index c56b044497..a47f061f13 100644
--- a/src/Types/index.ts
+++ b/src/Types/index.ts
@@ -3,57 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-export { Activity, Activities } from '../stores/activity.ts'
-export { UpdateType, Group, AppSettings } from '../stores/appSettings.ts'
-export { Combo } from '../stores/combo.ts'
-export { Comment, Comments, CommentsGrouped } from '../stores/comments.ts'
-export {
-	Poll,
-	PollType,
-	AccessType,
-	ShowResults,
-	AllowProposals,
-	PollConfiguration,
-	PollStatus,
-	PollPermissions,
-	CurrentUserStatus,
-} from '../stores/poll.ts'
-
-export {
-	SortType,
-	FilterType,
-	PollCategory,
-	Meta,
-	PollList,
-} from '../stores/polls.ts'
-
-export {
-	Option,
-	OptionVotes,
-	Sequence,
-	SimpleOption,
-	Options,
-} from '../stores/options.ts'
-
-export { Share, Shares, ShareType } from '../stores/shares.ts'
-export { Route, UserStatus, Session } from '../stores/session.ts'
-
-export {
-	UserPreferences,
-	SessionSettings,
-	Calendar,
-	Preferences,
-	ViewMode,
-} from '../stores/preferences.ts'
-
-export { Answer, AnswerSymbol, Vote, Votes } from '../stores/votes.ts'
-
 export {
 	DateTimeUnit,
 	DateTimeUnitType,
 	TimeUnitsType,
 	DurationType,
-} from '../constants/dateUnits.ts'
+} from '../constants/dateUnits'
 
 export enum Event {
 	TransitionsOff = 'polls:transitions:off',
@@ -116,26 +71,6 @@ export type Chunking = {
 	loaded: number
 }
 
-export type ApiEmailAdressList = {
-	displayName: string
-	emailAddress: string
-	combined: string
-}
-
-export type AppPermissions = {
-	addShares: boolean
-	addSharesExternal: boolean
-	allAccess: boolean
-	changeForeignVotes: boolean
-	comboView: boolean
-	deanonymizePoll: boolean
-	pollCreation: boolean
-	pollDownload: boolean
-	publicShares: boolean
-	seeMailAddresses: boolean
-	unrestrictedOwner: boolean
-}
-
 export type User = {
 	id: string
 	displayName: string
diff --git a/src/adminSettings.ts b/src/adminSettings.ts
index 05dc7228cd..eab7b30d78 100644
--- a/src/adminSettings.ts
+++ b/src/adminSettings.ts
@@ -4,7 +4,7 @@
  */
 
 import { createApp } from 'vue'
-import { pinia } from './stores/index.ts'
+import { pinia } from './stores'
 
 import AdminSettingsPage from './views/AdminSettingsPage.vue'
 
diff --git a/src/components/Actions/modules/ActionAddPoll.vue b/src/components/Actions/modules/ActionAddPoll.vue
index 85f42a3348..aef944dea6 100644
--- a/src/components/Actions/modules/ActionAddPoll.vue
+++ b/src/components/Actions/modules/ActionAddPoll.vue
@@ -16,8 +16,9 @@ import { ButtonMode } from '../../../Types'
 import PollCreateDlg from '../../Create/PollCreateDlg.vue'
 
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
-import { NcDialog } from '@nextcloud/vue'
-import { ButtonVariant } from '@nextcloud/vue/components/NcButton'
+import NcDialog from '@nextcloud/vue/components/NcDialog'
+
+import type { ButtonVariant } from '@nextcloud/vue/components/NcButton'
 
 interface Props {
 	caption?: string
diff --git a/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue b/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
index ec999bd8f0..ef70be551c 100644
--- a/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
+++ b/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
@@ -8,7 +8,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcButton from '@nextcloud/vue/components/NcButton'
 
-import { useVotesStore } from '../../../stores/votes.ts'
+import { useVotesStore } from '../../../stores/votes'
 
 const votesStore = useVotesStore()
 const caption = t('polls', 'Delete orphaned')
diff --git a/src/components/Actions/modules/ActionSendConfirmed.vue b/src/components/Actions/modules/ActionSendConfirmed.vue
index d856334fe4..94a9986a06 100644
--- a/src/components/Actions/modules/ActionSendConfirmed.vue
+++ b/src/components/Actions/modules/ActionSendConfirmed.vue
@@ -13,9 +13,9 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 
 import EmailCheckIcon from 'vue-material-design-icons/EmailCheck.vue' // view-comfy-outline
 
-import { PollsAPI } from '../../../Api/index.ts'
-import { Logger } from '../../../helpers/index.ts'
-import { Confirmations } from '../../../Api/modules/polls.ts'
+import { PollsAPI } from '../../../Api'
+import { Logger } from '../../../helpers'
+import { Confirmations } from '../../../Api/modules/polls'
 
 const route = useRoute()
 const showModal = ref(false)
diff --git a/src/components/Actions/modules/ActionSwitchSafeTable.vue b/src/components/Actions/modules/ActionSwitchSafeTable.vue
index f55afb6167..7dc7524090 100644
--- a/src/components/Actions/modules/ActionSwitchSafeTable.vue
+++ b/src/components/Actions/modules/ActionSwitchSafeTable.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../../stores/poll.ts'
+import { usePollStore } from '../../../stores/poll'
 
 import NcButton from '@nextcloud/vue/components/NcButton'
 
diff --git a/src/components/Activity/Activities.vue b/src/components/Activity/Activities.vue
index 905840d618..a9be5b553f 100644
--- a/src/components/Activity/Activities.vue
+++ b/src/components/Activity/Activities.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import ActivityItem from './ActivityItem.vue'
-import { useActivityStore } from '../../stores/activity.ts'
+import { useActivityStore } from '../../stores/activity'
 
 const activityStore = useActivityStore()
 </script>
diff --git a/src/components/Activity/ActivityItem.vue b/src/components/Activity/ActivityItem.vue
index dd2561cfe4..b076bb44ef 100644
--- a/src/components/Activity/ActivityItem.vue
+++ b/src/components/Activity/ActivityItem.vue
@@ -10,7 +10,7 @@ import moment from '@nextcloud/moment'
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
 import NcRichText from '@nextcloud/vue/components/NcRichText'
 
-import { GuestBubble, SimpleLink } from '../../helpers/index.ts'
+import { GuestBubble, SimpleLink } from '../../helpers'
 
 const props = defineProps({
 	activity: {
diff --git a/src/components/AppIcons/modules/MaybeIcon.vue b/src/components/AppIcons/MaybeIcon.vue
similarity index 100%
rename from src/components/AppIcons/modules/MaybeIcon.vue
rename to src/components/AppIcons/MaybeIcon.vue
diff --git a/src/components/AppIcons/modules/PollsAppIcon.vue b/src/components/AppIcons/PollsAppIcon.vue
similarity index 100%
rename from src/components/AppIcons/modules/PollsAppIcon.vue
rename to src/components/AppIcons/PollsAppIcon.vue
diff --git a/src/components/AppIcons/modules/Spinner.vue b/src/components/AppIcons/Spinner.vue
similarity index 100%
rename from src/components/AppIcons/modules/Spinner.vue
rename to src/components/AppIcons/Spinner.vue
diff --git a/src/components/AppIcons/index.ts b/src/components/AppIcons/index.ts
deleted file mode 100644
index b5c47a7cc8..0000000000
--- a/src/components/AppIcons/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2023 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { default as MaybeIcon } from './modules/MaybeIcon.vue'
-export { default as PollsAppIcon } from './modules/PollsAppIcon.vue'
-export { default as Spinner } from './modules/Spinner.vue'
diff --git a/src/components/AppIcons/modules/types.ts b/src/components/AppIcons/types.ts
similarity index 100%
rename from src/components/AppIcons/modules/types.ts
rename to src/components/AppIcons/types.ts
diff --git a/src/components/Base/modules/ButtonModal.vue b/src/components/Base/modules/ButtonModal.vue
index 2d57c7b185..80c43fb73c 100644
--- a/src/components/Base/modules/ButtonModal.vue
+++ b/src/components/Base/modules/ButtonModal.vue
@@ -9,8 +9,10 @@ import { t } from '@nextcloud/l10n'
 import NcButton, { ButtonVariant } from '@nextcloud/vue/components/NcButton'
 import NcModal from '@nextcloud/vue/components/NcModal'
 
-import { NcActionButton, NcAppNavigationNew } from '@nextcloud/vue'
-import { ButtonMode } from '../../../Types'
+import NcActionButton from '@nextcloud/vue/components/NcActionButton'
+import NcAppNavigationNew from '@nextcloud/vue/components/NcAppNavigationNew'
+
+import type { ButtonMode } from '../../../Types'
 
 interface Props {
 	buttonVariant?: ButtonVariant
diff --git a/src/components/Base/modules/InputDiv.vue b/src/components/Base/modules/InputDiv.vue
index ae1154a9fa..06ed17667b 100644
--- a/src/components/Base/modules/InputDiv.vue
+++ b/src/components/Base/modules/InputDiv.vue
@@ -12,11 +12,11 @@ import CheckIcon from 'vue-material-design-icons/Check.vue'
 import AlertIcon from 'vue-material-design-icons/AlertCircleOutline.vue'
 import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
 import ChevronRightIcon from 'vue-material-design-icons/ChevronRight.vue'
-import { Spinner } from '../../AppIcons/index.ts'
-import { Logger } from '../../../helpers/index.ts'
+import Spinner from '../../AppIcons/Spinner.vue'
+import { Logger } from '../../../helpers'
 
-import { SignalingType } from '../../../Types/index.ts'
-import { NcButton } from '@nextcloud/vue'
+import { SignalingType } from '../../../Types'
+import NcButton from '@nextcloud/vue/components/NcButton'
 
 import { t } from '@nextcloud/l10n'
 
diff --git a/src/components/Base/modules/LoadingOverlay.vue b/src/components/Base/modules/LoadingOverlay.vue
index 4389dafabd..17a263ddc4 100644
--- a/src/components/Base/modules/LoadingOverlay.vue
+++ b/src/components/Base/modules/LoadingOverlay.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import { t } from '@nextcloud/l10n'
-import { Spinner } from '../../AppIcons/index.ts'
+import Spinner from '../../AppIcons/Spinner.vue'
 import { onMounted, ref, watch } from 'vue'
 
 const description = ref(t('polls', 'Please wait…'))
diff --git a/src/components/Base/modules/QrModal.vue b/src/components/Base/modules/QrModal.vue
index 98aee5da17..95cf1caabe 100644
--- a/src/components/Base/modules/QrModal.vue
+++ b/src/components/Base/modules/QrModal.vue
@@ -5,9 +5,10 @@
 
 <script setup lang="ts">
 import QRCode from 'qrcode'
-import { Logger } from '../../../helpers/index.ts'
+import { Logger } from '../../../helpers'
 import { onMounted, ref } from 'vue'
-import { AxiosError } from '@nextcloud/axios'
+
+import type { AxiosError } from '@nextcloud/axios'
 
 interface Props {
 	name?: string
diff --git a/src/components/Calendar/CalendarInfo.vue b/src/components/Calendar/CalendarInfo.vue
index 8069103d20..45221117f4 100644
--- a/src/components/Calendar/CalendarInfo.vue
+++ b/src/components/Calendar/CalendarInfo.vue
@@ -6,9 +6,10 @@
 <script setup lang="ts">
 import moment from '@nextcloud/moment'
 import { computed } from 'vue'
-import { Option } from '../../Types/index.ts'
 import { CalendarEvent } from '../../components/Calendar/CalendarPeek.vue'
 
+import type { Option } from '../../stores/options.types'
+
 interface Props {
 	calendarEvent: CalendarEvent
 	option: Option
diff --git a/src/components/Calendar/CalendarPeek.vue b/src/components/Calendar/CalendarPeek.vue
index 3291c80539..f82489bd97 100644
--- a/src/components/Calendar/CalendarPeek.vue
+++ b/src/components/Calendar/CalendarPeek.vue
@@ -10,16 +10,18 @@ import orderBy from 'lodash/orderBy'
 import moment from '@nextcloud/moment'
 
 import NcPopover from '@nextcloud/vue/components/NcPopover'
+import NcButton from '@nextcloud/vue/components/NcButton'
 
-import { usePollStore } from '../../stores/poll.ts'
+import CalendarIcon from 'vue-material-design-icons/Calendar.vue'
 
 import CalendarInfo from './CalendarInfo.vue'
-import { CalendarAPI } from '../../Api/index.ts'
-import { Logger } from '../../helpers/index.ts'
-import { Option } from '../../Types/index.ts'
-import { AxiosError } from '@nextcloud/axios'
-import CalendarIcon from 'vue-material-design-icons/Calendar.vue'
-import { NcButton } from '@nextcloud/vue'
+import { CalendarAPI } from '../../Api'
+import { Logger } from '../../helpers'
+
+import { usePollStore } from '../../stores/poll'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { Option } from '../../stores/options.types'
 
 export type CalendarEvent = {
 	id: number
diff --git a/src/components/Cards/modules/CardAddProposals.vue b/src/components/Cards/CardAddProposals.vue
similarity index 79%
rename from src/components/Cards/modules/CardAddProposals.vue
rename to src/components/Cards/CardAddProposals.vue
index 648fed9dd9..80b1494e96 100644
--- a/src/components/Cards/modules/CardAddProposals.vue
+++ b/src/components/Cards/CardAddProposals.vue
@@ -4,11 +4,11 @@
 -->
 
 <script setup lang="ts">
-import CardDiv from '../../Base/modules/CardDiv.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../../stores/poll.ts'
-import ActionAddOption from '../../Actions/modules/ActionAddOption.vue'
-import OptionsTextAdd from '../../Options/OptionsTextAdd.vue'
+import { usePollStore } from '../../stores/poll'
+import ActionAddOption from '../Actions/modules/ActionAddOption.vue'
+import OptionsTextAdd from '../Options/OptionsTextAdd.vue'
 
 const pollStore = usePollStore()
 const cardType = 'info'
diff --git a/src/components/Cards/modules/CardAnonymousPollHint.vue b/src/components/Cards/CardAnonymousPollHint.vue
similarity index 89%
rename from src/components/Cards/modules/CardAnonymousPollHint.vue
rename to src/components/Cards/CardAnonymousPollHint.vue
index d69d2352a1..f5a0b65e79 100644
--- a/src/components/Cards/modules/CardAnonymousPollHint.vue
+++ b/src/components/Cards/CardAnonymousPollHint.vue
@@ -4,9 +4,9 @@
 -->
 
 <script setup lang="ts">
-import CardDiv from '../../Base/modules/CardDiv.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const cardType = 'warning'
 const pollStore = usePollStore()
diff --git a/src/components/Cards/modules/CardClosedPoll.vue b/src/components/Cards/CardClosedPoll.vue
similarity index 80%
rename from src/components/Cards/modules/CardClosedPoll.vue
rename to src/components/Cards/CardClosedPoll.vue
index 25a30f8c3c..da926e0e35 100644
--- a/src/components/Cards/modules/CardClosedPoll.vue
+++ b/src/components/Cards/CardClosedPoll.vue
@@ -4,9 +4,9 @@
 -->
 
 <script setup lang="ts">
-import CardDiv from '../../Base/modules/CardDiv.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const pollStore = usePollStore()
 const cardType = 'warning'
diff --git a/src/components/Cards/modules/CardLimitedVotes.vue b/src/components/Cards/CardLimitedVotes.vue
similarity index 89%
rename from src/components/Cards/modules/CardLimitedVotes.vue
rename to src/components/Cards/CardLimitedVotes.vue
index f82a2905ce..aecf1f85fe 100644
--- a/src/components/Cards/modules/CardLimitedVotes.vue
+++ b/src/components/Cards/CardLimitedVotes.vue
@@ -5,11 +5,11 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import CardDiv from '../../Base/modules/CardDiv.vue'
-import ActionDeleteOrphanedVotes from '../../Actions/modules/ActionDeleteOrphanedVotes.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
+import ActionDeleteOrphanedVotes from '../Actions/modules/ActionDeleteOrphanedVotes.vue'
 import { t, n } from '@nextcloud/l10n'
-import { usePollStore } from '../../../stores/poll.ts'
-import { useOptionsStore } from '../../../stores/options.ts'
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
 
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
diff --git a/src/components/Cards/modules/CardLocked.vue b/src/components/Cards/CardLocked.vue
similarity index 84%
rename from src/components/Cards/modules/CardLocked.vue
rename to src/components/Cards/CardLocked.vue
index 841dd29cb4..964f8a511f 100644
--- a/src/components/Cards/modules/CardLocked.vue
+++ b/src/components/Cards/CardLocked.vue
@@ -5,9 +5,9 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import CardDiv from '../../Base/modules/CardDiv.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { useSessionStore } from '../../../stores/session.ts'
+import { useSessionStore } from '../../stores/session'
 
 const sessionStore = useSessionStore()
 const cardType = 'warning'
diff --git a/src/components/Cards/modules/CardRegister.vue b/src/components/Cards/CardRegister.vue
similarity index 82%
rename from src/components/Cards/modules/CardRegister.vue
rename to src/components/Cards/CardRegister.vue
index c854656136..4a4fd351c0 100644
--- a/src/components/Cards/modules/CardRegister.vue
+++ b/src/components/Cards/CardRegister.vue
@@ -5,10 +5,10 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import CardDiv from '../../Base/modules/CardDiv.vue'
-import ActionRegister from '../../Actions/modules/ActionRegister.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
+import ActionRegister from '../Actions/modules/ActionRegister.vue'
 import { t } from '@nextcloud/l10n'
-import { useSessionStore } from '../../../stores/session.ts'
+import { useSessionStore } from '../../stores/session'
 
 const sessionStore = useSessionStore()
 const cardType = 'info'
diff --git a/src/components/Cards/modules/CardSendConfirmations.vue b/src/components/Cards/CardSendConfirmations.vue
similarity index 89%
rename from src/components/Cards/modules/CardSendConfirmations.vue
rename to src/components/Cards/CardSendConfirmations.vue
index 2df5bb8480..d87d47f165 100644
--- a/src/components/Cards/modules/CardSendConfirmations.vue
+++ b/src/components/Cards/CardSendConfirmations.vue
@@ -5,8 +5,8 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import CardDiv from '../../Base/modules/CardDiv.vue'
-import ActionSendConfirmed from '../../Actions/modules/ActionSendConfirmed.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
+import ActionSendConfirmed from '../Actions/modules/ActionSendConfirmed.vue'
 import { t } from '@nextcloud/l10n'
 
 const emit = defineEmits(['sendConfirmationSuccess', 'sendConfirmationError'])
diff --git a/src/components/Cards/modules/CardUnpublishedPoll.vue b/src/components/Cards/CardUnpublishedPoll.vue
similarity index 75%
rename from src/components/Cards/modules/CardUnpublishedPoll.vue
rename to src/components/Cards/CardUnpublishedPoll.vue
index b1792aae86..2f7a94ed1a 100644
--- a/src/components/Cards/modules/CardUnpublishedPoll.vue
+++ b/src/components/Cards/CardUnpublishedPoll.vue
@@ -4,10 +4,10 @@
 -->
 
 <script setup lang="ts">
-import CardDiv from '../../Base/modules/CardDiv.vue'
-import ActionOpenSharesSidebar from '../../Actions/modules/ActionOpenSharesSidebar.vue'
+import CardDiv from '../Base/modules/CardDiv.vue'
+import ActionOpenSharesSidebar from '../Actions/modules/ActionOpenSharesSidebar.vue'
 import { t } from '@nextcloud/l10n'
-import { useVotesStore } from '../../../stores/votes.ts'
+import { useVotesStore } from '../../stores/votes'
 
 const votesStore = useVotesStore()
 const cardType = 'warning'
diff --git a/src/components/Cards/VoteInfoCards.vue b/src/components/Cards/VoteInfoCards.vue
index c2711bd194..2a5e2b8909 100644
--- a/src/components/Cards/VoteInfoCards.vue
+++ b/src/components/Cards/VoteInfoCards.vue
@@ -5,19 +5,18 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import {
-	CardAddProposals,
-	CardClosedPoll,
-	CardLimitedVotes,
-	CardLocked,
-	CardRegister,
-	CardSendConfirmations,
-	CardUnpublishedPoll,
-} from './index.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { useOptionsStore } from '../../stores/options.ts'
-import { useSharesStore } from '../../stores/shares.ts'
-import { useSessionStore } from '../../stores/session.ts'
+import CardAddProposals from './CardAddProposals.vue'
+import CardClosedPoll from './CardClosedPoll.vue'
+import CardLimitedVotes from './CardLimitedVotes.vue'
+import CardLocked from './CardLocked.vue'
+import CardRegister from './CardRegister.vue'
+import CardSendConfirmations from './CardSendConfirmations.vue'
+import CardUnpublishedPoll from './CardUnpublishedPoll.vue'
+
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
+import { useSharesStore } from '../../stores/shares'
+import { useSessionStore } from '../../stores/session'
 
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
diff --git a/src/components/Cards/index.ts b/src/components/Cards/index.ts
deleted file mode 100644
index 27592fd4c7..0000000000
--- a/src/components/Cards/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2023 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { default as CardAddProposals } from './modules/CardAddProposals.vue'
-export { default as CardAnonymousPollHint } from './modules/CardAnonymousPollHint.vue'
-export { default as CardClosedPoll } from './modules/CardClosedPoll.vue'
-export { default as CardLimitedVotes } from './modules/CardLimitedVotes.vue'
-export { default as CardLocked } from './modules/CardLocked.vue'
-export { default as CardRegister } from './modules/CardRegister.vue'
-export { default as CardSendConfirmations } from './modules/CardSendConfirmations.vue'
-export { default as CardUnpublishedPoll } from './modules/CardUnpublishedPoll.vue'
diff --git a/src/components/Combo/ComboTable.vue b/src/components/Combo/ComboTable.vue
index 648bfd6397..3d093f8eaf 100644
--- a/src/components/Combo/ComboTable.vue
+++ b/src/components/Combo/ComboTable.vue
@@ -6,8 +6,9 @@
 <script setup lang="ts">
 import VoteColumn from './VoteColumn.vue'
 import UserItem from '../User/UserItem.vue'
-import { useComboStore } from '../../stores/combo.ts'
-import { ViewMode } from '../../Types/index.ts'
+import { useComboStore } from '../../stores/combo'
+
+import type { ViewMode } from '../../stores/preferences.types'
 
 const { viewMode = 'table-view' } = defineProps<{ viewMode?: ViewMode }>()
 
diff --git a/src/components/Combo/VoteColumn.vue b/src/components/Combo/VoteColumn.vue
index 7320cd950c..eac6f46fc9 100644
--- a/src/components/Combo/VoteColumn.vue
+++ b/src/components/Combo/VoteColumn.vue
@@ -24,8 +24,9 @@
 <script setup lang="ts">
 import VoteItem from './VoteItem.vue'
 import OptionItem from '../Options/OptionItem.vue'
-import { useComboStore } from '../../stores/combo.ts'
-import { Option } from '../../Types/index.ts'
+import { useComboStore } from '../../stores/combo'
+
+import type { Option } from '../../stores/options.types'
 
 const { option } = defineProps<{ option: Option }>()
 
diff --git a/src/components/Combo/VoteItem.vue b/src/components/Combo/VoteItem.vue
index 1925717e31..e3dff4e28a 100644
--- a/src/components/Combo/VoteItem.vue
+++ b/src/components/Combo/VoteItem.vue
@@ -5,9 +5,13 @@
 
 <script setup lang="ts">
 import VoteIndicator from '../VoteTable/VoteIndicator.vue'
-import { useComboStore } from '../../stores/combo.ts'
+import { useComboStore } from '../../stores/combo'
 import { computed } from 'vue'
-import { Option, Poll, Answer, User } from '../../Types/index.ts'
+
+import type { Answer } from '../../stores/votes.types'
+import type { Option } from '../../stores/options.types'
+import type { Poll } from '../../stores/poll.types'
+import type { User } from '../../Types'
 
 interface Props {
 	option: Option
diff --git a/src/components/Comments/CommentAdd.vue b/src/components/Comments/CommentAdd.vue
index 5bc928995a..b6e8f8e839 100644
--- a/src/components/Comments/CommentAdd.vue
+++ b/src/components/Comments/CommentAdd.vue
@@ -5,14 +5,17 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import { t } from '@nextcloud/l10n'
 import { showError } from '@nextcloud/dialogs'
+
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
+
 import InputDiv from '../Base/modules/InputDiv.vue'
-import { t } from '@nextcloud/l10n'
 import UserItem from '../User/UserItem.vue'
-import { useSessionStore } from '../../stores/session.ts'
-import { useCommentsStore } from '../../stores/comments.ts'
-import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
-import { usePollStore } from '../../stores/poll.ts'
+
+import { useSessionStore } from '../../stores/session'
+import { useCommentsStore } from '../../stores/comments'
+import { usePollStore } from '../../stores/poll'
 
 const commentsStore = useCommentsStore()
 const sessionStore = useSessionStore()
diff --git a/src/components/Comments/CommentItem.vue b/src/components/Comments/CommentItem.vue
index 93df84d274..db706a7a58 100644
--- a/src/components/Comments/CommentItem.vue
+++ b/src/components/Comments/CommentItem.vue
@@ -5,19 +5,23 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import moment from '@nextcloud/moment'
+
 import linkifyStr from 'linkify-string'
+import { t } from '@nextcloud/l10n'
+import moment from '@nextcloud/moment'
 import { showError } from '@nextcloud/dialogs'
+
 import ActionDelete from '../Actions/modules/ActionDelete.vue'
-import { t } from '@nextcloud/l10n'
 import UserItem from '../User/UserItem.vue'
-import { useSessionStore } from '../../stores/session.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { useCommentsStore } from '../../stores/comments.ts'
-import { Comment, CommentsGrouped } from '../../Types/index.ts'
-import { usePreferencesStore } from '../../stores/preferences.ts'
 import UserBubble from '../User/UserBubble.vue'
 
+import { useSessionStore } from '../../stores/session'
+import { usePollStore } from '../../stores/poll'
+import { useCommentsStore } from '../../stores/comments'
+import { usePreferencesStore } from '../../stores/preferences'
+
+import type { Comment, CommentsGrouped } from '../../stores/comments.types'
+
 const sessionStore = useSessionStore()
 const pollStore = usePollStore()
 const commentsStore = useCommentsStore()
diff --git a/src/components/Comments/Comments.vue b/src/components/Comments/Comments.vue
index 21f41dabef..512e2e2024 100644
--- a/src/components/Comments/Comments.vue
+++ b/src/components/Comments/Comments.vue
@@ -4,10 +4,12 @@
 -->
 
 <script setup lang="ts">
-import CommentItem from './CommentItem.vue'
 import { t } from '@nextcloud/l10n'
-import { usePreferencesStore } from '../../stores/preferences.ts'
-import { useCommentsStore } from '../../stores/comments.ts'
+
+import CommentItem from './CommentItem.vue'
+
+import { usePreferencesStore } from '../../stores/preferences'
+import { useCommentsStore } from '../../stores/comments'
 
 const commentsStore = useCommentsStore()
 const preferencesStore = usePreferencesStore()
diff --git a/src/components/Configuration/ConfigAllowComment.vue b/src/components/Configuration/ConfigAllowComment.vue
index f6eb2cad02..b7a2e64414 100644
--- a/src/components/Configuration/ConfigAllowComment.vue
+++ b/src/components/Configuration/ConfigAllowComment.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
diff --git a/src/components/Configuration/ConfigAllowMayBe.vue b/src/components/Configuration/ConfigAllowMayBe.vue
index 8d69636078..04150152b6 100644
--- a/src/components/Configuration/ConfigAllowMayBe.vue
+++ b/src/components/Configuration/ConfigAllowMayBe.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
diff --git a/src/components/Configuration/ConfigAnonymous.vue b/src/components/Configuration/ConfigAnonymous.vue
index 31cb3168b0..fc2936e93d 100644
--- a/src/components/Configuration/ConfigAnonymous.vue
+++ b/src/components/Configuration/ConfigAnonymous.vue
@@ -6,10 +6,10 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
-import { NcDialog } from '@nextcloud/vue'
+import NcDialog from '@nextcloud/vue/components/NcDialog'
 import NcButton, { ButtonVariant } from '@nextcloud/vue/components/NcButton'
 
 const emit = defineEmits(['change'])
diff --git a/src/components/Configuration/ConfigAutoReminder.vue b/src/components/Configuration/ConfigAutoReminder.vue
index 5403ed457a..2a1f0e5a98 100644
--- a/src/components/Configuration/ConfigAutoReminder.vue
+++ b/src/components/Configuration/ConfigAutoReminder.vue
@@ -14,7 +14,7 @@ import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import InformationIcon from 'vue-material-design-icons/InformationVariant.vue'
 import AutoReminderInformation from './AutoReminderInformation.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/Configuration/ConfigClosing.vue b/src/components/Configuration/ConfigClosing.vue
index 44bba0e22a..1d4c6dd84b 100644
--- a/src/components/Configuration/ConfigClosing.vue
+++ b/src/components/Configuration/ConfigClosing.vue
@@ -15,7 +15,7 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
 import OpenPollIcon from 'vue-material-design-icons/LockOpenVariant.vue'
 import ClosePollIcon from 'vue-material-design-icons/Lock.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const pollStore = usePollStore()
 
diff --git a/src/components/Configuration/ConfigDangerArea.vue b/src/components/Configuration/ConfigDangerArea.vue
index c2ae5dbe42..5b18c430f3 100644
--- a/src/components/Configuration/ConfigDangerArea.vue
+++ b/src/components/Configuration/ConfigDangerArea.vue
@@ -5,12 +5,12 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { router } from '../../router.ts'
+import { router } from '../../router'
 import { t } from '@nextcloud/l10n'
 import { showError } from '@nextcloud/dialogs'
 import NcButton from '@nextcloud/vue/components/NcButton'
 
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 import DeletePollDialog from '../Modals/DeletePollDialog.vue'
 import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
diff --git a/src/components/Configuration/ConfigDescription.vue b/src/components/Configuration/ConfigDescription.vue
index cb0ec7c7eb..4a04634788 100644
--- a/src/components/Configuration/ConfigDescription.vue
+++ b/src/components/Configuration/ConfigDescription.vue
@@ -4,10 +4,12 @@
 -->
 
 <script setup lang="ts">
-import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
-import { usePollStore } from '../../stores/poll.ts'
 import { t } from '@nextcloud/l10n'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
+import { usePollStore } from '../../stores/poll'
+
 const pollStore = usePollStore()
+
 const emit = defineEmits(['change'])
 </script>
 
diff --git a/src/components/Configuration/ConfigForceConfidentialComments.vue b/src/components/Configuration/ConfigForceConfidentialComments.vue
index 6e08901326..f9bc5f4383 100644
--- a/src/components/Configuration/ConfigForceConfidentialComments.vue
+++ b/src/components/Configuration/ConfigForceConfidentialComments.vue
@@ -5,10 +5,10 @@
 
 <script setup lang="ts">
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
-import { useSessionStore } from '../../stores/session.ts'
+import { useSessionStore } from '../../stores/session'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/Configuration/ConfigOptionLimit.vue b/src/components/Configuration/ConfigOptionLimit.vue
index e2f4c5cd91..9118d2ea38 100644
--- a/src/components/Configuration/ConfigOptionLimit.vue
+++ b/src/components/Configuration/ConfigOptionLimit.vue
@@ -11,7 +11,7 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
 
 import InputDiv from '../Base/modules/InputDiv.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/Configuration/ConfigProposals.vue b/src/components/Configuration/ConfigProposals.vue
index e839a44984..005778ca4d 100644
--- a/src/components/Configuration/ConfigProposals.vue
+++ b/src/components/Configuration/ConfigProposals.vue
@@ -11,7 +11,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import DateTimePicker from '../../components/Base/modules/DateTimePicker.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const pollStore = usePollStore()
 
diff --git a/src/components/Configuration/ConfigShowResults.vue b/src/components/Configuration/ConfigShowResults.vue
index 90595109ec..87b81e81e2 100644
--- a/src/components/Configuration/ConfigShowResults.vue
+++ b/src/components/Configuration/ConfigShowResults.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import RadioGroupDiv from '../Base/modules/RadioGroupDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/Configuration/ConfigTitle.vue b/src/components/Configuration/ConfigTitle.vue
index 4f87dd01e4..c42cd1bdb3 100644
--- a/src/components/Configuration/ConfigTitle.vue
+++ b/src/components/Configuration/ConfigTitle.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import InputDiv from '../Base/modules/InputDiv.vue'
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/Configuration/ConfigUseNo.vue b/src/components/Configuration/ConfigUseNo.vue
index d3697ee5b3..9780aa9a8e 100644
--- a/src/components/Configuration/ConfigUseNo.vue
+++ b/src/components/Configuration/ConfigUseNo.vue
@@ -8,7 +8,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/Configuration/ConfigVoteLimit.vue b/src/components/Configuration/ConfigVoteLimit.vue
index 5e1276fc40..5ed176779b 100644
--- a/src/components/Configuration/ConfigVoteLimit.vue
+++ b/src/components/Configuration/ConfigVoteLimit.vue
@@ -11,8 +11,8 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
 
 import InputDiv from '../Base/modules/InputDiv.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
-import { useOptionsStore } from '../../stores/options.ts'
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/Create/CreateDlg.vue b/src/components/Create/CreateDlg.vue
index a76d14c068..c9e5cea2cc 100644
--- a/src/components/Create/CreateDlg.vue
+++ b/src/components/Create/CreateDlg.vue
@@ -18,7 +18,9 @@ import InputDiv from '../Base/modules/InputDiv.vue'
 import RadioGroupDiv from '../Base/modules/RadioGroupDiv.vue'
 import ConfigBox from '../Base/modules/ConfigBox.vue'
 
-import { usePollStore, pollTypes, PollType } from '../../stores/poll.ts'
+import { usePollStore, pollTypes } from '../../stores/poll'
+
+import { PollType } from '../../stores/poll.types'
 
 const pollStore = usePollStore()
 const router = useRouter()
diff --git a/src/components/Create/PollCreateDlg.vue b/src/components/Create/PollCreateDlg.vue
index 1ba1ea6541..d4e875f1d2 100644
--- a/src/components/Create/PollCreateDlg.vue
+++ b/src/components/Create/PollCreateDlg.vue
@@ -16,9 +16,11 @@ import InputDiv from '../Base/modules/InputDiv.vue'
 import RadioGroupDiv from '../Base/modules/RadioGroupDiv.vue'
 import ConfigBox from '../Base/modules/ConfigBox.vue'
 
-import { PollType, pollTypes, usePollStore } from '../../stores/poll.ts'
+import { pollTypes, usePollStore } from '../../stores/poll'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 
+import type { PollType } from '../../stores/poll.types'
+
 const pollStore = usePollStore()
 
 const emit = defineEmits<{
diff --git a/src/components/Export/ExportPoll.vue b/src/components/Export/ExportPoll.vue
index e10d42d926..2bd7081931 100644
--- a/src/components/Export/ExportPoll.vue
+++ b/src/components/Export/ExportPoll.vue
@@ -7,6 +7,8 @@
 import { ref, computed } from 'vue'
 import { useRoute } from 'vue-router'
 
+import { DateTime, Interval } from 'luxon'
+
 // eslint-disable-next-line import/named
 import { Sheet, WorkBook, utils as xlsxUtils, write as xlsxWrite } from 'xlsx'
 import DOMPurify from 'dompurify'
@@ -23,12 +25,14 @@ import CsvIcon from 'vue-material-design-icons/FileDelimited.vue'
 import XmlIcon from 'vue-material-design-icons/Xml.vue'
 import ExportIcon from 'vue-material-design-icons/FileDownloadOutline.vue'
 
-import { ApiEmailAdressList, PollsAPI } from '../../Api/index.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { Answer, useVotesStore } from '../../stores/votes.ts'
-import { Option, useOptionsStore } from '../../stores/options.ts'
-import { AxiosError } from '@nextcloud/axios'
-import { DateTime, Interval } from 'luxon'
+import { ApiEmailAdressList, PollsAPI } from '../../Api'
+import { usePollStore } from '../../stores/poll'
+import { useVotesStore } from '../../stores/votes'
+import { useOptionsStore } from '../../stores/options'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { Option } from '../../stores/options.types'
+import type { Answer } from '../../stores/votes.types'
 
 type ArrayStyle = 'symbols' | 'raw' | 'generic'
 type ExportFormat = 'html' | 'xlsx' | 'ods' | 'csv'
diff --git a/src/components/Modals/DeletePollDialog.vue b/src/components/Modals/DeletePollDialog.vue
index 9d5dd48173..0126b3ee91 100644
--- a/src/components/Modals/DeletePollDialog.vue
+++ b/src/components/Modals/DeletePollDialog.vue
@@ -6,14 +6,15 @@
 <script setup lang="ts">
 import { t } from '@nextcloud/l10n'
 
-import { useSessionStore } from '../../stores/session.ts'
-import { Poll } from '../../stores/poll.ts'
+import { useSessionStore } from '../../stores/session'
 import { computed } from 'vue'
 
-import { NcDialog } from '@nextcloud/vue'
+import NcDialog from '@nextcloud/vue/components/NcDialog'
 import { showError } from '@nextcloud/dialogs'
 import { ButtonVariant } from '@nextcloud/vue/components/NcButton'
-import { usePollsStore } from '../../stores/polls.ts'
+import { usePollsStore } from '../../stores/polls'
+
+import type { Poll } from '../../stores/poll.types'
 
 const model = defineModel<boolean>({ required: true })
 const { poll } = defineProps<{ poll: Poll }>()
diff --git a/src/components/Modals/TransferPollDialog.vue b/src/components/Modals/TransferPollDialog.vue
index 0ffb12eb64..b4db0ad919 100644
--- a/src/components/Modals/TransferPollDialog.vue
+++ b/src/components/Modals/TransferPollDialog.vue
@@ -4,17 +4,20 @@
 -->
 
 <script setup lang="ts">
+import { computed, ref } from 'vue'
 import { t } from '@nextcloud/l10n'
+import { showSuccess, showError } from '@nextcloud/dialogs'
 
-import { Poll, usePollStore } from '../../stores/poll.ts'
-import { computed, ref } from 'vue'
+import NcDialog from '@nextcloud/vue/components/NcDialog'
 
-import { NcDialog } from '@nextcloud/vue'
 import UserSearch from '../User/UserSearch.vue'
-import { User } from '../../Types/index.ts'
-import { showSuccess, showError } from '@nextcloud/dialogs'
-import { usePollsStore } from '../../stores/polls.ts'
-import { ButtonVariant } from '@nextcloud/vue/components/NcButton'
+
+import { usePollsStore } from '../../stores/polls'
+import { usePollStore } from '../../stores/poll'
+
+import type { ButtonVariant } from '@nextcloud/vue/components/NcButton'
+import type { User } from '../../Types'
+import type { Poll } from '../../stores/poll.types'
 
 const emit = defineEmits(['accessDenied'])
 const { poll } = defineProps<{ poll: Poll }>()
diff --git a/src/components/Navigation/PollNavigationItems.vue b/src/components/Navigation/PollNavigationItems.vue
index 0950805779..032c6c50d9 100644
--- a/src/components/Navigation/PollNavigationItems.vue
+++ b/src/components/Navigation/PollNavigationItems.vue
@@ -16,8 +16,9 @@ import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
 import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
 
-import { useSessionStore } from '../../stores/session.ts'
-import { Poll } from '../../Types/index.ts'
+import { useSessionStore } from '../../stores/session'
+
+import type { Poll } from '../../stores/poll.types'
 
 const emit = defineEmits(['clonePoll', 'toggleArchive', 'deletePoll'])
 const { poll } = defineProps<{ poll: Poll }>()
diff --git a/src/components/Options/Counter.vue b/src/components/Options/Counter.vue
index 2c21285ece..5599de2b15 100644
--- a/src/components/Options/Counter.vue
+++ b/src/components/Options/Counter.vue
@@ -7,8 +7,10 @@
 import YesCounterIcon from 'vue-material-design-icons/AccountCheck.vue'
 import MaybeCounterIcon from 'vue-material-design-icons/AccountCheckOutline.vue'
 import CheckboxMarkedOutlinedIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
-import { Option } from '../../Types/index.ts'
-import { usePollStore } from '../../stores/poll.ts'
+
+import { usePollStore } from '../../stores/poll'
+
+import type { Option } from '../../stores/options.types'
 
 const pollStore = usePollStore()
 interface Props {
diff --git a/src/components/Options/OptionCloneDate.vue b/src/components/Options/OptionCloneDate.vue
index 9851be8752..c8af36885d 100644
--- a/src/components/Options/OptionCloneDate.vue
+++ b/src/components/Options/OptionCloneDate.vue
@@ -12,8 +12,11 @@ import NcSelect from '@nextcloud/vue/components/NcSelect'
 import NcButton from '@nextcloud/vue/components/NcButton'
 
 import InputDiv from '../Base/modules/InputDiv.vue'
-import { useOptionsStore, Option, Sequence } from '../../stores/options.ts'
-import { dateTimeUnitsKeyed } from '../../constants/dateUnits.ts'
+
+import { useOptionsStore } from '../../stores/options'
+
+import { dateTimeUnitsKeyed } from '../../constants/dateUnits'
+import type { Option, Sequence } from '../../stores/options.types'
 
 const { option } = defineProps<{ option: Option }>()
 
diff --git a/src/components/Options/OptionItem.vue b/src/components/Options/OptionItem.vue
index 14a9ddfb90..3eabcaf350 100644
--- a/src/components/Options/OptionItem.vue
+++ b/src/components/Options/OptionItem.vue
@@ -6,12 +6,13 @@
 <script setup lang="ts">
 import linkifyStr from 'linkify-string'
 import DragIcon from 'vue-material-design-icons/DotsVertical.vue'
-import { Option } from '../../Types/index.ts'
 import DateBox from '../Base/modules/DateBox.vue'
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 import OptionItemOwner from './OptionItemOwner.vue'
 import { DateTime, Duration } from 'luxon'
 
+import type { Option } from '../../stores/options.types'
+
 interface Props {
 	option: Option
 	draggable?: boolean
diff --git a/src/components/Options/OptionItemOwner.vue b/src/components/Options/OptionItemOwner.vue
index 0574f4ffd7..5239af098f 100644
--- a/src/components/Options/OptionItemOwner.vue
+++ b/src/components/Options/OptionItemOwner.vue
@@ -8,9 +8,11 @@ import { computed } from 'vue'
 import ActionDelete from '../Actions/modules/ActionDelete.vue'
 import UserItem from '../User/UserItem.vue'
 import { t } from '@nextcloud/l10n'
-import { usePollStore } from '../../stores/poll.ts'
-import { useSessionStore } from '../../stores/session.ts'
-import { useOptionsStore, Option } from '../../stores/options.ts'
+import { usePollStore } from '../../stores/poll'
+import { useSessionStore } from '../../stores/session'
+import { useOptionsStore } from '../../stores/options'
+
+import type { Option } from '../../stores/options.types'
 
 interface Props {
 	option: Option
diff --git a/src/components/Options/OptionMenu.vue b/src/components/Options/OptionMenu.vue
index 1c1b502f87..99104f8e33 100644
--- a/src/components/Options/OptionMenu.vue
+++ b/src/components/Options/OptionMenu.vue
@@ -19,9 +19,11 @@ import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
 import OptionSortIcon from 'vue-material-design-icons/SortBoolAscendingVariant.vue'
 
 import OptionCloneDate from './OptionCloneDate.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { useOptionsStore, Option } from '../../stores/options.ts'
-import { useVotesStore } from '../../stores/votes.ts'
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
+import { useVotesStore } from '../../stores/votes'
+
+import type { Option } from '../../stores/options.types'
 
 interface Props {
 	option: Option
diff --git a/src/components/Options/OptionsDate.vue b/src/components/Options/OptionsDate.vue
index 35449bfd42..cbecd6ebd5 100644
--- a/src/components/Options/OptionsDate.vue
+++ b/src/components/Options/OptionsDate.vue
@@ -11,10 +11,11 @@ import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
 
 import OptionItem from './OptionItem.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { useOptionsStore } from '../../stores/options.ts'
 import OptionMenu from './OptionMenu.vue'
 
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
+
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
 
diff --git a/src/components/Options/OptionsDateAddDialog.vue b/src/components/Options/OptionsDateAddDialog.vue
index 11a1a88504..36d644ea84 100644
--- a/src/components/Options/OptionsDateAddDialog.vue
+++ b/src/components/Options/OptionsDateAddDialog.vue
@@ -5,24 +5,29 @@
 
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
+import { DateTime, Duration } from 'luxon'
+
 import { showError } from '@nextcloud/dialogs'
 import { n, t } from '@nextcloud/l10n'
 
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
+
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
-import { DateTime, Duration } from 'luxon'
-import CheckIcon from 'vue-material-design-icons/Check.vue'
 
-import InputDiv from '../Base/modules/InputDiv.vue'
+import DateBox from '../Base/modules/DateBox.vue'
 import DateTimePicker from '../Base/modules/DateTimePicker.vue'
-import { useOptionsStore, Sequence } from '../../stores/options'
-import { DurationType, dateTimeUnitsKeyed } from '../../constants/dateUnits.ts'
+import InputDiv from '../Base/modules/InputDiv.vue'
+import { dateTimeUnitsKeyed } from '../../constants/dateUnits'
+import { useResizeObserver } from '../../composables/elementWidth'
 
-import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
-import { AxiosError } from '@nextcloud/axios'
+import CheckIcon from 'vue-material-design-icons/Check.vue'
 
-import { useResizeObserver } from '../../composables/elementWidth.ts'
-import DateBox from '../Base/modules/DateBox.vue'
+import { useOptionsStore } from '../../stores/options'
+
+import type { DurationType } from '../../constants/dateUnits'
+import type { AxiosError } from '@nextcloud/axios'
+import type { Sequence } from '../../stores/options.types'
 
 const { isBelowWidthOffset } = useResizeObserver('add-date-options-container', 355)
 
diff --git a/src/components/Options/OptionsDateShift.vue b/src/components/Options/OptionsDateShift.vue
index 2f3ee732ee..d08ee68fa7 100644
--- a/src/components/Options/OptionsDateShift.vue
+++ b/src/components/Options/OptionsDateShift.vue
@@ -13,8 +13,11 @@ import NcSelect from '@nextcloud/vue/components/NcSelect'
 import SubmitIcon from 'vue-material-design-icons/ArrowRight.vue'
 
 import InputDiv from '../Base/modules/InputDiv.vue'
-import { dateTimeUnitsKeyed, TimeUnitsType } from '../../constants/dateUnits.ts'
-import { useOptionsStore } from '../../stores/options.ts'
+import { dateTimeUnitsKeyed } from '../../constants/dateUnits'
+
+import { useOptionsStore } from '../../stores/options'
+
+import type { TimeUnitsType } from '../../constants/dateUnits'
 
 const optionsStore = useOptionsStore()
 
diff --git a/src/components/Options/OptionsText.vue b/src/components/Options/OptionsText.vue
index 22e98ab6dd..47c70f043b 100644
--- a/src/components/Options/OptionsText.vue
+++ b/src/components/Options/OptionsText.vue
@@ -5,9 +5,9 @@
 
 <script setup lang="ts">
 import { nextTick, useTemplateRef } from 'vue'
-import { t } from '@nextcloud/l10n'
 import { useSortable } from '@vueuse/integrations/useSortable'
 
+import { t } from '@nextcloud/l10n'
 import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
@@ -20,8 +20,8 @@ import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
 
 import OptionItem from './OptionItem.vue'
 import OptionsTextAdd from './OptionsTextAdd.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { useOptionsStore } from '../../stores/options.ts'
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
 
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
diff --git a/src/components/Options/OptionsTextAdd.vue b/src/components/Options/OptionsTextAdd.vue
index 6dbd5585e1..fa5a40f753 100644
--- a/src/components/Options/OptionsTextAdd.vue
+++ b/src/components/Options/OptionsTextAdd.vue
@@ -5,12 +5,16 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
 import InputDiv from '../Base/modules/InputDiv.vue'
-import { SimpleOption, useOptionsStore } from '../../stores/options.ts'
-import { AxiosError } from '@nextcloud/axios'
+
+import { useOptionsStore } from '../../stores/options'
+
+import type { SimpleOption } from '../../stores/options.types'
+import type { AxiosError } from '@nextcloud/axios'
 
 const optionsStore = useOptionsStore()
 
diff --git a/src/components/Options/OptionsTextAddBulk.vue b/src/components/Options/OptionsTextAddBulk.vue
index a55a84c295..29a0ccbf5c 100644
--- a/src/components/Options/OptionsTextAddBulk.vue
+++ b/src/components/Options/OptionsTextAddBulk.vue
@@ -15,7 +15,7 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 
 import PasteIcon from 'vue-material-design-icons/ClipboardTextMultiple.vue'
 
-import { useOptionsStore } from '../../stores/options.ts'
+import { useOptionsStore } from '../../stores/options'
 
 interface Props {
 	placeholder?: string
diff --git a/src/components/Poll/MarkDownDescription.vue b/src/components/Poll/MarkDownDescription.vue
index ebcb078be1..9727273c6a 100644
--- a/src/components/Poll/MarkDownDescription.vue
+++ b/src/components/Poll/MarkDownDescription.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-import { usePollStore } from '../../stores/poll.ts'
+import { usePollStore } from '../../stores/poll'
 const pollStore = usePollStore()
 </script>
 
diff --git a/src/components/Poll/PollHeaderButtons.vue b/src/components/Poll/PollHeaderButtons.vue
index d31a152eeb..cc714023b7 100644
--- a/src/components/Poll/PollHeaderButtons.vue
+++ b/src/components/Poll/PollHeaderButtons.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-import { computed, onBeforeUnmount } from 'vue'
+import { computed, defineAsyncComponent, onBeforeUnmount } from 'vue'
 import { useRoute } from 'vue-router'
 import { t } from '@nextcloud/l10n'
 
@@ -16,15 +16,17 @@ import PollInformationIcon from 'vue-material-design-icons/InformationOutline.vu
 import ActionToggleSidebar from '../Actions/modules/ActionToggleSidebar.vue'
 import PollInformation from '../Poll/PollInformation.vue'
 import UserMenu from '../User/UserMenu.vue'
-import ExportPoll from '../Export/ExportPoll.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { useSessionStore } from '../../stores/session.ts'
+
+import { usePollStore } from '../../stores/poll'
+import { useSessionStore } from '../../stores/session'
 
 const route = useRoute()
 const pollStore = usePollStore()
 const sessionStore = useSessionStore()
 const caption = t('polls', 'Poll information')
 
+const ExportPoll = defineAsyncComponent(() => import('../Export/ExportPoll.vue'))
+
 const showUserMenu = computed(
 	() =>
 		route.name !== 'publicVote'
diff --git a/src/components/Poll/PollInfoLine.vue b/src/components/Poll/PollInfoLine.vue
index 4ba47ef3dc..c43e1277d4 100644
--- a/src/components/Poll/PollInfoLine.vue
+++ b/src/components/Poll/PollInfoLine.vue
@@ -8,8 +8,8 @@ import { computed } from 'vue'
 import moment from '@nextcloud/moment'
 import { t } from '@nextcloud/l10n'
 
-import { usePollStore } from '../../stores/poll.ts'
-import { useSharesStore } from '../../stores/shares.ts'
+import { usePollStore } from '../../stores/poll'
+import { useSharesStore } from '../../stores/shares'
 
 import unpublishedIcon from 'vue-material-design-icons/PublishOff.vue'
 import archivedPollIcon from 'vue-material-design-icons/Archive.vue'
diff --git a/src/components/Poll/PollInformation.vue b/src/components/Poll/PollInformation.vue
index 041ea81c95..a16bc43051 100644
--- a/src/components/Poll/PollInformation.vue
+++ b/src/components/Poll/PollInformation.vue
@@ -26,15 +26,15 @@ import CheckIcon from 'vue-material-design-icons/Check.vue'
 import CloseIcon from 'vue-material-design-icons/Close.vue'
 import EmailIcon from 'vue-material-design-icons/Email.vue'
 
-import { MaybeIcon } from '../AppIcons/index.ts'
+import MaybeIcon from '../AppIcons/MaybeIcon.vue'
 
 import BadgeDiv from '../Base/modules/BadgeDiv.vue'
 import UserBubble from '../User/UserBubble.vue'
-import { useSessionStore } from '../../stores/session.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { useSubscriptionStore } from '../../stores/subscription.ts'
-import { useOptionsStore } from '../../stores/options.ts'
-import { useVotesStore } from '../../stores/votes.ts'
+import { useSessionStore } from '../../stores/session'
+import { usePollStore } from '../../stores/poll'
+import { useSubscriptionStore } from '../../stores/subscription'
+import { useOptionsStore } from '../../stores/options'
+import { useVotesStore } from '../../stores/votes'
 
 const pollStore = usePollStore()
 const sessionStore = useSessionStore()
diff --git a/src/components/PollGroup/ConfigDescriptionPollGroup.vue b/src/components/PollGroup/ConfigDescriptionPollGroup.vue
index 5697671846..6930abd405 100644
--- a/src/components/PollGroup/ConfigDescriptionPollGroup.vue
+++ b/src/components/PollGroup/ConfigDescriptionPollGroup.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { t } from '@nextcloud/l10n'
-import { usePollGroupsStore } from '../../stores/pollGroups.ts'
+import { usePollGroupsStore } from '../../stores/pollGroups'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/PollGroup/ConfigNamePollGroup.vue b/src/components/PollGroup/ConfigNamePollGroup.vue
index b1650537ba..7c8c318e92 100644
--- a/src/components/PollGroup/ConfigNamePollGroup.vue
+++ b/src/components/PollGroup/ConfigNamePollGroup.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import InputDiv from '../Base/modules/InputDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { usePollGroupsStore } from '../../stores/pollGroups.ts'
+import { usePollGroupsStore } from '../../stores/pollGroups'
 import { computed } from 'vue'
 
 const emit = defineEmits(['change'])
diff --git a/src/components/PollGroup/ConfigTitleExtPollGroup.vue b/src/components/PollGroup/ConfigTitleExtPollGroup.vue
index c5ef1e8ff0..2c569e07cd 100644
--- a/src/components/PollGroup/ConfigTitleExtPollGroup.vue
+++ b/src/components/PollGroup/ConfigTitleExtPollGroup.vue
@@ -7,7 +7,7 @@
 import { computed } from 'vue'
 import InputDiv from '../Base/modules/InputDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { usePollGroupsStore } from '../../stores/pollGroups.ts'
+import { usePollGroupsStore } from '../../stores/pollGroups'
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/PollGroup/PollGroupEditDlg.vue b/src/components/PollGroup/PollGroupEditDlg.vue
index 6777f9913f..e1208c70c5 100644
--- a/src/components/PollGroup/PollGroupEditDlg.vue
+++ b/src/components/PollGroup/PollGroupEditDlg.vue
@@ -12,10 +12,10 @@ import DescriptionIcon from 'vue-material-design-icons/TextBox.vue'
 
 import ConfigBox from '../Base/modules/ConfigBox.vue'
 
-import { usePollGroupsStore } from '../../stores/pollGroups.ts'
+import { usePollGroupsStore } from '../../stores/pollGroups'
 import { showError, showInfo } from '@nextcloud/dialogs'
 import { useRoute } from 'vue-router'
-import { router } from '../../router.ts'
+import { router } from '../../router'
 import ConfigTitlePollGroup from './ConfigNamePollGroup.vue'
 import ConfigTitleExtPollGroup from './ConfigTitleExtPollGroup.vue'
 import ConfigDescriptionPollGroup from './ConfigDescriptionPollGroup.vue'
diff --git a/src/components/PollList/PollItem.vue b/src/components/PollList/PollItem.vue
index e838378344..fcc42f8fd6 100644
--- a/src/components/PollList/PollItem.vue
+++ b/src/components/PollList/PollItem.vue
@@ -4,15 +4,11 @@
 -->
 
 <script setup lang="ts">
-import { RouterLink } from 'vue-router'
 import { computed } from 'vue'
+import { RouterLink } from 'vue-router'
 import { DateTime } from 'luxon'
 import { t } from '@nextcloud/l10n'
 
-import { usePollStore, Poll, pollTypes } from '../../stores/poll'
-import { usePreferencesStore } from '../../stores/preferences.ts'
-import BadgeSmallDiv from '../Base/modules/BadgeSmallDiv.vue'
-
 // Icons
 import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
@@ -27,6 +23,13 @@ import ParticipatedIcon from 'vue-material-design-icons/AccountCheck.vue'
 import AdminIcon from 'vue-material-design-icons/ShieldCrown.vue'
 import UserBubble from '../User/UserBubble.vue'
 
+import BadgeSmallDiv from '../Base/modules/BadgeSmallDiv.vue'
+
+import { usePollStore, pollTypes } from '../../stores/poll'
+import { usePreferencesStore } from '../../stores/preferences'
+
+import type { Poll } from '../../stores/poll.types'
+
 interface Props {
 	poll: Poll
 	noLink?: boolean
diff --git a/src/components/PollList/PollItemActions.vue b/src/components/PollList/PollItemActions.vue
index 6c97b17978..6665768e4d 100644
--- a/src/components/PollList/PollItemActions.vue
+++ b/src/components/PollList/PollItemActions.vue
@@ -5,23 +5,17 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { router } from '../../router.ts'
+import { router } from '../../router'
+import { useRoute } from 'vue-router'
 
-import { NcActionInput, NcDialog } from '@nextcloud/vue'
-import { showError, showInfo } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
+import { showError, showInfo } from '@nextcloud/dialogs'
+
+import NcDialog from '@nextcloud/vue/components/NcDialog'
+import NcActionInput from '@nextcloud/vue/components/NcActionInput'
 
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
-import { ButtonVariant } from '@nextcloud/vue/components/NcButton'
-
-import { usePollsStore } from '../../stores/polls.ts'
-import { usePollGroupsStore } from '../../stores/pollGroups.ts'
-import { useSessionStore } from '../../stores/session.ts'
-import { Poll } from '../../stores/poll.ts'
-
-import DeletePollDialog from '../Modals/DeletePollDialog.vue'
-import TransferPollDialog from '../Modals/TransferPollDialog.vue'
 
 import ArchivePollIcon from 'vue-material-design-icons/Archive.vue'
 import ClonePollIcon from 'vue-material-design-icons/ContentCopy.vue'
@@ -31,7 +25,16 @@ import MinusIcon from 'vue-material-design-icons/Minus.vue'
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
 import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
 import TransferPollIcon from 'vue-material-design-icons/AccountSwitchOutline.vue'
-import { useRoute } from 'vue-router'
+
+import DeletePollDialog from '../Modals/DeletePollDialog.vue'
+import TransferPollDialog from '../Modals/TransferPollDialog.vue'
+
+import { usePollsStore } from '../../stores/polls'
+import { usePollGroupsStore } from '../../stores/pollGroups'
+import { useSessionStore } from '../../stores/session'
+
+import type { ButtonVariant } from '@nextcloud/vue/components/NcButton'
+import type { Poll } from '../../stores/poll.types'
 
 const { poll } = defineProps<{ poll: Poll }>()
 
diff --git a/src/components/PollList/PollListSort.vue b/src/components/PollList/PollListSort.vue
index fcd3396fa0..3d36e2086c 100644
--- a/src/components/PollList/PollListSort.vue
+++ b/src/components/PollList/PollListSort.vue
@@ -4,14 +4,11 @@
 -->
 
 <script setup lang="ts">
+import { computed } from 'vue'
+
 import { t } from '@nextcloud/l10n'
-import {
-	SortDirection,
-	sortTitlesMapping,
-	usePollsStore,
-} from '../../stores/polls.ts'
-import { SortType } from '../../Types'
 
+import NcActionButtonGroup from '@nextcloud/vue/components/NcActionButtonGroup'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActionSeparator from '@nextcloud/vue/components/NcActionSeparator'
@@ -23,8 +20,10 @@ import GestureDoubleTapIcon from 'vue-material-design-icons/GestureDoubleTap.vue
 import CreationIcon from 'vue-material-design-icons/ClockPlusOutline.vue'
 import ExpirationIcon from 'vue-material-design-icons/CalendarEnd.vue'
 import AccountCircleOutlineIcon from 'vue-material-design-icons/AccountCircleOutline.vue'
-import { NcActionButtonGroup } from '@nextcloud/vue'
-import { computed } from 'vue'
+
+import { sortTitlesMapping, usePollsStore } from '../../stores/polls'
+
+import type { SortDirection, SortType } from '../../stores/polls.types'
 
 const pollsStore = usePollsStore()
 
diff --git a/src/components/Public/PublicRegisterModal.vue b/src/components/Public/PublicRegisterModal.vue
index 182171e2dd..a82414c37f 100644
--- a/src/components/Public/PublicRegisterModal.vue
+++ b/src/components/Public/PublicRegisterModal.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import { showError } from '@nextcloud/dialogs'
 import { generateUrl } from '@nextcloud/router'
 import { t } from '@nextcloud/l10n'
@@ -15,12 +15,13 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
 import NcButton from '@nextcloud/vue/components/NcButton'
 
 import InputDiv from '../Base/modules/InputDiv.vue'
-import { SimpleLink, setCookie } from '../../helpers/index.ts'
-import { ValidatorAPI, PublicAPI } from '../../Api/index.ts'
-import { useSessionStore } from '../../stores/session.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { AxiosError } from '@nextcloud/axios'
-import { SignalingType } from '../../Types/index.ts'
+import { SimpleLink, setCookie } from '../../helpers'
+import { ValidatorAPI, PublicAPI } from '../../Api'
+import { useSessionStore } from '../../stores/session'
+import { usePollStore } from '../../stores/poll'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { SignalingType } from '../../Types'
 
 const route = useRoute()
 const router = useRouter()
diff --git a/src/components/Settings/AdminSettings/AdminActivities.vue b/src/components/Settings/AdminSettings/AdminActivities.vue
index bc35977f1a..04f894f2bb 100644
--- a/src/components/Settings/AdminSettings/AdminActivities.vue
+++ b/src/components/Settings/AdminSettings/AdminActivities.vue
@@ -8,7 +8,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminArchivePolls.vue b/src/components/Settings/AdminSettings/AdminArchivePolls.vue
index 2edd536fd7..eb8405e665 100644
--- a/src/components/Settings/AdminSettings/AdminArchivePolls.vue
+++ b/src/components/Settings/AdminSettings/AdminArchivePolls.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminCombo.vue b/src/components/Settings/AdminSettings/AdminCombo.vue
index a46aa940e8..8f230a6a0c 100644
--- a/src/components/Settings/AdminSettings/AdminCombo.vue
+++ b/src/components/Settings/AdminSettings/AdminCombo.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminDeletePolls.vue b/src/components/Settings/AdminSettings/AdminDeletePolls.vue
index 3fbfe34d99..ceeaa84960 100644
--- a/src/components/Settings/AdminSettings/AdminDeletePolls.vue
+++ b/src/components/Settings/AdminSettings/AdminDeletePolls.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminEmail.vue b/src/components/Settings/AdminSettings/AdminEmail.vue
index e71c4326e9..4217b5364f 100644
--- a/src/components/Settings/AdminSettings/AdminEmail.vue
+++ b/src/components/Settings/AdminSettings/AdminEmail.vue
@@ -13,7 +13,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 
diff --git a/src/components/Settings/AdminSettings/AdminJobs.vue b/src/components/Settings/AdminSettings/AdminJobs.vue
index 8d7d124933..c3d21714d1 100644
--- a/src/components/Settings/AdminSettings/AdminJobs.vue
+++ b/src/components/Settings/AdminSettings/AdminJobs.vue
@@ -4,12 +4,12 @@
 -->
 
 <script setup>
-import { Logger } from '../../../helpers/index.ts'
+import { Logger } from '../../../helpers/modules/logger'
 import { t } from '@nextcloud/l10n'
 
 import NcButton from '@nextcloud/vue/components/NcButton'
 
-import { AdminAPI } from '../../../Api/index.ts'
+import { AdminAPI } from '../../../Api'
 
 const autoreminder = {
 	text: t('polls', 'Run autoreminder'),
diff --git a/src/components/Settings/AdminSettings/AdminLegal.vue b/src/components/Settings/AdminSettings/AdminLegal.vue
index c903b4e1d8..4946dbf642 100644
--- a/src/components/Settings/AdminSettings/AdminLegal.vue
+++ b/src/components/Settings/AdminSettings/AdminLegal.vue
@@ -4,11 +4,13 @@
 -->
 
 <script setup>
-import InputDiv from '../../Base/modules/InputDiv.vue'
-import { t } from '@nextcloud/l10n'
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 import { computed } from 'vue'
-import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { t } from '@nextcloud/l10n'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
+
+import InputDiv from '../../Base/modules/InputDiv.vue'
+
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 const placeholder = computed(() => {
diff --git a/src/components/Settings/AdminSettings/AdminPerformance.vue b/src/components/Settings/AdminSettings/AdminPerformance.vue
index 5763dbcdd9..57305f256b 100644
--- a/src/components/Settings/AdminSettings/AdminPerformance.vue
+++ b/src/components/Settings/AdminSettings/AdminPerformance.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import RadioGroupDiv from '../../Base/modules/RadioGroupDiv.vue'
 import { t } from '@nextcloud/l10n'
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 const updateTypeOptions = [
diff --git a/src/components/Settings/AdminSettings/AdminPollCreation.vue b/src/components/Settings/AdminSettings/AdminPollCreation.vue
index e1f4d317b3..60b860f625 100644
--- a/src/components/Settings/AdminSettings/AdminPollCreation.vue
+++ b/src/components/Settings/AdminSettings/AdminPollCreation.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminPollDownload.vue b/src/components/Settings/AdminSettings/AdminPollDownload.vue
index 503df75942..e8d06b985b 100644
--- a/src/components/Settings/AdminSettings/AdminPollDownload.vue
+++ b/src/components/Settings/AdminSettings/AdminPollDownload.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue b/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
index 0e192f1865..6aa383aa68 100644
--- a/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
+++ b/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
@@ -6,7 +6,7 @@
 <script setup>
 import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue b/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
index 7609a4c590..2a927c67fc 100644
--- a/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
+++ b/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue b/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
index 375f707264..7aeef16f00 100644
--- a/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
+++ b/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue b/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
index 63b4375985..16d6d2eb7e 100644
--- a/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
+++ b/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
@@ -8,7 +8,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue b/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
index f1477f542b..cd91b67e5c 100644
--- a/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
+++ b/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 
 const appSettingsStore = useAppSettingsStore()
 </script>
diff --git a/src/components/Settings/AdminSettings/AdminUnrescrictedOwners.vue b/src/components/Settings/AdminSettings/AdminUnrescrictedOwners.vue
index 21779a8fcb..a4de9d231c 100644
--- a/src/components/Settings/AdminSettings/AdminUnrescrictedOwners.vue
+++ b/src/components/Settings/AdminSettings/AdminUnrescrictedOwners.vue
@@ -9,7 +9,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
 
-import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+import { useAppSettingsStore } from '../../../stores/appSettings'
 import CardDiv from '../../Base/modules/CardDiv.vue'
 
 const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/index.ts b/src/components/Settings/AdminSettings/index.ts
deleted file mode 100644
index 2de6a975e4..0000000000
--- a/src/components/Settings/AdminSettings/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { default as AdminActivities } from './AdminActivities.vue'
-export { default as AdminArchivePolls } from './AdminArchivePolls.vue'
-export { default as AdminCombo } from './AdminCombo.vue'
-export { default as AdminDeletePolls } from './AdminDeletePolls.vue'
-export { default as AdminEmail } from './AdminEmail.vue'
-export { default as AdminJobs } from './AdminJobs.vue'
-export { default as AdminLegal } from './AdminLegal.vue'
-export { default as AdminPerformance } from './AdminPerformance.vue'
-export { default as AdminPollCreation } from './AdminPollCreation.vue'
-export { default as AdminPollDownload } from './AdminPollDownload.vue'
-export { default as AdminPollsInNavigation } from './AdminPollsInNavigation.vue'
-export { default as AdminShareOpenPoll } from './AdminShareOpenPoll.vue'
-export { default as AdminSharePublicCreate } from './AdminSharePublicCreate.vue'
-export { default as AdminSharePublicShowLogin } from './AdminSharePublicShowLogin.vue'
-export { default as AdminShowMailAddresses } from './AdminShowMailAddresses.vue'
-export { default as AdminUnrescrictedOwners } from './AdminUnrescrictedOwners.vue'
diff --git a/src/components/Settings/UserSettings/CalendarSettings.vue b/src/components/Settings/UserSettings/CalendarSettings.vue
index df7f67a872..3fdd88fb8a 100644
--- a/src/components/Settings/UserSettings/CalendarSettings.vue
+++ b/src/components/Settings/UserSettings/CalendarSettings.vue
@@ -10,7 +10,7 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
 import InputDiv from '../../Base/modules/InputDiv.vue'
-import { usePreferencesStore } from '../../../stores/preferences.ts'
+import { usePreferencesStore } from '../../../stores/preferences'
 const preferencesStore = usePreferencesStore()
 
 const calendarChoices = computed(() =>
diff --git a/src/components/Settings/UserSettings/FeatureSettings.vue b/src/components/Settings/UserSettings/FeatureSettings.vue
index 568f231ee4..5d959cc659 100644
--- a/src/components/Settings/UserSettings/FeatureSettings.vue
+++ b/src/components/Settings/UserSettings/FeatureSettings.vue
@@ -10,7 +10,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { usePreferencesStore } from '../../../stores/preferences.ts'
+import { usePreferencesStore } from '../../../stores/preferences'
 
 const preferencesStore = usePreferencesStore()
 
diff --git a/src/components/Settings/UserSettings/StyleSettings.vue b/src/components/Settings/UserSettings/StyleSettings.vue
index fc85cfa68a..28b521b00b 100644
--- a/src/components/Settings/UserSettings/StyleSettings.vue
+++ b/src/components/Settings/UserSettings/StyleSettings.vue
@@ -8,7 +8,7 @@ import { t } from '@nextcloud/l10n'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
-import { usePreferencesStore } from '../../../stores/preferences.ts'
+import { usePreferencesStore } from '../../../stores/preferences'
 const preferencesStore = usePreferencesStore()
 </script>
 
diff --git a/src/components/Settings/UserSettings/index.ts b/src/components/Settings/UserSettings/index.ts
deleted file mode 100644
index 86bc5eab07..0000000000
--- a/src/components/Settings/UserSettings/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { default as CalendarSettings } from './CalendarSettings.vue'
-export { default as FeatureSettings } from './FeatureSettings.vue'
-export { default as StyleSettings } from './StyleSettings.vue'
diff --git a/src/components/Settings/UserSettingsDlg.vue b/src/components/Settings/UserSettingsDlg.vue
index 2e8fc2d4b1..e92fe827e7 100644
--- a/src/components/Settings/UserSettingsDlg.vue
+++ b/src/components/Settings/UserSettingsDlg.vue
@@ -10,13 +10,12 @@ import { t } from '@nextcloud/l10n'
 import NcAppSettingsDialog from '@nextcloud/vue/components/NcAppSettingsDialog'
 import NcAppSettingsSection from '@nextcloud/vue/components/NcAppSettingsSection'
 
-import {
-	CalendarSettings,
-	FeatureSettings,
-	StyleSettings,
-} from './UserSettings/index.ts'
-import { usePreferencesStore } from '../../stores/preferences.ts'
-import { Event } from '../../Types/index.ts'
+import CalendarSettings from './UserSettings/CalendarSettings.vue'
+import FeatureSettings from './UserSettings/FeatureSettings.vue'
+import StyleSettings from './UserSettings/StyleSettings.vue'
+
+import { usePreferencesStore } from '../../stores/preferences'
+import { Event } from '../../Types'
 
 const preferencesStore = usePreferencesStore()
 const show = ref(false)
diff --git a/src/components/Shares/ShareItem.vue b/src/components/Shares/ShareItem.vue
index caed24e005..0650fffb6b 100644
--- a/src/components/Shares/ShareItem.vue
+++ b/src/components/Shares/ShareItem.vue
@@ -11,10 +11,10 @@ import VotedIcon from 'vue-material-design-icons/CheckboxMarked.vue'
 import UnvotedIcon from 'vue-material-design-icons/MinusBox.vue'
 
 import UserItem from '../User/UserItem.vue'
-
-import { Share } from '../../stores/shares.ts'
 import ShareMenu from './ShareMenu.vue'
 
+import type { Share } from '../../stores/shares.types'
+
 const emit = defineEmits(['showQrCode'])
 
 const { share } = defineProps<{ share: Share }>()
diff --git a/src/components/Shares/ShareItemAllUsers.vue b/src/components/Shares/ShareItemAllUsers.vue
index b4dd5aa348..2a7a23bd5b 100644
--- a/src/components/Shares/ShareItemAllUsers.vue
+++ b/src/components/Shares/ShareItemAllUsers.vue
@@ -10,8 +10,8 @@ import { t } from '@nextcloud/l10n'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 
 import UserItem from '../User/UserItem.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { VirtualUserItemType } from '../../Types/index.ts'
+import { usePollStore } from '../../stores/poll'
+import { VirtualUserItemType } from '../../Types'
 
 const pollStore = usePollStore()
 
diff --git a/src/components/Shares/ShareMenu.vue b/src/components/Shares/ShareMenu.vue
index 6898ed1e83..1f0e1fedbe 100644
--- a/src/components/Shares/ShareMenu.vue
+++ b/src/components/Shares/ShareMenu.vue
@@ -26,12 +26,13 @@ import UnlockIcon from 'vue-material-design-icons/LockOpenVariant.vue'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 import RestoreIcon from 'vue-material-design-icons/Recycle.vue'
 
-import { AxiosError } from '@nextcloud/axios'
+import { useSharesStore } from '../../stores/shares'
+import { usePollGroupsStore } from '../../stores/pollGroups'
+import { usePollStore } from '../../stores/poll'
 
-import { useSharesStore, Share } from '../../stores/shares.ts'
-import { SentResults } from '../../Api/modules/shares.ts'
-import { usePollGroupsStore } from '../../stores/pollGroups.ts'
-import { usePollStore } from '../../stores/poll.ts'
+import type { AxiosError } from '@nextcloud/axios'
+import type { Share } from '../../stores/shares.types'
+import type { SentResults } from '../../Api/modules/shares'
 
 const emit = defineEmits(['showQrCode'])
 
diff --git a/src/components/Shares/SharePublicAdd.vue b/src/components/Shares/SharePublicAdd.vue
index b516f3aa7c..e1d7e08124 100644
--- a/src/components/Shares/SharePublicAdd.vue
+++ b/src/components/Shares/SharePublicAdd.vue
@@ -13,8 +13,9 @@ import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
 
 import UserItem from '../User/UserItem.vue'
-import { useSharesStore } from '../../stores/shares.ts'
-import { VirtualUserItemType } from '../../Types/index.ts'
+import { useSharesStore } from '../../stores/shares'
+
+import type { VirtualUserItemType } from '../../Types'
 
 const sharesStore = useSharesStore()
 
diff --git a/src/components/Shares/SharesList.vue b/src/components/Shares/SharesList.vue
index 5d7ca31a41..7b51c80b89 100644
--- a/src/components/Shares/SharesList.vue
+++ b/src/components/Shares/SharesList.vue
@@ -6,6 +6,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { t } from '@nextcloud/l10n'
+import { showError } from '@nextcloud/dialogs'
 
 import NcModal from '@nextcloud/vue/components/NcModal'
 
@@ -19,11 +20,12 @@ import SharePublicAdd from './SharePublicAdd.vue'
 import ShareItemAllUsers from './ShareItemAllUsers.vue'
 import MarkDownDescription from '../Poll/MarkDownDescription.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
-import { useSharesStore, Share } from '../../stores/shares.ts'
-import { useSessionStore } from '../../stores/session.ts'
-import { showError } from '@nextcloud/dialogs'
-import { User } from '../../Types/index.ts'
+import { usePollStore } from '../../stores/poll'
+import { useSharesStore } from '../../stores/shares'
+import { useSessionStore } from '../../stores/session'
+
+import type { User } from '../../Types'
+import type { Share } from '../../stores/shares.types'
 
 const pollStore = usePollStore()
 const sharesStore = useSharesStore()
diff --git a/src/components/Shares/SharesListLocked.vue b/src/components/Shares/SharesListLocked.vue
index 6d49115181..3b63229fef 100644
--- a/src/components/Shares/SharesListLocked.vue
+++ b/src/components/Shares/SharesListLocked.vue
@@ -8,7 +8,7 @@ import ConfigBox from '../Base/modules/ConfigBox.vue'
 import LockedIcon from 'vue-material-design-icons/Lock.vue'
 import ShareItem from './ShareItem.vue'
 import { t } from '@nextcloud/l10n'
-import { useSharesStore } from '../../stores/shares.ts'
+import { useSharesStore } from '../../stores/shares'
 
 const sharesStore = useSharesStore()
 
diff --git a/src/components/Shares/SharesListPollGroup.vue b/src/components/Shares/SharesListPollGroup.vue
index 7ab31af0b0..f5a9fbc048 100644
--- a/src/components/Shares/SharesListPollGroup.vue
+++ b/src/components/Shares/SharesListPollGroup.vue
@@ -12,9 +12,9 @@ import ConfigBox from '../Base/modules/ConfigBox.vue'
 import ShareItem from './ShareItem.vue'
 import UserSearch from '../User/UserSearch.vue'
 
-import { useSharesStore } from '../../stores/shares.ts'
+import { useSharesStore } from '../../stores/shares'
 import { showError } from '@nextcloud/dialogs'
-import { User } from '../../Types/index.ts'
+import type { User } from '../../Types'
 
 const sharesStore = useSharesStore()
 const { info } = defineProps<{
diff --git a/src/components/Shares/SharesListUnsent.vue b/src/components/Shares/SharesListUnsent.vue
index 8fc6c8e17d..60d47ce650 100644
--- a/src/components/Shares/SharesListUnsent.vue
+++ b/src/components/Shares/SharesListUnsent.vue
@@ -14,9 +14,9 @@ import ShareItem from './ShareItem.vue'
 import BulkMailIcon from 'vue-material-design-icons/EmailMultipleOutline.vue'
 
 import ConfigBox from '../Base/modules/ConfigBox.vue'
-import { Logger } from '../../helpers/index.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { useSharesStore } from '../../stores/shares.ts'
+import { Logger } from '../../helpers'
+import { usePollStore } from '../../stores/poll'
+import { useSharesStore } from '../../stores/shares'
 
 const pollStore = usePollStore()
 const sharesStore = useSharesStore()
diff --git a/src/components/SideBar/SideBarTabActivity.vue b/src/components/SideBar/SideBarTabActivity.vue
index 3ee60bcd40..d832b0b197 100644
--- a/src/components/SideBar/SideBarTabActivity.vue
+++ b/src/components/SideBar/SideBarTabActivity.vue
@@ -13,8 +13,8 @@ import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
 
 import Activities from '../Activity/Activities.vue'
-import { useActivityStore } from '../../stores/activity.ts'
-import { Event } from '../../Types/index.ts'
+import { useActivityStore } from '../../stores/activity'
+import { Event } from '../../Types'
 
 const activityStore = useActivityStore()
 const emptyContentProps = {
diff --git a/src/components/SideBar/SideBarTabComments.vue b/src/components/SideBar/SideBarTabComments.vue
index c99e05aba2..7ee3313199 100644
--- a/src/components/SideBar/SideBarTabComments.vue
+++ b/src/components/SideBar/SideBarTabComments.vue
@@ -14,9 +14,9 @@ import CommentAdd from '../Comments/CommentAdd.vue'
 import Comments from '../Comments/Comments.vue'
 import CommentsIcon from 'vue-material-design-icons/CommentProcessing.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
-import { useCommentsStore } from '../../stores/comments.ts'
-import { Event } from '../../Types/index.ts'
+import { usePollStore } from '../../stores/poll'
+import { useCommentsStore } from '../../stores/comments'
+import { Event } from '../../Types'
 
 const pollStore = usePollStore()
 const commentsStore = useCommentsStore()
diff --git a/src/components/SideBar/SideBarTabConfiguration.vue b/src/components/SideBar/SideBarTabConfiguration.vue
index d5938d08fc..51dcd2f484 100644
--- a/src/components/SideBar/SideBarTabConfiguration.vue
+++ b/src/components/SideBar/SideBarTabConfiguration.vue
@@ -30,8 +30,8 @@ import ConfigTitle from '../Configuration/ConfigTitle.vue'
 import ConfigUseNo from '../Configuration/ConfigUseNo.vue'
 import ConfigVoteLimit from '../Configuration/ConfigVoteLimit.vue'
 
-import { usePollStore } from '../../stores/poll.ts'
-import { useVotesStore } from '../../stores/votes.ts'
+import { usePollStore } from '../../stores/poll'
+import { useVotesStore } from '../../stores/votes'
 import ConfigDangerArea from '../Configuration/ConfigDangerArea.vue'
 import ConfigForceConfidentialComments from '../Configuration/ConfigForceConfidentialComments.vue'
 
diff --git a/src/components/SideBar/SideBarTabDatePolls.vue b/src/components/SideBar/SideBarTabDatePolls.vue
index bd985cf1e6..43c15ece9f 100644
--- a/src/components/SideBar/SideBarTabDatePolls.vue
+++ b/src/components/SideBar/SideBarTabDatePolls.vue
@@ -4,8 +4,8 @@
 -->
 
 <script setup lang="ts">
-import { usePollsStore } from '../../stores/polls.ts'
-import { useComboStore } from '../../stores/combo.ts'
+import { usePollsStore } from '../../stores/polls'
+import { useComboStore } from '../../stores/combo'
 
 import UserItem from '../User/UserItem.vue'
 
diff --git a/src/components/SideBar/SideBarTabOptions.vue b/src/components/SideBar/SideBarTabOptions.vue
index d4ace7d6dd..f75e9e8d3e 100644
--- a/src/components/SideBar/SideBarTabOptions.vue
+++ b/src/components/SideBar/SideBarTabOptions.vue
@@ -8,8 +8,8 @@ import { onMounted, onUnmounted } from 'vue'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 
-import { useOptionsStore } from '../../stores/options.ts'
-import { usePollStore } from '../../stores/poll.ts'
+import { useOptionsStore } from '../../stores/options'
+import { usePollStore } from '../../stores/poll'
 
 import ConfigBox from '../Base/modules/ConfigBox.vue'
 import OptionsDate from '../Options/OptionsDate.vue'
@@ -22,7 +22,7 @@ import ShiftDateIcon from 'vue-material-design-icons/CalendarStart.vue'
 import TextOptionsIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 import OptionsTextAddBulk from '../Options/OptionsTextAddBulk.vue'
 import ActionAddOption from '../Actions/modules/ActionAddOption.vue'
-import { Event } from '../../Types/index.ts'
+import { Event } from '../../Types'
 
 const optionsStore = useOptionsStore()
 const pollStore = usePollStore()
diff --git a/src/components/SideBar/SideBarTabShare.vue b/src/components/SideBar/SideBarTabShare.vue
index a7d32b6029..5f8ce16ce6 100644
--- a/src/components/SideBar/SideBarTabShare.vue
+++ b/src/components/SideBar/SideBarTabShare.vue
@@ -7,13 +7,13 @@
 import { onMounted, onUnmounted } from 'vue'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
-import { useSharesStore } from '../../stores/shares.ts'
-import { useSessionStore } from '../../stores/session.ts'
+import { useSharesStore } from '../../stores/shares'
+import { useSessionStore } from '../../stores/session'
 
 import SharesList from '../Shares/SharesList.vue'
 import SharesListUnsent from '../Shares/SharesListUnsent.vue'
 import SharesListLocked from '../Shares/SharesListLocked.vue'
-import { Event } from '../../Types/index.ts'
+import { Event } from '../../Types'
 
 const sharesStore = useSharesStore()
 const sessionStore = useSessionStore()
diff --git a/src/components/SideBar/SideBarTabSharePollGroup.vue b/src/components/SideBar/SideBarTabSharePollGroup.vue
index 15ac605744..618ae8bed3 100644
--- a/src/components/SideBar/SideBarTabSharePollGroup.vue
+++ b/src/components/SideBar/SideBarTabSharePollGroup.vue
@@ -7,7 +7,7 @@
 import { onMounted } from 'vue'
 import { onBeforeRouteUpdate } from 'vue-router'
 
-import { useSharesStore } from '../../stores/shares.ts'
+import { useSharesStore } from '../../stores/shares'
 
 import SharesList from '../Shares/SharesListPollGroup.vue'
 import { t } from '@nextcloud/l10n'
diff --git a/src/components/Subscription/ActionSubscription.vue b/src/components/Subscription/ActionSubscription.vue
index 7991222231..83184d8cf3 100644
--- a/src/components/Subscription/ActionSubscription.vue
+++ b/src/components/Subscription/ActionSubscription.vue
@@ -10,8 +10,8 @@ import { t } from '@nextcloud/l10n'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionCheckbox from '@nextcloud/vue/components/NcActionCheckbox'
 
-import { useSubscriptionStore } from '../../stores/subscription.ts'
-import { useSessionStore } from '../../stores/session.ts'
+import { useSubscriptionStore } from '../../stores/subscription'
+import { useSessionStore } from '../../stores/session'
 
 const subscriptionStore = useSubscriptionStore()
 const sessionStore = useSessionStore()
diff --git a/src/components/User/ActionInputDisplayName.vue b/src/components/User/ActionInputDisplayName.vue
index 9a51d313b6..a8e584b2a5 100644
--- a/src/components/User/ActionInputDisplayName.vue
+++ b/src/components/User/ActionInputDisplayName.vue
@@ -5,16 +5,16 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
 import NcActionInput from '@nextcloud/vue/components/NcActionInput'
 import EditAccountIcon from 'vue-material-design-icons/AccountEdit.vue'
 
-import { ValidatorAPI } from '../../Api/index.ts'
-import { StatusResults } from '../../Types/index.ts'
-import { useSessionStore } from '../../stores/session.ts'
+import { ValidatorAPI } from '../../Api'
+import { StatusResults } from '../../Types'
+import { useSessionStore } from '../../stores/session'
 
 type InputProps = {
 	success: boolean
diff --git a/src/components/User/ActionInputEmailAddress.vue b/src/components/User/ActionInputEmailAddress.vue
index c340ad8344..ca4c79f311 100644
--- a/src/components/User/ActionInputEmailAddress.vue
+++ b/src/components/User/ActionInputEmailAddress.vue
@@ -5,16 +5,16 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
 import NcActionInput from '@nextcloud/vue/components/NcActionInput'
 import EditEmailIcon from 'vue-material-design-icons/EmailEditOutline.vue'
 
-import { ValidatorAPI } from '../../Api/index.ts'
-import { StatusResults } from '../../Types/index.ts'
-import { useSessionStore } from '../../stores/session.ts'
+import { ValidatorAPI } from '../../Api'
+import { StatusResults } from '../../Types'
+import { useSessionStore } from '../../stores/session'
 
 type InputProps = {
 	success: boolean
diff --git a/src/components/User/UserBubble.vue b/src/components/User/UserBubble.vue
index a7b9f5a634..0da66990de 100644
--- a/src/components/User/UserBubble.vue
+++ b/src/components/User/UserBubble.vue
@@ -5,11 +5,12 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-
-import { User } from '../../Types/index.ts'
-import { NcUserBubble } from '@nextcloud/vue'
 import { t } from '@nextcloud/l10n'
 
+import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
+
+import type { User } from '../../Types'
+
 interface Props {
 	user: User
 }
diff --git a/src/components/User/UserItem.vue b/src/components/User/UserItem.vue
index dbe335f231..481b1e38ba 100644
--- a/src/components/User/UserItem.vue
+++ b/src/components/User/UserItem.vue
@@ -22,7 +22,7 @@ import DeletedUserIcon from 'vue-material-design-icons/AccountOff.vue'
 import AnoymousIcon from 'vue-material-design-icons/Incognito.vue'
 import PollGroupIcon from 'vue-material-design-icons/CodeBraces.vue'
 
-import { User, UserType, VirtualUserItemType } from '../../Types/index.ts'
+import { User, UserType, VirtualUserItemType } from '../../Types'
 
 defineOptions({
 	inheritAttrs: true,
diff --git a/src/components/User/UserMenu.vue b/src/components/User/UserMenu.vue
index a18313efa1..6cc57ec8aa 100644
--- a/src/components/User/UserMenu.vue
+++ b/src/components/User/UserMenu.vue
@@ -6,13 +6,14 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
+import NcActionButtonGroup from '@nextcloud/vue/components/NcActionButtonGroup'
 import NcActionCheckbox from '@nextcloud/vue/components/NcActionCheckbox'
 import NcActionInput from '@nextcloud/vue/components/NcActionInput'
 import NcActionSeparator from '@nextcloud/vue/components/NcActionSeparator'
@@ -31,18 +32,19 @@ import SortByOriginalOrderIcon from 'vue-material-design-icons/FormatListBullete
 import SortByRankIcon from 'vue-material-design-icons/FormatListNumbered.vue'
 import SortByDateOptionIcon from 'vue-material-design-icons/SortClockAscendingOutline.vue'
 
-import { PollsAPI, ValidatorAPI } from '../../Api/index.ts'
-import { useOptionsStore } from '../../stores/options.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { useSessionStore } from '../../stores/session.ts'
-import { useSubscriptionStore } from '../../stores/subscription.ts'
-import { useVotesStore } from '../../stores/votes.ts'
+import { PollsAPI, ValidatorAPI } from '../../Api'
+import { useOptionsStore } from '../../stores/options'
+import { usePollStore } from '../../stores/poll'
+import { useSessionStore } from '../../stores/session'
+import { useSubscriptionStore } from '../../stores/subscription'
+import { useVotesStore } from '../../stores/votes'
 
-import { StatusResults, Event, ViewMode } from '../../Types/index.ts'
+import { deleteCookieByValue, findCookieByValue } from '../../helpers'
 
-import { deleteCookieByValue, findCookieByValue } from '../../helpers/index.ts'
-import { NcActionButtonGroup } from '@nextcloud/vue'
-import { AxiosError } from '@nextcloud/axios'
+import { Event } from '../../Types'
+import type { StatusResults } from '../../Types'
+import type { ViewMode } from '../../stores/preferences.types'
+import type { AxiosError } from '@nextcloud/axios'
 
 type InputProps = {
 	success: boolean
diff --git a/src/components/User/UserSearch.vue b/src/components/User/UserSearch.vue
index 6dea719ade..eb87ba7a06 100644
--- a/src/components/User/UserSearch.vue
+++ b/src/components/User/UserSearch.vue
@@ -5,15 +5,15 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import { t } from '@nextcloud/l10n'
 
 import NcSelectUsers from '@nextcloud/vue/components/NcSelectUsers'
 
-import { AppSettingsAPI } from '../../Api/index.ts'
-import { Logger } from '../../helpers/index.ts'
-import { ISearchType, User } from '../../Types/index.ts'
-import { AxiosError } from '@nextcloud/axios'
+import { AppSettingsAPI } from '../../Api'
+import { Logger } from '../../helpers'
+import { ISearchType, User } from '../../Types'
+import type { AxiosError } from '@nextcloud/axios'
 
 interface Props {
 	placeholder?: string
diff --git a/src/components/VoteTable/VoteButton.vue b/src/components/VoteTable/VoteButton.vue
index ee5276528e..e8e010c46e 100644
--- a/src/components/VoteTable/VoteButton.vue
+++ b/src/components/VoteTable/VoteButton.vue
@@ -5,15 +5,19 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
-import { AxiosError } from '@nextcloud/axios'
 
 import { t } from '@nextcloud/l10n'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 
 import VoteIndicator from './VoteIndicator.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { Answer, useVotesStore } from '../../stores/votes.ts'
-import { Option, User } from '../../Types/index.ts'
+
+import { usePollStore } from '../../stores/poll'
+import { useVotesStore } from '../../stores/votes'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { User } from '../../Types'
+import type { Option } from '../../stores/options.types'
+import type { Answer } from '../../stores/votes.types'
 
 interface Props {
 	option: Option
diff --git a/src/components/VoteTable/VoteIndicator.vue b/src/components/VoteTable/VoteIndicator.vue
index d4ec3b3914..4c284d634a 100644
--- a/src/components/VoteTable/VoteIndicator.vue
+++ b/src/components/VoteTable/VoteIndicator.vue
@@ -7,8 +7,8 @@
 import CheckIcon from 'vue-material-design-icons/Check.vue'
 import CloseIcon from 'vue-material-design-icons/Close.vue'
 import CancelIcon from 'vue-material-design-icons/Cancel.vue'
-import { MaybeIcon } from '../AppIcons/index.ts'
-import { Answer } from '../../Types/index.ts'
+import MaybeIcon from '../AppIcons/MaybeIcon.vue'
+import { Answer } from '../../stores/votes.types'
 
 const ICON_SIZE = 26
 
diff --git a/src/components/VoteTable/VoteItem.vue b/src/components/VoteTable/VoteItem.vue
index f7e770e9ee..46b7c489ca 100644
--- a/src/components/VoteTable/VoteItem.vue
+++ b/src/components/VoteTable/VoteItem.vue
@@ -6,9 +6,11 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
-import { usePollStore } from '../../stores/poll.ts'
-import { useVotesStore } from '../../stores/votes.ts'
-import { Option, User } from '../../Types/index.ts'
+import { usePollStore } from '../../stores/poll'
+import { useVotesStore } from '../../stores/votes'
+
+import type { User } from '../../Types'
+import type { Option } from '../../stores/options.types'
 
 import VoteIndicator from './VoteIndicator.vue'
 
diff --git a/src/components/VoteTable/VoteMenu.vue b/src/components/VoteTable/VoteMenu.vue
index cbf29ff941..8e008c69ed 100644
--- a/src/components/VoteTable/VoteMenu.vue
+++ b/src/components/VoteTable/VoteMenu.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
@@ -25,13 +25,13 @@ import EditAccountIcon from 'vue-material-design-icons/AccountEdit.vue'
 import LogoutIcon from 'vue-material-design-icons/Logout.vue'
 import EditEmailIcon from 'vue-material-design-icons/EmailEditOutline.vue'
 
-import { ValidatorAPI } from '../../Api/index.ts'
-import { usePollStore } from '../../stores/poll.ts'
-import { useSessionStore } from '../../stores/session.ts'
-import { useSubscriptionStore } from '../../stores/subscription.ts'
-import { useVotesStore } from '../../stores/votes.ts'
-import { StatusResults } from '../../Types/index.ts'
-import { deleteCookieByValue, findCookieByValue } from '../../helpers/index.ts'
+import { ValidatorAPI } from '../../Api'
+import { usePollStore } from '../../stores/poll'
+import { useSessionStore } from '../../stores/session'
+import { useSubscriptionStore } from '../../stores/subscription'
+import { useVotesStore } from '../../stores/votes'
+import { StatusResults } from '../../Types'
+import { deleteCookieByValue, findCookieByValue } from '../../helpers'
 
 interface Props {
 	noMenuIcon: boolean
diff --git a/src/components/VoteTable/VoteParticipant.vue b/src/components/VoteTable/VoteParticipant.vue
index 4c90ea662f..3d2f48b76b 100644
--- a/src/components/VoteTable/VoteParticipant.vue
+++ b/src/components/VoteTable/VoteParticipant.vue
@@ -4,20 +4,24 @@
 -->
 
 <script setup lang="ts">
+import { computed } from 'vue'
 import { showSuccess } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 
-import UserItem from '../User/UserItem.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { useSessionStore } from '../../stores/session.ts'
-import { useVotesStore } from '../../stores/votes.ts'
-
-import { NcActionButton, NcActions, NcActionText } from '@nextcloud/vue'
+import NcActions from '@nextcloud/vue/components/NcActions'
+import NcActionButton from '@nextcloud/vue/components/NcActionButton'
+import NcActionText from '@nextcloud/vue/components/NcActionText'
 
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
+
 import VoteMenu from './VoteMenu.vue'
-import { User } from '../../Types/index.ts'
-import { computed } from 'vue'
+import UserItem from '../User/UserItem.vue'
+
+import { usePollStore } from '../../stores/poll'
+import { useSessionStore } from '../../stores/session'
+import { useVotesStore } from '../../stores/votes'
+
+import type { User } from '../../Types'
 
 const pollStore = usePollStore()
 const sessionStore = useSessionStore()
diff --git a/src/components/VoteTable/VoteTable.vue b/src/components/VoteTable/VoteTable.vue
index b46f6a4f8d..2d6e295fa8 100644
--- a/src/components/VoteTable/VoteTable.vue
+++ b/src/components/VoteTable/VoteTable.vue
@@ -4,17 +4,15 @@
 -->
 
 <script setup lang="ts">
-import { computed, ref } from 'vue'
-import { NcButton } from '@nextcloud/vue'
+import { computed, defineAsyncComponent, ref } from 'vue'
 import { t } from '@nextcloud/l10n'
 import { getCurrentUser } from '@nextcloud/auth'
+import NcButton from '@nextcloud/vue/components/NcButton'
 
-import { usePollStore } from '../../stores/poll.ts'
-import { Option, useOptionsStore } from '../../stores/options.ts'
-import { useVotesStore } from '../../stores/votes.ts'
+import SortOptionIcon from 'vue-material-design-icons/SortBoolAscendingVariant.vue'
+import SortNameIcon from 'vue-material-design-icons/SortAlphabeticalDescending.vue'
 
 import StickyDiv from '../Base/modules/StickyDiv.vue'
-import CalendarPeek from '../Calendar/CalendarPeek.vue'
 import Counter from '../Options/Counter.vue'
 import OptionItem from '../Options/OptionItem.vue'
 import OptionMenu from '../Options/OptionMenu.vue'
@@ -22,19 +20,23 @@ import VoteButton from './VoteButton.vue'
 import VoteItem from './VoteItem.vue'
 import VoteParticipant from './VoteParticipant.vue'
 
-import { usePreferencesStore } from '../../stores/preferences.ts'
-import { useSessionStore } from '../../stores/session.ts'
-
-import { User } from '../../Types/index.ts'
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
+import { useVotesStore } from '../../stores/votes'
+import { usePreferencesStore } from '../../stores/preferences'
+import { useSessionStore } from '../../stores/session'
 
-import SortOptionIcon from 'vue-material-design-icons/SortBoolAscendingVariant.vue'
-import SortNameIcon from 'vue-material-design-icons/SortAlphabeticalDescending.vue'
+import type { User } from '../../Types'
+import type { Option } from '../../stores/options.types'
 
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
 const votesStore = useVotesStore()
 const preferencesStore = usePreferencesStore()
 const sessionStore = useSessionStore()
+const CalendarPeek = defineAsyncComponent(
+	() => import('../Calendar/CalendarPeek.vue'),
+)
 
 const { downPage = false } = defineProps<{ downPage: boolean }>()
 
diff --git a/src/composables/context.ts b/src/composables/context.ts
index 4638e90d27..5122993582 100644
--- a/src/composables/context.ts
+++ b/src/composables/context.ts
@@ -4,9 +4,9 @@
  */
 
 import { RouteLocationNormalized } from 'vue-router'
-import { useSessionStore } from '../stores/session.ts'
-import { usePreferencesStore } from '../stores/preferences.ts'
-import { Logger } from '../helpers/index.ts'
+import { useSessionStore } from '../stores/session'
+import { usePreferencesStore } from '../stores/preferences'
+import { Logger } from '../helpers'
 import { Settings } from 'luxon'
 
 /**
diff --git a/src/composables/usePollWatcher.ts b/src/composables/usePollWatcher.ts
index dc0ecbadc8..1195af51f7 100644
--- a/src/composables/usePollWatcher.ts
+++ b/src/composables/usePollWatcher.ts
@@ -4,18 +4,20 @@
  */
 
 import { watch, onBeforeUnmount, onMounted } from 'vue'
-import { useSessionStore, Watcher } from '../stores/session'
 import { usePollStore } from '../stores/poll'
 import { generateUrl } from '@nextcloud/router'
 // eslint-disable-next-line import/default
 import PollWatcherWorker from '../workers/pollWatcher.worker?worker'
-import { Logger } from '../helpers/index.ts'
+import { Logger } from '../helpers'
+
+import { useCommentsStore } from '../stores/comments'
+import { useOptionsStore } from '../stores/options'
+import { usePollsStore } from '../stores/polls'
+import { useSessionStore } from '../stores/session'
+import { useVotesStore } from '../stores/votes'
+
 import type { WatcherResponse } from './usePollWatcher.types'
-import { forEach } from 'lodash'
-import { usePollsStore } from '../stores/polls.ts'
-import { useOptionsStore } from '../stores/options.ts'
-import { useCommentsStore } from '../stores/comments.ts'
-import { useVotesStore } from '../stores/votes.ts'
+import type { Watcher } from '../stores/session.types'
 
 /**
  * poll watcher to keep polls collection and the current poll
@@ -155,7 +157,7 @@ export const usePollWatcher = (interval = 30000) => {
 	const handleWatcherTasks = (tasks: string[]) => {
 		Logger.info('[PollWatcher] Tasks to handle:', { tasks })
 
-		forEach(tasks, (task) => {
+		tasks.forEach((task: string) => {
 			switch (task) {
 				case 'poll':
 					pollStore.load()
diff --git a/src/dashboard.ts b/src/dashboard.ts
index e3b7b0d0fc..a269636b38 100644
--- a/src/dashboard.ts
+++ b/src/dashboard.ts
@@ -4,7 +4,7 @@
  */
 
 import { createApp } from 'vue'
-import { pinia } from './stores/index.ts'
+import { pinia } from './stores'
 
 import Dashboard from './views/Dashboard.vue'
 import './assets/scss/polls-icon.scss'
diff --git a/src/helpers/index.ts b/src/helpers/index.ts
index 0ad1148bf2..f75dbb676c 100644
--- a/src/helpers/index.ts
+++ b/src/helpers/index.ts
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-export { Logger } from './modules/logger.ts'
+export { Logger } from './modules/logger'
 export {
 	getCookieValue,
 	findCookie,
@@ -10,13 +10,13 @@ export {
 	deleteCookie,
 	deleteCookieByValue,
 	findCookieByValue,
-} from './modules/cookieHelper.ts'
+} from './modules/cookieHelper'
 export {
 	uniqueArrayOfObjects,
 	uniqueOptions,
 	uniqueParticipants,
-} from './modules/arrayHelper.ts'
-export { groupComments } from './modules/comments.ts'
-export { SimpleLink } from './modules/SimpleLink.ts'
-export { GuestBubble } from './modules/GuestBubble.ts'
-export { StoreHelper } from './modules/StoreHelper.ts'
+} from './modules/arrayHelper'
+export { groupComments } from './modules/comments'
+export { SimpleLink } from './modules/SimpleLink'
+export { GuestBubble } from './modules/GuestBubble'
+export { StoreHelper } from './modules/StoreHelper'
diff --git a/src/helpers/modules/StoreHelper.ts b/src/helpers/modules/StoreHelper.ts
index 2928825a31..0ece06ba4d 100644
--- a/src/helpers/modules/StoreHelper.ts
+++ b/src/helpers/modules/StoreHelper.ts
@@ -3,9 +3,13 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { useVotesStore, Vote } from '../../stores/votes'
-import { Poll, usePollStore } from '../../stores/poll'
-import { Option, useOptionsStore } from '../../stores/options'
+import { useVotesStore } from '../../stores/votes'
+import { usePollStore } from '../../stores/poll'
+import { useOptionsStore } from '../../stores/options'
+
+import type { Poll } from '../../stores/poll.types'
+import type { Option } from '../../stores/options.types'
+import type { Vote } from '../../stores/votes.types'
 
 const StoreHelper = {
 	updateStores(data: { poll?: Poll; votes?: Vote[]; options?: Option[] }) {
diff --git a/src/helpers/modules/arrayHelper.ts b/src/helpers/modules/arrayHelper.ts
index 2d7c0a1b53..5a38b25c15 100644
--- a/src/helpers/modules/arrayHelper.ts
+++ b/src/helpers/modules/arrayHelper.ts
@@ -3,7 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { Option, Vote, Participant } from '../../Types'
+import { Participant } from '../../Types'
+
+import type { Vote } from '../../stores/votes.types'
+import type { Option } from '../../stores/options.types'
 
 const uniqueArrayOfObjects = (array: unknown[]) =>
 	[...new Set(array.map((obj) => JSON.stringify(obj)))].map((string) =>
diff --git a/src/helpers/modules/comments.ts b/src/helpers/modules/comments.ts
index f57ddad6f9..ab03d16d03 100644
--- a/src/helpers/modules/comments.ts
+++ b/src/helpers/modules/comments.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { Comment } from '../../Types'
+import { Comment } from '../../stores/comments.types'
 
 function groupComments(inputArray: Comment[]) {
 	const idToElement: { [key: number]: Comment } = inputArray.reduce(
diff --git a/src/main.ts b/src/main.ts
index 398f3fae21..796566aa98 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 import { createApp } from 'vue'
-import { pinia } from './stores/index.ts'
-import { router } from './router.ts'
+import { pinia } from './stores'
+import { router } from './router'
 
 import App from './App.vue'
 
diff --git a/src/polls-reference.ts b/src/polls-reference.ts
index a8a20b7d8e..ebfbdff934 100644
--- a/src/polls-reference.ts
+++ b/src/polls-reference.ts
@@ -4,7 +4,7 @@
  */
 
 import { createApp } from 'vue'
-import { pinia } from './stores/index.ts'
+import { pinia } from './stores'
 import { registerWidget } from '@nextcloud/vue/components/NcRichText'
 import Reference from './views/Reference.vue'
 import './assets/scss/polls-icon.scss'
diff --git a/src/router.ts b/src/router.ts
index 970041b441..ebe28d1cfb 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -11,24 +11,15 @@ import {
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateUrl } from '@nextcloud/router'
-import { getCookieValue, Logger, setCookie } from './helpers/index.ts'
-import { loadContext } from './composables/context.ts'
-import { AxiosError } from 'axios'
+import { getCookieValue, Logger, setCookie } from './helpers'
+import { loadContext } from './composables/context'
 
 import Navigation from './views/Navigation.vue'
 
-import Combo from './views/Combo.vue'
-import Forbidden from './views/Forbidden.vue'
-import List from './views/PollList.vue'
-import NotFound from './views/NotFound.vue'
-import Vote from './views/Vote.vue'
+import { usePollStore } from './stores/poll'
+import { useSessionStore } from './stores/session'
 
-import SideBar from './views/SideBar.vue'
-import SideBarPollGroup from './views/SideBarPollGroup.vue'
-import SideBarCombo from './views/SideBarCombo.vue'
-
-import { usePollStore } from './stores/poll.ts'
-import { useSessionStore } from './stores/session.ts'
+import type { AxiosError } from 'axios'
 
 async function validateToken(to: RouteLocationNormalized) {
 	const sessionStore = useSessionStore()
@@ -88,6 +79,16 @@ async function validateToken(to: RouteLocationNormalized) {
 	pollStore.load()
 }
 
+const Combo = () => import('./views/Combo.vue')
+const Forbidden = () => import('./views/Forbidden.vue')
+const List = () => import('./views/PollList.vue')
+const NotFound = () => import('./views/NotFound.vue')
+const Vote = () => import('./views/Vote.vue')
+
+const SideBar = () => import('./views/SideBar.vue')
+const SideBarPollGroup = () => import('./views/SideBarPollGroup.vue')
+const SideBarCombo = () => import('./views/SideBarCombo.vue')
+
 const routes: RouteRecordRaw[] = [
 	{
 		name: 'list',
diff --git a/src/stores/activity.ts b/src/stores/activity.ts
index ce14be1f87..5096c565b3 100644
--- a/src/stores/activity.ts
+++ b/src/stores/activity.ts
@@ -4,32 +4,16 @@
  */
 
 import { defineStore } from 'pinia'
-import { ActivityAPI } from '../Api/index.ts'
-import { useSessionStore } from './session.ts'
-import { AxiosError } from '@nextcloud/axios'
 
-export type Activity = {
-	activity_id: number
-	app: string
-	type: string
-	user: string
-	subject: string
-	subject_rich: []
-	message: string
-	message_rich: []
-	object_type: string
-	object_id: number
-	link: string
-	icon: string
-	datetime: string
-}
+import { ActivityAPI } from '../Api'
 
-export type Activities = {
-	activities: Activity[]
-}
+import { useSessionStore } from './session'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { Activity, ActivitiyStore } from './activity.types'
 
 export const useActivityStore = defineStore('activity', {
-	state: (): Activities => ({
+	state: (): ActivitiyStore => ({
 		activities: [],
 	}),
 
diff --git a/src/stores/activity.types.ts b/src/stores/activity.types.ts
new file mode 100644
index 0000000000..c1b73dd084
--- /dev/null
+++ b/src/stores/activity.types.ts
@@ -0,0 +1,24 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+export type Activity = {
+	activity_id: number
+	app: string
+	type: string
+	user: string
+	subject: string
+	subject_rich: []
+	message: string
+	message_rich: []
+	object_type: string
+	object_id: number
+	link: string
+	icon: string
+	datetime: string
+}
+
+export type ActivitiyStore = {
+	activities: Activity[]
+}
diff --git a/src/stores/appSettings.ts b/src/stores/appSettings.ts
index cfe69f7f81..eab5d34906 100644
--- a/src/stores/appSettings.ts
+++ b/src/stores/appSettings.ts
@@ -4,61 +4,15 @@
  */
 
 import { defineStore } from 'pinia'
-import { AppSettingsAPI } from '../Api/index.ts'
-import { Logger } from '../helpers/index.ts'
-import { AxiosError } from '@nextcloud/axios'
 
-export type UpdateType = 'noPolling' | 'periodicPolling' | 'longPolling'
-export type Group = {
-	id: string
-	userId: string
-	displayName: string
-	emailAddress: string
-	isNoUser: boolean
-	type: string
-}
+import { AppSettingsAPI } from '../Api'
+import { Logger } from '../helpers'
 
-export type AppSettings = {
-	allAccessGroups: string[]
-	allowCombo: boolean
-	allowPublicShares: boolean
-	allowAllAccess: boolean
-	allowPollCreation: boolean
-	allowPollDownload: boolean
-	autoArchive: boolean
-	autoArchiveOffset: number
-	autoDelete: boolean
-	autoDeleteOffset: number
-	defaultPrivacyUrl: string
-	defaultImprintUrl: string
-	disclaimer: string
-	imprintUrl: string
-	legalTermsInEmail: boolean
-	privacyUrl: string
-	showMailAddresses: boolean
-	showLogin: boolean
-	unrestrictedOwner: boolean
-	updateType: UpdateType
-	useActivity: boolean
-	useCollaboration: boolean
-	useSiteLegalTerms: boolean
-	navigationPollsInList: boolean
-	finalPrivacyUrl: string
-	finalImprintUrl: string
-	comboGroups: string[]
-	publicSharesGroups: string[]
-	pollCreationGroups: string[]
-	pollDownloadGroups: string[]
-	showMailAddressesGroups: string[]
-	unrestrictedOwnerGroups: string[]
-	groups: Group[]
-	status: {
-		loadingGroups: boolean
-	}
-}
+import type { AxiosError } from '@nextcloud/axios'
+import type { AppSettingsStore } from './appSettings.types'
 
 export const useAppSettingsStore = defineStore('appSettings', {
-	state: (): AppSettings => ({
+	state: (): AppSettingsStore => ({
 		allAccessGroups: [],
 		allowCombo: true,
 		allowPublicShares: true,
diff --git a/src/stores/appSettings.types.ts b/src/stores/appSettings.types.ts
new file mode 100644
index 0000000000..6b667a6dbf
--- /dev/null
+++ b/src/stores/appSettings.types.ts
@@ -0,0 +1,53 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+export type UpdateType = 'noPolling' | 'periodicPolling' | 'longPolling'
+export type Group = {
+	id: string
+	userId: string
+	displayName: string
+	emailAddress: string
+	isNoUser: boolean
+	type: string
+}
+
+export type AppSettingsStore = {
+	allAccessGroups: string[]
+	allowCombo: boolean
+	allowPublicShares: boolean
+	allowAllAccess: boolean
+	allowPollCreation: boolean
+	allowPollDownload: boolean
+	autoArchive: boolean
+	autoArchiveOffset: number
+	autoDelete: boolean
+	autoDeleteOffset: number
+	defaultPrivacyUrl: string
+	defaultImprintUrl: string
+	disclaimer: string
+	imprintUrl: string
+	legalTermsInEmail: boolean
+	privacyUrl: string
+	showMailAddresses: boolean
+	showLogin: boolean
+	unrestrictedOwner: boolean
+	updateType: UpdateType
+	useActivity: boolean
+	useCollaboration: boolean
+	useSiteLegalTerms: boolean
+	navigationPollsInList: boolean
+	finalPrivacyUrl: string
+	finalImprintUrl: string
+	comboGroups: string[]
+	publicSharesGroups: string[]
+	pollCreationGroups: string[]
+	pollDownloadGroups: string[]
+	showMailAddressesGroups: string[]
+	unrestrictedOwnerGroups: string[]
+	groups: Group[]
+	status: {
+		loadingGroups: boolean
+	}
+}
diff --git a/src/stores/combo.ts b/src/stores/combo.ts
index 8a4de734cf..20c07969a1 100644
--- a/src/stores/combo.ts
+++ b/src/stores/combo.ts
@@ -4,27 +4,23 @@
  */
 
 import { defineStore } from 'pinia'
-import { VotesAPI, OptionsAPI, PollsAPI } from '../Api/index.ts'
-import { Participant } from '../Types/index.ts'
-import { Logger, uniqueOptions, uniqueParticipants } from '../helpers/index.ts'
-import { Option } from './options.ts'
-import { Poll } from './poll.ts'
-import { Vote } from './votes.ts'
-import { sortBy } from 'lodash'
-import { usePreferencesStore } from './preferences.ts'
-import { usePollsStore } from './polls.ts'
-import { AxiosError } from '@nextcloud/axios'
-
-export type Combo = {
-	id: number
-	options: Option[]
-	polls: Poll[]
-	participants: Participant[]
-	votes: Vote[]
-}
+import sortBy from 'lodash/sortBy'
+
+import { VotesAPI, OptionsAPI, PollsAPI } from '../Api'
+import { Logger, uniqueOptions, uniqueParticipants } from '../helpers'
+
+import { usePreferencesStore } from './preferences'
+import { usePollsStore } from './polls'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { Participant } from '../Types'
+import type { Vote } from './votes.types'
+import type { Option } from './options.types'
+import type { Poll } from './poll.types'
+import type { ComboStore } from './combo.types'
 
 export const useComboStore = defineStore('combo', {
-	state: (): Combo => ({
+	state: (): ComboStore => ({
 		id: 1,
 		options: [],
 		polls: [],
diff --git a/src/stores/combo.types.ts b/src/stores/combo.types.ts
new file mode 100644
index 0000000000..babcd1cac3
--- /dev/null
+++ b/src/stores/combo.types.ts
@@ -0,0 +1,17 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { Participant } from '../Types'
+import type { Poll } from './poll.types'
+import type { Vote } from './votes.types'
+import type { Option } from './options.types'
+
+export type ComboStore = {
+	id: number
+	options: Option[]
+	polls: Poll[]
+	participants: Participant[]
+	votes: Vote[]
+}
diff --git a/src/stores/comments.ts b/src/stores/comments.ts
index 7189adde80..b71a3cf857 100644
--- a/src/stores/comments.ts
+++ b/src/stores/comments.ts
@@ -4,40 +4,17 @@
  */
 
 import { defineStore } from 'pinia'
-import { CommentsAPI, PublicAPI } from '../Api/index.ts'
-import { User } from '../Types/index.ts'
-import { groupComments, Logger } from '../helpers/index.ts'
-import { useSessionStore } from './session.ts'
-import type { AxiosError } from '@nextcloud/axios'
 
-export type Comment = {
-	comment: string
-	deleted: number
-	id: number
-	parent: number
-	pollId: number
-	timestamp: number
-	user: User
-	confidential: number
-	recipient: User | null
-}
-
-export type ShortComment = {
-	comment: string
-	deleted: number
-	id: number
-}
-
-export type Comments = {
-	comments: Comment[]
-}
-
-export interface CommentsGrouped extends Comment {
-	comments: Comment[]
-}
+import { CommentsAPI, PublicAPI } from '../Api'
+import { groupComments, Logger } from '../helpers'
+
+import { useSessionStore } from './session'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { Comment, CommentsStore } from './comments.types'
 
 export const useCommentsStore = defineStore('comments', {
-	state: (): Comments => ({
+	state: (): CommentsStore => ({
 		comments: [],
 	}),
 
diff --git a/src/stores/comments.types.ts b/src/stores/comments.types.ts
new file mode 100644
index 0000000000..00b823be29
--- /dev/null
+++ b/src/stores/comments.types.ts
@@ -0,0 +1,32 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { User } from '../Types'
+
+export type Comment = {
+	comment: string
+	deleted: number
+	id: number
+	parent: number
+	pollId: number
+	timestamp: number
+	user: User
+	confidential: number
+	recipient: User | null
+}
+
+export type ShortComment = {
+	comment: string
+	deleted: number
+	id: number
+}
+
+export interface CommentsGrouped extends Comment {
+	comments: Comment[]
+}
+
+export type CommentsStore = {
+	comments: Comment[]
+}
diff --git a/src/stores/options.ts b/src/stores/options.ts
index 639ba15386..d7433934fa 100644
--- a/src/stores/options.ts
+++ b/src/stores/options.ts
@@ -4,61 +4,21 @@
  */
 
 import { defineStore } from 'pinia'
-import { PublicAPI, OptionsAPI } from '../Api/index.ts'
-import { User } from '../Types/index.ts'
-import { Logger } from '../helpers/index.ts'
 import orderBy from 'lodash/orderBy'
-import { usePollStore } from './poll.ts'
-import { useSessionStore } from './session.ts'
-import { Answer, useVotesStore } from './votes.ts'
-import { DateTimeUnitType, TimeUnitsType } from '../constants/dateUnits.ts'
-import { AxiosError } from '@nextcloud/axios'
-
-export type RankedType = 'yes' | 'no'
-
-export type Sequence = {
-	unit: DateTimeUnitType
-	stepWidth: number
-	repetitions: number
-}
-
-export type OptionVotes = {
-	yes: number
-	maybe: number
-	no: number
-	count: number
-	currentUser?: Answer
-}
-
-export type SimpleOption = {
-	text?: string
-	timestamp?: number
-	duration?: number
-}
-
-export type Option = {
-	id: number
-	pollId: number
-	text: string
-	timestamp: number
-	deleted: number
-	order: number
-	confirmed: number
-	duration: number
-	locked: boolean
-	hash: string
-	isOwner: boolean
-	votes: OptionVotes
-	owner: User | undefined
-}
-
-export type Options = {
-	options: Option[]
-	ranked: RankedType
-}
+
+import { PublicAPI, OptionsAPI } from '../Api'
+import { Logger } from '../helpers'
+
+import { usePollStore } from './poll'
+import { useSessionStore } from './session'
+import { useVotesStore } from './votes'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { TimeUnitsType } from '../constants/dateUnits'
+import type { Sequence, SimpleOption, Option, OptionsStore } from './options.types'
 
 export const useOptionsStore = defineStore('options', {
-	state: (): Options => ({
+	state: (): OptionsStore => ({
 		options: [],
 		ranked: 'no',
 	}),
diff --git a/src/stores/options.types.ts b/src/stores/options.types.ts
new file mode 100644
index 0000000000..b572ba6d46
--- /dev/null
+++ b/src/stores/options.types.ts
@@ -0,0 +1,51 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { User } from '../Types'
+import type { DateTimeUnitType } from '../constants/dateUnits'
+import type { Answer } from './votes.types'
+
+export type RankedType = 'yes' | 'no'
+
+export type Sequence = {
+	unit: DateTimeUnitType
+	stepWidth: number
+	repetitions: number
+}
+
+export type OptionVotes = {
+	yes: number
+	maybe: number
+	no: number
+	count: number
+	currentUser?: Answer
+}
+
+export type SimpleOption = {
+	text?: string
+	timestamp?: number
+	duration?: number
+}
+
+export type Option = {
+	id: number
+	pollId: number
+	text: string
+	timestamp: number
+	deleted: number
+	order: number
+	confirmed: number
+	duration: number
+	locked: boolean
+	hash: string
+	isOwner: boolean
+	votes: OptionVotes
+	owner: User | undefined
+}
+
+export type OptionsStore = {
+	options: Option[]
+	ranked: RankedType
+}
diff --git a/src/stores/poll.ts b/src/stores/poll.ts
index 2dc15cbe8a..27a0b6bf8e 100644
--- a/src/stores/poll.ts
+++ b/src/stores/poll.ts
@@ -14,31 +14,31 @@ import moment from '@nextcloud/moment'
 import { showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 
-import { Logger } from '../helpers/index.ts'
-import { PublicAPI, PollsAPI } from '../Api/index.ts'
-import {
-	Chunking,
-	createDefault,
-	Event,
-	StatusResults,
-	User,
-	UserType,
-	ViewMode,
-} from '../Types/index.ts'
-
-import { useVotesStore } from './votes.ts'
-import { useOptionsStore } from './options.ts'
-import { usePollsStore } from './polls.ts'
-import { useSessionStore } from './session.ts'
-import { useSubscriptionStore } from './subscription.ts'
-import { useSharesStore } from './shares.ts'
-import { useCommentsStore } from './comments.ts'
-import { AxiosError } from '@nextcloud/axios'
-
-export type PollType = 'textPoll' | 'datePoll'
-
-type PollTypesType = {
-	name: string
+import { Logger } from '../helpers'
+import { PublicAPI, PollsAPI } from '../Api'
+import { createDefault, Event } from '../Types'
+
+import { useVotesStore } from './votes'
+import { useOptionsStore } from './options'
+import { usePollsStore } from './polls'
+import { useSessionStore } from './session'
+import { useSubscriptionStore } from './subscription'
+import { useSharesStore } from './shares'
+import { useCommentsStore } from './comments'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { User } from '../Types'
+import type {
+	Poll,
+	PollType,
+	AllowProposals,
+	PollStore,
+	PollTypesType,
+} from './poll.types'
+import type { ViewMode } from './preferences.types'
+
+const markedPrefix = {
+	prefix: 'desc-',
 }
 
 export const pollTypes: Record<PollType, PollTypesType> = {
@@ -50,112 +50,8 @@ export const pollTypes: Record<PollType, PollTypesType> = {
 	},
 }
 
-export type VoteVariant = 'simple'
-export type AccessType = 'private' | 'open'
-export type ShowResults = 'always' | 'closed' | 'never'
-export type AllowProposals = 'allow' | 'disallow' | 'review'
-export type SortParticipants = 'alphabetical' | 'voteCount' | 'unordered'
-
-type Meta = {
-	chunking: Chunking
-	status: StatusResults
-}
-
-export type PollConfiguration = {
-	access: AccessType
-	allowComment: boolean
-	allowMaybe: boolean
-	allowProposals: AllowProposals
-	anonymous: boolean
-	autoReminder: boolean
-	collapseDescription: boolean
-	description: string
-	expire: number
-	forceConfidentialComments: boolean
-	hideBookedUp: boolean
-	maxVotesPerOption: number
-	maxVotesPerUser: number
-	proposalsExpire: number
-	showResults: ShowResults
-	title: string
-	useNo: boolean
-}
-
-export type PollStatus = {
-	anonymizeLevel: string
-	lastInteraction: number
-	created: number
-	isAnonymous: boolean
-	isArchived: boolean
-	isExpired: boolean
-	isRealAnonymous: boolean
-	relevantThreshold: number
-	deletionDate: number
-	archivedDate: number
-	countParticipants: number
-}
-
-export type PollPermissions = {
-	addOptions: boolean
-	addShares: boolean
-	addSharesExternal: boolean
-	archive: boolean
-	changeForeignVotes: boolean
-	changeOwner: boolean
-	clone: boolean
-	comment: boolean
-	confirmOptions: boolean
-	deanonymize: boolean
-	delete: boolean
-	edit: boolean
-	reorderOptions: boolean
-	seeResults: boolean
-	seeUsernames: boolean
-	subscribe: boolean
-	takeOver: boolean
-	view: boolean
-	vote: boolean
-}
-
-export type CurrentUserStatus = {
-	groupInvitations: string[]
-	isInvolved: boolean
-	isLocked: boolean
-	isLoggedIn: boolean
-	isNoUser: boolean
-	isOwner: boolean
-	orphanedVotes: number
-	shareToken: string
-	userId: string
-	userRole: UserType
-	countVotes: number
-	yesVotes: number
-	noVotes: number
-	maybeVotes: number
-}
-
-export type Poll = {
-	id: number
-	type: PollType
-	voteVariant: VoteVariant
-	descriptionSafe: string
-	configuration: PollConfiguration
-	owner: User
-	pollGroups: number[]
-	status: PollStatus
-	currentUserStatus: CurrentUserStatus
-	permissions: PollPermissions
-	revealParticipants: boolean
-	sortParticipants: SortParticipants
-	meta: Meta
-}
-
-const markedPrefix = {
-	prefix: 'desc-',
-}
-
 export const usePollStore = defineStore('poll', {
-	state: (): Poll => ({
+	state: (): PollStore => ({
 		id: 0,
 		type: 'datePoll',
 		voteVariant: 'simple',
diff --git a/src/stores/poll.types.ts b/src/stores/poll.types.ts
new file mode 100644
index 0000000000..94a69258bf
--- /dev/null
+++ b/src/stores/poll.types.ts
@@ -0,0 +1,114 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { Chunking, StatusResults, User, UserType } from '../Types'
+
+export type PollType = 'textPoll' | 'datePoll'
+
+export type PollTypesType = {
+	name: string
+}
+
+export type VoteVariant = 'simple'
+export type AccessType = 'private' | 'open'
+export type ShowResults = 'always' | 'closed' | 'never'
+export type AllowProposals = 'allow' | 'disallow' | 'review'
+export type SortParticipants = 'alphabetical' | 'voteCount' | 'unordered'
+
+type Meta = {
+	chunking: Chunking
+	status: StatusResults
+}
+
+export type PollConfiguration = {
+	access: AccessType
+	allowComment: boolean
+	allowMaybe: boolean
+	allowProposals: AllowProposals
+	anonymous: boolean
+	autoReminder: boolean
+	collapseDescription: boolean
+	description: string
+	expire: number
+	forceConfidentialComments: boolean
+	hideBookedUp: boolean
+	maxVotesPerOption: number
+	maxVotesPerUser: number
+	proposalsExpire: number
+	showResults: ShowResults
+	title: string
+	useNo: boolean
+}
+
+export type PollStatus = {
+	anonymizeLevel: string
+	lastInteraction: number
+	created: number
+	isAnonymous: boolean
+	isArchived: boolean
+	isExpired: boolean
+	isRealAnonymous: boolean
+	relevantThreshold: number
+	deletionDate: number
+	archivedDate: number
+	countParticipants: number
+}
+
+export type PollPermissions = {
+	addOptions: boolean
+	addShares: boolean
+	addSharesExternal: boolean
+	archive: boolean
+	changeForeignVotes: boolean
+	changeOwner: boolean
+	clone: boolean
+	comment: boolean
+	confirmOptions: boolean
+	deanonymize: boolean
+	delete: boolean
+	edit: boolean
+	reorderOptions: boolean
+	seeResults: boolean
+	seeUsernames: boolean
+	subscribe: boolean
+	takeOver: boolean
+	view: boolean
+	vote: boolean
+}
+
+export type CurrentUserStatus = {
+	groupInvitations: string[]
+	isInvolved: boolean
+	isLocked: boolean
+	isLoggedIn: boolean
+	isNoUser: boolean
+	isOwner: boolean
+	orphanedVotes: number
+	shareToken: string
+	userId: string
+	userRole: UserType
+	countVotes: number
+	yesVotes: number
+	noVotes: number
+	maybeVotes: number
+}
+
+export type Poll = {
+	id: number
+	type: PollType
+	voteVariant: VoteVariant
+	descriptionSafe: string
+	configuration: PollConfiguration
+	owner: User
+	pollGroups: number[]
+	status: PollStatus
+	currentUserStatus: CurrentUserStatus
+	permissions: PollPermissions
+	revealParticipants: boolean
+	sortParticipants: SortParticipants
+	meta: Meta
+}
+
+export type PollStore = Poll
diff --git a/src/stores/pollGroups.ts b/src/stores/pollGroups.ts
index be02410749..f8e7f81101 100644
--- a/src/stores/pollGroups.ts
+++ b/src/stores/pollGroups.ts
@@ -5,15 +5,20 @@
 
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
-import { Poll } from '../Types/index'
+
+import orderBy from 'lodash/orderBy'
+
+import { t } from '@nextcloud/l10n'
 import { useSessionStore } from './session'
 import { usePollsStore } from './polls'
-import { orderBy } from 'lodash'
-import type { PollGroup } from './pollGroups.types'
+
 import { PollGroupsAPI } from '../Api'
-import { AxiosError } from 'axios'
+
 import { Logger } from '../helpers'
-import { t } from '@nextcloud/l10n'
+
+import type { AxiosError } from 'axios'
+import type { Poll } from './poll.types'
+import type { PollGroup } from './pollGroups.types'
 
 export const usePollGroupsStore = defineStore('pollGroups', () => {
 	const pollGroups = ref<PollGroup[]>([])
diff --git a/src/stores/pollGroups.types.ts b/src/stores/pollGroups.types.ts
index 11a1b92967..689f6ba523 100644
--- a/src/stores/pollGroups.types.ts
+++ b/src/stores/pollGroups.types.ts
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2025 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { User } from '../Types/index.ts'
+import type { User } from '../Types'
 
 export type PollGroup = {
 	id: number
diff --git a/src/stores/polls.ts b/src/stores/polls.ts
index 50c4b599a1..be7b1ebf28 100644
--- a/src/stores/polls.ts
+++ b/src/stores/polls.ts
@@ -8,67 +8,21 @@ import orderBy from 'lodash/orderBy'
 import { DateTime } from 'luxon'
 import { t } from '@nextcloud/l10n'
 
-import { Logger } from '../helpers/index.ts'
-import { PollsAPI } from '../Api/index.ts'
-
-import { Poll } from './poll.ts'
-import { useSessionStore } from './session.ts'
-import { Chunking, StatusResults } from '../Types/index.ts'
-import { AxiosError } from '@nextcloud/axios'
-import { usePollGroupsStore } from './pollGroups.ts'
-
-export type SortType =
-	| 'created'
-	| 'title'
-	| 'access'
-	| 'owner'
-	| 'expire'
-	| 'interaction'
-
-export type SortDirection = 'asc' | 'desc'
-
-export type FilterType =
-	| 'relevant'
-	| 'my'
-	| 'private'
-	| 'participated'
-	| 'open'
-	| 'all'
-	| 'closed'
-	| 'archived'
-	| 'admin'
-
-export type PollCategory = {
-	id: FilterType
-	title: string
-	titleExt: string
-	description: string
-	pinned: boolean
-	showInNavigation(): boolean
-	filterCondition(poll: Poll): boolean
-}
-
-export type PollCategoryList = Record<FilterType, PollCategory>
-
-export type Meta = {
-	chunks: Chunking
-	maxPollsInNavigation: number
-	status: StatusResults
-}
-
-export type PollList = {
-	polls: Poll[]
-	// pollGroups: PollGroup[]
-	meta: Meta
-	sort: {
-		by: SortType
-		reverse: boolean
-	}
-	status: {
-		loadingGroups: boolean
-	}
-	categories: PollCategoryList
-}
+import { Logger } from '../helpers'
+import { PollsAPI } from '../Api'
+
+import { useSessionStore } from './session'
+import { usePollGroupsStore } from './pollGroups'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { Poll } from './poll.types'
+import type {
+	PollCategory,
+	PollCategoryList,
+	PollsStore,
+	FilterType,
+	SortType,
+} from './polls.types'
 
 export const sortColumnsMapping: { [key in SortType]: string } = {
 	created: 'status.created',
@@ -208,12 +162,15 @@ const pollCategories: PollCategoryList = {
 			const sessionStore = useSessionStore()
 			return !!sessionStore.currentUser?.isAdmin
 		},
-		filterCondition: (poll: Poll) => !poll.permissions.view,
+		filterCondition: (poll: Poll) => {
+			const sessionStore = useSessionStore()
+			return sessionStore.currentUser.id !== poll.owner.id
+		},
 	},
 }
 
 export const usePollsStore = defineStore('polls', {
-	state: (): PollList => ({
+	state: (): PollsStore => ({
 		polls: [],
 		meta: {
 			chunks: {
@@ -234,7 +191,7 @@ export const usePollsStore = defineStore('polls', {
 	}),
 
 	getters: {
-		navigationCategories(state: PollList): PollCategory[] {
+		navigationCategories(state: PollsStore): PollCategory[] {
 			return Object.values(state.categories).filter((category) =>
 				category.showInNavigation(),
 			)
@@ -244,7 +201,7 @@ export const usePollsStore = defineStore('polls', {
 		 * Sliced filtered and sorted polls for navigation
 		 */
 		navigationList:
-			(state: PollList) =>
+			(state: PollsStore) =>
 			(filterId: FilterType): Poll[] =>
 				orderBy(
 					state.polls.filter((poll: Poll) =>
@@ -254,7 +211,7 @@ export const usePollsStore = defineStore('polls', {
 					['desc'],
 				).slice(0, state.meta.maxPollsInNavigation),
 
-		currentCategory(state: PollList): PollCategory {
+		currentCategory(state: PollsStore): PollCategory {
 			const sessionStore = useSessionStore()
 
 			if (
@@ -269,7 +226,7 @@ export const usePollsStore = defineStore('polls', {
 		/*
 		 * polls list, filtered by current category and sorted
 		 */
-		pollsFilteredSorted(state: PollList): Poll[] {
+		pollsFilteredSorted(state: PollsStore): Poll[] {
 			const sessionStore = useSessionStore()
 			const pollGroupsStore = usePollGroupsStore()
 
@@ -294,7 +251,7 @@ export const usePollsStore = defineStore('polls', {
 			return this.pollsFilteredSorted.slice(0, this.loaded)
 		},
 
-		pollsCount(state: PollList): { [key: string]: number } {
+		pollsCount(state: PollsStore): { [key: string]: number } {
 			const count: Record<FilterType, number> = {} as Record<
 				FilterType,
 				number
@@ -312,7 +269,7 @@ export const usePollsStore = defineStore('polls', {
 		/*
 		 * Sliced filtered and sorted polls for dashboard
 		 */
-		dashboardList(state: PollList): Poll[] {
+		dashboardList(state: PollsStore): Poll[] {
 			return orderBy(
 				state.polls.filter((poll: Poll) =>
 					state.categories.relevant.filterCondition(poll),
@@ -322,11 +279,11 @@ export const usePollsStore = defineStore('polls', {
 			).slice(0, 7)
 		},
 
-		loaded(state: PollList): number {
+		loaded(state: PollsStore): number {
 			return state.meta.chunks.loaded * state.meta.chunks.size
 		},
 
-		datePolls(state: PollList): Poll[] {
+		datePolls(state: PollsStore): Poll[] {
 			return state.polls.filter(
 				(poll: Poll) => poll.type === 'datePoll' && !poll.status.isArchived,
 			)
@@ -336,7 +293,7 @@ export const usePollsStore = defineStore('polls', {
 			return state.meta.status === 'loading'
 		},
 
-		countByCategory: (state: PollList) => (filterId: FilterType) =>
+		countByCategory: (state: PollsStore) => (filterId: FilterType) =>
 			state.polls.filter((poll: Poll) =>
 				state.categories[filterId].filterCondition(poll),
 			).length,
diff --git a/src/stores/polls.types.ts b/src/stores/polls.types.ts
new file mode 100644
index 0000000000..ce7725f188
--- /dev/null
+++ b/src/stores/polls.types.ts
@@ -0,0 +1,60 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { Poll } from './poll.types'
+import { Chunking, StatusResults } from '../Types'
+
+export type SortType =
+	| 'created'
+	| 'title'
+	| 'access'
+	| 'owner'
+	| 'expire'
+	| 'interaction'
+
+export type SortDirection = 'asc' | 'desc'
+
+export type FilterType =
+	| 'relevant'
+	| 'my'
+	| 'private'
+	| 'participated'
+	| 'open'
+	| 'all'
+	| 'closed'
+	| 'archived'
+	| 'admin'
+
+export type PollCategory = {
+	id: FilterType
+	title: string
+	titleExt: string
+	description: string
+	pinned: boolean
+	showInNavigation(): boolean
+	filterCondition(poll: Poll): boolean
+}
+
+export type PollCategoryList = Record<FilterType, PollCategory>
+
+export type Meta = {
+	chunks: Chunking
+	maxPollsInNavigation: number
+	status: StatusResults
+}
+
+export type PollsStore = {
+	polls: Poll[]
+	// pollGroups: PollGroup[]
+	meta: Meta
+	sort: {
+		by: SortType
+		reverse: boolean
+	}
+	status: {
+		loadingGroups: boolean
+	}
+	categories: PollCategoryList
+}
diff --git a/src/stores/preferences.ts b/src/stores/preferences.ts
index ad4bdcd40d..888373be9c 100644
--- a/src/stores/preferences.ts
+++ b/src/stores/preferences.ts
@@ -4,43 +4,15 @@
  */
 
 import { defineStore } from 'pinia'
-import { CalendarAPI, UserSettingsAPI } from '../Api/index.ts'
-import { Logger } from '../helpers/index.ts'
-import { AxiosError } from '@nextcloud/axios'
 
-export type ViewMode = 'table-view' | 'list-view'
+import { CalendarAPI, UserSettingsAPI } from '../Api'
+import { Logger } from '../helpers'
 
-export type UserPreferences = {
-	calendarPeek: boolean
-	checkCalendars: string[]
-	checkCalendarsHoursBefore: number
-	checkCalendarsHoursAfter: number
-	defaultViewTextPoll: ViewMode
-	defaultViewDatePoll: ViewMode
-	pollCombo: number[]
-	relevantOffset: number
-	useNewPollDialogInNavigation: boolean
-	useNewPollInPollist: boolean
-	useCommentsAlternativeStyling: boolean
-	useAlternativeStyling: boolean
-	verbosePollsList: boolean
-}
-
-export type Calendar = {
-	key: string
-	name: string
-	calendarUri: string
-	displayColor: string
-	permissions: number
-}
-
-export type Preferences = {
-	user: UserPreferences
-	availableCalendars: Calendar[]
-}
+import type { AxiosError } from '@nextcloud/axios'
+import type { PreferencesStore, Calendar } from './preferences.types'
 
 export const usePreferencesStore = defineStore('preferences', {
-	state: (): Preferences => ({
+	state: (): PreferencesStore => ({
 		user: {
 			calendarPeek: false,
 			checkCalendars: [],
diff --git a/src/stores/preferences.types.ts b/src/stores/preferences.types.ts
new file mode 100644
index 0000000000..2a73c8daa6
--- /dev/null
+++ b/src/stores/preferences.types.ts
@@ -0,0 +1,35 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+export type ViewMode = 'table-view' | 'list-view'
+
+export type UserPreferences = {
+	calendarPeek: boolean
+	checkCalendars: string[]
+	checkCalendarsHoursBefore: number
+	checkCalendarsHoursAfter: number
+	defaultViewTextPoll: ViewMode
+	defaultViewDatePoll: ViewMode
+	pollCombo: number[]
+	relevantOffset: number
+	useNewPollDialogInNavigation: boolean
+	useNewPollInPollist: boolean
+	useCommentsAlternativeStyling: boolean
+	useAlternativeStyling: boolean
+	verbosePollsList: boolean
+}
+
+export type Calendar = {
+	key: string
+	name: string
+	calendarUri: string
+	displayColor: string
+	permissions: number
+}
+
+export type PreferencesStore = {
+	user: UserPreferences
+	availableCalendars: Calendar[]
+}
diff --git a/src/stores/session.ts b/src/stores/session.ts
index 36e6e357db..8b235c30c2 100644
--- a/src/stores/session.ts
+++ b/src/stores/session.ts
@@ -4,70 +4,35 @@
  */
 
 import { defineStore } from 'pinia'
+import { RouteLocationNormalized } from 'vue-router'
+
 import { getCurrentUser } from '@nextcloud/auth'
-import { PublicAPI, SessionAPI } from '../Api/index.ts'
-import { createDefault, User, AppPermissions } from '../Types/index.ts'
-import { AppSettings, UpdateType } from './appSettings.ts'
-import { usePreferencesStore, ViewMode } from './preferences.ts'
-import { FilterType, usePollsStore } from './polls.ts'
-import { Share } from './shares.ts'
-import { RouteLocationNormalized, RouteRecordNameGeneric } from 'vue-router'
-import { Logger } from '../helpers/index.ts'
-import { PollType, usePollStore } from './poll.ts'
-import { useSubscriptionStore } from './subscription.ts'
-import { AxiosError } from '@nextcloud/axios'
 import { t } from '@nextcloud/l10n'
-import { usePollGroupsStore } from './pollGroups.ts'
-
-interface RouteParams {
-	id: number
-	token: string
-	type: FilterType
-	slug: string
-}
-
-export type Route = {
-	currentRoute: string
-	name: RouteRecordNameGeneric
-	path: string
-	params: RouteParams
-}
-
-export type UserStatus = {
-	isLoggedin: boolean
-	isAdmin: boolean
-}
-
-export type SessionSettings = {
-	viewModeDatePoll: '' | ViewMode
-	viewModeTextPoll: '' | ViewMode
-}
-
-export type Watcher = {
-	id: string
-	mode: UpdateType
-	status: 'running' | 'stopped' | 'error' | 'stopping' | 'idle'
-	interval?: number
-	lastUpdate: number
-	lastMessage?: string
-}
-
-export type Session = {
-	appPermissions: AppPermissions
-	appSettings: AppSettings
-	currentUser: User
-	route: Route
-	sessionSettings: SessionSettings
-	share: Share
-	token: string | null
-	userStatus: UserStatus
-	watcher: Watcher
-}
+
+import { Logger } from '../helpers'
+import { PublicAPI, SessionAPI } from '../Api'
+
+import { useSubscriptionStore } from './subscription'
+import { usePollGroupsStore } from './pollGroups'
+import { usePreferencesStore } from './preferences'
+import { usePollStore } from './poll'
+import { usePollsStore } from './polls'
+
+import { createDefault } from '../Types'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { ViewMode } from './preferences.types'
+import type { Share } from './shares.types'
+import type { PollType } from './poll.types'
+import type { FilterType } from './polls.types'
+import type { User } from '../Types'
+
+import type { SessionStore } from './session.types'
 
 const MOBILE_BREAKPOINT = 480
 
 export const useSessionStore = defineStore('session', {
-	state: (): Session => ({
+	state: (): SessionStore => ({
 		appPermissions: {
 			addShares: false,
 			addSharesExternal: false,
diff --git a/src/stores/session.types.ts b/src/stores/session.types.ts
new file mode 100644
index 0000000000..037e4586d1
--- /dev/null
+++ b/src/stores/session.types.ts
@@ -0,0 +1,75 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { RouteRecordNameGeneric } from 'vue-router'
+
+import { AppSettingsStore } from './appSettings.types'
+import { ViewMode } from './preferences.types'
+
+import type { Share } from './shares.types'
+import type { FilterType } from './polls.types'
+import type { User } from '../Types'
+import type { UpdateType } from './appSettings.types'
+
+interface RouteParams {
+	id: number
+	token: string
+	type: FilterType
+	slug: string
+}
+
+export type Route = {
+	currentRoute: string
+	name: RouteRecordNameGeneric
+	path: string
+	params: RouteParams
+}
+
+export type UserStatus = {
+	isLoggedin: boolean
+	isAdmin: boolean
+}
+
+export type SessionSettings = {
+	viewModeDatePoll: '' | ViewMode
+	viewModeTextPoll: '' | ViewMode
+}
+
+export type Watcher = {
+	id: string
+	mode: UpdateType
+	status: 'running' | 'stopped' | 'error' | 'stopping' | 'idle'
+	interval?: number
+	lastUpdate: number
+	lastMessage?: string
+}
+
+export type AppPermissions = {
+	addShares: boolean
+	addSharesExternal: boolean
+	allAccess: boolean
+	changeForeignVotes: boolean
+	comboView: boolean
+	deanonymizePoll: boolean
+	pollCreation: boolean
+	pollDownload: boolean
+	publicShares: boolean
+	seeMailAddresses: boolean
+	unrestrictedOwner: boolean
+}
+
+export type Session = {
+	appPermissions: AppPermissions
+	appSettings: AppSettingsStore
+	currentUser: User
+	route: Route
+	sessionSettings: SessionSettings
+	share: Share
+	token: string | null
+	userStatus: UserStatus
+	watcher: Watcher
+}
+
+export type SessionStore = Session
diff --git a/src/stores/shares.ts b/src/stores/shares.ts
index 8cbe4c9443..25cf40935b 100644
--- a/src/stores/shares.ts
+++ b/src/stores/shares.ts
@@ -4,55 +4,25 @@
  */
 
 import { defineStore } from 'pinia'
-import { SharesAPI } from '../Api/index.ts'
-import { Logger } from '../helpers/index.ts'
-import { useSessionStore } from './session.ts'
-import { User } from '../Types/index.ts'
-import { AxiosError } from '@nextcloud/axios'
-import { SentResults } from '../Api/modules/shares.ts'
-import { usePollGroupsStore } from './pollGroups.ts'
 
-export type ShareType =
-	| 'email'
-	| 'external'
-	| 'contact'
-	| 'user'
-	| 'group'
-	| 'admin'
-	| 'public'
-	| 'circle'
-	| 'contactGroup'
+import { Logger } from '../helpers'
+import { SharesAPI } from '../Api'
 
-export type PublicPollEmailConditions = 'mandatory' | 'optional' | 'disabled'
+import { usePollGroupsStore } from './pollGroups'
+import { useSessionStore } from './session'
 
-export type SharePurpose = 'poll' | 'pollGroup'
-
-export type Share = {
-	displayName: string
-	id: string
-	invitationSent: boolean
-	locked: boolean
-	pollId: number | null
-	groupId: number | null
-	token: string
-	type: ShareType
-	emailAddress: string
-	userId: string
-	publicPollEmail: PublicPollEmailConditions
-	user: User
-	reminderSent: boolean
-	label: string
-	URL: string
-	voted: boolean
-	deleted: boolean
-}
-
-export type Shares = {
-	shares: Share[]
-}
+import type { AxiosError } from '@nextcloud/axios'
+import type { SentResults } from '../Api/modules/shares'
+import type { User } from '../Types'
+import type {
+	Share,
+	SharesStore,
+	SharePurpose,
+	PublicPollEmailConditions,
+} from './shares.types'
 
 export const useSharesStore = defineStore('shares', {
-	state: (): Shares => ({
+	state: (): SharesStore => ({
 		shares: [],
 	}),
 
diff --git a/src/stores/shares.types.ts b/src/stores/shares.types.ts
new file mode 100644
index 0000000000..bfa90247ba
--- /dev/null
+++ b/src/stores/shares.types.ts
@@ -0,0 +1,45 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { User } from '../Types'
+
+export type ShareType =
+	| 'email'
+	| 'external'
+	| 'contact'
+	| 'user'
+	| 'group'
+	| 'admin'
+	| 'public'
+	| 'circle'
+	| 'contactGroup'
+
+export type PublicPollEmailConditions = 'mandatory' | 'optional' | 'disabled'
+
+export type SharePurpose = 'poll' | 'pollGroup'
+
+export type Share = {
+	displayName: string
+	id: string
+	invitationSent: boolean
+	locked: boolean
+	pollId: number | null
+	groupId: number | null
+	token: string
+	type: ShareType
+	emailAddress: string
+	userId: string
+	publicPollEmail: PublicPollEmailConditions
+	user: User
+	reminderSent: boolean
+	label: string
+	URL: string
+	voted: boolean
+	deleted: boolean
+}
+
+export type SharesStore = {
+	shares: Share[]
+}
diff --git a/src/stores/subscription.ts b/src/stores/subscription.ts
index 9f93b5617e..1abfcba441 100644
--- a/src/stores/subscription.ts
+++ b/src/stores/subscription.ts
@@ -3,16 +3,15 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { defineStore } from 'pinia'
-import { PublicAPI, PollsAPI } from '../Api/index.ts'
-import { Logger } from '../helpers/index.ts'
-import { useSessionStore } from './session.ts'
 import { ref } from 'vue'
-import { AxiosError } from '@nextcloud/axios'
+import { defineStore } from 'pinia'
+
+import { PublicAPI, PollsAPI } from '../Api'
+import { Logger } from '../helpers'
+
+import { useSessionStore } from './session'
 
-export type Subscription = {
-	subscribed: boolean
-}
+import type { AxiosError } from '@nextcloud/axios'
 
 export const useSubscriptionStore = defineStore('subscription', () => {
 	const subscribed = ref(false)
diff --git a/src/stores/votes.ts b/src/stores/votes.ts
index 4635f6ca13..b42f267daa 100644
--- a/src/stores/votes.ts
+++ b/src/stores/votes.ts
@@ -4,16 +4,17 @@
  */
 
 import { defineStore } from 'pinia'
-import { PublicAPI, VotesAPI } from '../Api/index.ts'
-import { Chunking, User } from '../Types/index.ts'
-import { Logger, StoreHelper } from '../helpers/index.ts'
-import { Option, useOptionsStore } from './options.ts'
-import { usePollStore } from './poll.ts'
-import { useSessionStore } from './session.ts'
-import { AxiosError } from '@nextcloud/axios'
+import { PublicAPI, VotesAPI } from '../Api'
+import { Logger, StoreHelper } from '../helpers'
 
-export type Answer = 'yes' | 'no' | 'maybe' | ''
-export type AnswerSymbol = '✔' | '❌' | '❔' | ''
+import { usePollStore } from './poll'
+import { useSessionStore } from './session'
+import { useOptionsStore } from './options'
+
+import type { AxiosError } from '@nextcloud/axios'
+import type { User } from '../Types'
+import type { Option } from './options.types'
+import type { Answer, Vote, VotesStore } from './votes.types'
 
 const answerSortOrder: { [key in Answer]: number } = {
 	yes: 1,
@@ -22,27 +23,8 @@ const answerSortOrder: { [key in Answer]: number } = {
 	'': 3,
 }
 
-export type Vote = {
-	id: number
-	pollId: number
-	optionText: string
-	answer: Answer
-	answerSymbol: AnswerSymbol
-	deleted: number
-	optionId: number
-	user: User
-}
-
-export type Votes = {
-	votes: Vote[]
-	sortByOption: number
-	meta: {
-		chunks: Chunking
-	}
-}
-
 export const useVotesStore = defineStore('votes', {
-	state: (): Votes => ({
+	state: (): VotesStore => ({
 		votes: [],
 		sortByOption: 0,
 		meta: {
@@ -75,7 +57,7 @@ export const useVotesStore = defineStore('votes', {
 				return 0
 			}),
 
-		loadedParticipants(state: Votes): number {
+		loadedParticipants(state: VotesStore): number {
 			return Math.min(
 				state.meta.chunks.loaded * state.meta.chunks.size,
 				this.participants.length,
@@ -292,6 +274,21 @@ export const useVotesStore = defineStore('votes', {
 		},
 
 		async set(payload: { option: Option; setTo: Answer }) {
+			// place a fake vote for a slightly better UX in huge polls
+			this.setItem({
+				option: payload.option,
+				vote: {
+					answer: payload.setTo,
+					optionText: payload.option.text,
+					user: useSessionStore().currentUser,
+					answerSymbol: '',
+					deleted: 0,
+					id: 0,
+					optionId: payload.option.id,
+					pollId: payload.option.pollId,
+				},
+			})
+
 			const sessionStore = useSessionStore()
 			const pollStore = usePollStore()
 			try {
diff --git a/src/stores/votes.types.ts b/src/stores/votes.types.ts
new file mode 100644
index 0000000000..e497d9c998
--- /dev/null
+++ b/src/stores/votes.types.ts
@@ -0,0 +1,28 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { Chunking, User } from '../Types'
+
+export type Answer = 'yes' | 'no' | 'maybe' | ''
+export type AnswerSymbol = '✔' | '❌' | '❔' | ''
+
+export type Vote = {
+	id: number
+	pollId: number
+	optionText: string
+	answer: Answer
+	answerSymbol: AnswerSymbol
+	deleted: number
+	optionId: number
+	user: User
+}
+
+export type VotesStore = {
+	votes: Vote[]
+	sortByOption: number
+	meta: {
+		chunks: Chunking
+	}
+}
diff --git a/src/userSettings.ts b/src/userSettings.ts
index ab17e336c5..a8457a2d72 100644
--- a/src/userSettings.ts
+++ b/src/userSettings.ts
@@ -4,7 +4,7 @@
  */
 
 import { createApp } from 'vue'
-import { pinia } from './stores/index.ts'
+import { pinia } from './stores'
 
 import UserSettingsPage from './views/UserSettingsPage.vue'
 
diff --git a/src/views/AdminSettingsPage.vue b/src/views/AdminSettingsPage.vue
index 9730c445fd..017d95fd9b 100644
--- a/src/views/AdminSettingsPage.vue
+++ b/src/views/AdminSettingsPage.vue
@@ -10,25 +10,25 @@ import { t } from '@nextcloud/l10n'
 import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
 
 import FlexSettings from '../components/Base/modules/FlexSettings.vue'
-import {
-	AdminActivities,
-	AdminArchivePolls,
-	AdminCombo,
-	AdminDeletePolls,
-	AdminEmail,
-	AdminJobs,
-	AdminLegal,
-	AdminPerformance,
-	AdminPollCreation,
-	AdminPollDownload,
-	AdminPollsInNavigation,
-	AdminShareOpenPoll,
-	AdminSharePublicCreate,
-	AdminSharePublicShowLogin,
-	AdminShowMailAddresses,
-	AdminUnrescrictedOwners,
-} from '../components/Settings/AdminSettings/index.ts'
-import { useAppSettingsStore } from '../stores/appSettings.ts'
+
+import AdminActivities from '../components/Settings/AdminSettings/AdminActivities.vue'
+import AdminArchivePolls from '../components/Settings/AdminSettings/AdminArchivePolls.vue'
+import AdminCombo from '../components/Settings/AdminSettings/AdminCombo.vue'
+import AdminDeletePolls from '../components/Settings/AdminSettings/AdminDeletePolls.vue'
+import AdminEmail from '../components/Settings/AdminSettings/AdminEmail.vue'
+import AdminJobs from '../components/Settings/AdminSettings/AdminJobs.vue'
+import AdminLegal from '../components/Settings/AdminSettings/AdminLegal.vue'
+import AdminPerformance from '../components/Settings/AdminSettings/AdminPerformance.vue'
+import AdminPollCreation from '../components/Settings/AdminSettings/AdminPollCreation.vue'
+import AdminPollDownload from '../components/Settings/AdminSettings/AdminPollDownload.vue'
+import AdminPollsInNavigation from '../components/Settings/AdminSettings/AdminPollsInNavigation.vue'
+import AdminShareOpenPoll from '../components/Settings/AdminSettings/AdminShareOpenPoll.vue'
+import AdminSharePublicCreate from '../components/Settings/AdminSettings/AdminSharePublicCreate.vue'
+import AdminSharePublicShowLogin from '../components/Settings/AdminSettings/AdminSharePublicShowLogin.vue'
+import AdminShowMailAddresses from '../components/Settings/AdminSettings/AdminShowMailAddresses.vue'
+import AdminUnrescrictedOwners from '../components/Settings/AdminSettings/AdminUnrescrictedOwners.vue'
+
+import { useAppSettingsStore } from '../stores/appSettings'
 import '../assets/scss/markdown.scss'
 
 const appSettingsStore = useAppSettingsStore()
diff --git a/src/views/Combo.vue b/src/views/Combo.vue
index abefecf5a8..06ac3c3b3d 100644
--- a/src/views/Combo.vue
+++ b/src/views/Combo.vue
@@ -14,8 +14,8 @@ import ComboTable from '../components/Combo/ComboTable.vue'
 import LoadingOverlay from '../components/Base/modules/LoadingOverlay.vue'
 import { ActionToggleSidebar } from '../components/Actions'
 import HeaderBar from '../components/Base/modules/HeaderBar.vue'
-import { PollsAppIcon } from '../components/AppIcons/index.ts'
-import { useComboStore } from '../stores/combo.ts'
+import { useComboStore } from '../stores/combo'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
 
 const comboStore = useComboStore()
 const isLoading = ref(false)
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 7380a66727..4a702c0dba 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -14,9 +14,9 @@ import NcDashboardWidget from '@nextcloud/vue/components/NcDashboardWidget'
 import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
 
-import { PollsAppIcon } from '../components/AppIcons/index.ts'
-import { Logger } from '../helpers/index.ts'
-import { usePollsStore } from '../stores/polls.ts'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
+import { Logger } from '../helpers'
+import { usePollsStore } from '../stores/polls'
 
 const dashboardWidgetProperties = {
 	emptyContentMessage: t('polls', 'No polls found for this category'),
diff --git a/src/views/Navigation.vue b/src/views/Navigation.vue
index 1b46384bf8..fcbe17bc57 100644
--- a/src/views/Navigation.vue
+++ b/src/views/Navigation.vue
@@ -5,17 +5,19 @@
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
+
 import { showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 
+import NcAppNavigationSpacer from '@nextcloud/vue/components/NcAppNavigationSpacer'
 import NcAppNavigation from '@nextcloud/vue/components/NcAppNavigation'
 import NcAppNavigationNew from '@nextcloud/vue/components/NcAppNavigationNew'
 import NcAppNavigationItem from '@nextcloud/vue/components/NcAppNavigationItem'
 import NcCounterBubble from '@nextcloud/vue/components/NcCounterBubble'
 
 // Icons
-import PollNavigationItems from '../components/Navigation/PollNavigationItems.vue'
 import ComboIcon from 'vue-material-design-icons/VectorCombine.vue'
 import AdministrationIcon from 'vue-material-design-icons/ShieldCrown.vue'
 import SettingsIcon from 'vue-material-design-icons/Cog.vue'
@@ -30,15 +32,17 @@ import ArchivedPollsIcon from 'vue-material-design-icons/Archive.vue'
 import GoToIcon from 'vue-material-design-icons/ArrowRight.vue'
 import GroupIcon from 'vue-material-design-icons/CodeBraces.vue'
 
+import PollNavigationItems from '../components/Navigation/PollNavigationItems.vue'
 import PollCreateDlg from '../components/Create/PollCreateDlg.vue'
-import { FilterType, usePollsStore } from '../stores/polls.ts'
-import { usePollGroupsStore } from '../stores/pollGroups.ts'
-import { useSessionStore } from '../stores/session.ts'
-import { usePreferencesStore } from '../stores/preferences.ts'
 import ActionAddPoll from '../components/Actions/modules/ActionAddPoll.vue'
-import { Event } from '../Types/index.ts'
-import { useRouter } from 'vue-router'
-import { NcAppNavigationSpacer } from '@nextcloud/vue'
+import { Event } from '../Types'
+
+import { usePollsStore } from '../stores/polls'
+import { usePollGroupsStore } from '../stores/pollGroups'
+import { useSessionStore } from '../stores/session'
+import { usePreferencesStore } from '../stores/preferences'
+
+import type { FilterType } from '../stores/polls.types'
 
 const router = useRouter()
 
diff --git a/src/views/PollList.vue b/src/views/PollList.vue
index b28bba84ab..3d965d47ee 100644
--- a/src/views/PollList.vue
+++ b/src/views/PollList.vue
@@ -6,6 +6,7 @@
 <script setup lang="ts">
 import { computed, onMounted } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
+
 import { showError } from '@nextcloud/dialogs'
 import { t, n } from '@nextcloud/l10n'
 
@@ -14,18 +15,21 @@ import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 
 import HeaderBar from '../components/Base/modules/HeaderBar.vue'
 import IntersectionObserver from '../components/Base/modules/IntersectionObserver.vue'
-import { PollsAppIcon } from '../components/AppIcons/index.ts'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
 import PollItem from '../components/PollList/PollItem.vue'
-import { FilterType, usePollsStore } from '../stores/polls.ts'
 import PollListSort from '../components/PollList/PollListSort.vue'
 import PollItemActions from '../components/PollList/PollItemActions.vue'
 import ActionAddPoll from '../components/Actions/modules/ActionAddPoll.vue'
-import { usePreferencesStore } from '../stores/preferences.ts'
-import { useSessionStore } from '../stores/session.ts'
 import ActionToggleSidebar from '../components/Actions/modules/ActionToggleSidebar.vue'
-import { usePollGroupsStore } from '../stores/pollGroups.ts'
 import LoadingOverlay from '../components/Base/modules/LoadingOverlay.vue'
 
+import { usePreferencesStore } from '../stores/preferences'
+import { useSessionStore } from '../stores/session'
+import { usePollsStore } from '../stores/polls'
+import { usePollGroupsStore } from '../stores/pollGroups'
+
+import type { FilterType } from '../stores/polls.types'
+
 const pollsStore = usePollsStore()
 const pollGroupsStore = usePollGroupsStore()
 const preferencesStore = usePreferencesStore()
diff --git a/src/views/Reference.vue b/src/views/Reference.vue
index e0c99da090..914a8aa69e 100644
--- a/src/views/Reference.vue
+++ b/src/views/Reference.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
-import { PollsAppIcon } from '../components/AppIcons'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
 import ExpirationIcon from 'vue-material-design-icons/CalendarEnd.vue'
 import BadgeSmallDiv from '../components/Base/modules/BadgeSmallDiv.vue'
 import { t } from '@nextcloud/l10n'
diff --git a/src/views/SideBar.vue b/src/views/SideBar.vue
index b554081e80..9900eb20d6 100644
--- a/src/views/SideBar.vue
+++ b/src/views/SideBar.vue
@@ -4,29 +4,16 @@
 -->
 
 <script setup lang="ts">
-import { ref, onMounted, onUnmounted } from 'vue'
+import { ref, defineAsyncComponent, onMounted, onUnmounted } from 'vue'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 
 import NcAppSidebar from '@nextcloud/vue/components/NcAppSidebar'
 import NcAppSidebarTab from '@nextcloud/vue/components/NcAppSidebarTab'
-import { Event } from '../Types/index.ts'
+import { Event } from '../Types'
 
-import SidebarConfigurationIcon from 'vue-material-design-icons/Wrench.vue'
-import SidebarOptionsIcon from 'vue-material-design-icons/FormatListChecks.vue'
-import SidebarShareIcon from 'vue-material-design-icons/ShareVariant.vue'
-import SidebarCommentsIcon from 'vue-material-design-icons/CommentProcessing.vue'
-import SidebarActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
-
-import {
-	SideBarTabConfiguration,
-	SideBarTabComments,
-	SideBarTabOptions,
-	SideBarTabShare,
-	SideBarTabActivity,
-} from '../components/SideBar/index.js'
-import { usePollStore } from '../stores/poll.ts'
-import { useSessionStore } from '../stores/session.ts'
+import { usePollStore } from '../stores/poll'
+import { useSessionStore } from '../stores/session'
 
 const pollStore = usePollStore()
 const sessionStore = useSessionStore()
@@ -34,6 +21,38 @@ const sessionStore = useSessionStore()
 const showSidebar = ref(window.innerWidth > 920)
 const activeTab = ref(t('polls', 'Comments').toLowerCase())
 
+const SidebarConfigurationIcon = defineAsyncComponent(
+	() => import('vue-material-design-icons/Wrench.vue'),
+)
+const SidebarOptionsIcon = defineAsyncComponent(
+	() => import('vue-material-design-icons/FormatListChecks.vue'),
+)
+const SidebarShareIcon = defineAsyncComponent(
+	() => import('vue-material-design-icons/ShareVariant.vue'),
+)
+const SidebarCommentsIcon = defineAsyncComponent(
+	() => import('vue-material-design-icons/CommentProcessing.vue'),
+)
+const SidebarActivityIcon = defineAsyncComponent(
+	() => import('vue-material-design-icons/LightningBolt.vue'),
+)
+
+const SideBarTabConfiguration = defineAsyncComponent(
+	() => import('../components/SideBar/SideBarTabConfiguration.vue'),
+)
+const SideBarTabComments = defineAsyncComponent(
+	() => import('../components/SideBar/SideBarTabConfiguration.vue'),
+)
+const SideBarTabOptions = defineAsyncComponent(
+	() => import('../components/SideBar/SideBarTabConfiguration.vue'),
+)
+const SideBarTabShare = defineAsyncComponent(
+	() => import('../components/SideBar/SideBarTabConfiguration.vue'),
+)
+const SideBarTabActivity = defineAsyncComponent(
+	() => import('../components/SideBar/SideBarTabConfiguration.vue'),
+)
+
 onMounted(() => {
 	subscribe(Event.SidebarToggle, (payload) => {
 		showSidebar.value = payload?.open ?? !showSidebar.value
diff --git a/src/views/SideBarCombo.vue b/src/views/SideBarCombo.vue
index 03ca9fa4b5..8a99b31911 100644
--- a/src/views/SideBarCombo.vue
+++ b/src/views/SideBarCombo.vue
@@ -10,9 +10,9 @@ import { t } from '@nextcloud/l10n'
 import NcAppSidebar from '@nextcloud/vue/components/NcAppSidebar'
 import NcAppSidebarTab from '@nextcloud/vue/components/NcAppSidebarTab'
 
-import { PollsAppIcon } from '../components/AppIcons/index.ts'
-import { SideBarTabDatePolls } from '../components/SideBar/index.ts'
-import { Event } from '../Types/index.ts'
+import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
+import SideBarTabDatePolls from '../components/SideBar/SideBarTabDatePolls.vue'
+import { Event } from '../Types'
 
 /**
  *
diff --git a/src/views/SideBarPollGroup.vue b/src/views/SideBarPollGroup.vue
index 188c913921..d7834321f3 100644
--- a/src/views/SideBarPollGroup.vue
+++ b/src/views/SideBarPollGroup.vue
@@ -10,11 +10,11 @@ import { t } from '@nextcloud/l10n'
 
 import NcAppSidebar from '@nextcloud/vue/components/NcAppSidebar'
 import NcAppSidebarTab from '@nextcloud/vue/components/NcAppSidebarTab'
-import { Event } from '../Types/index.ts'
+import { Event } from '../Types'
 
 import SidebarShareIcon from 'vue-material-design-icons/ShareVariant.vue'
 
-import { SideBarTabPollGroupShare } from '../components/SideBar/index.js'
+import SideBarTabPollGroup from '../components/SideBar/SideBarTabSharePollGroup.vue'
 import SidebarConfigurationIcon from 'vue-material-design-icons/Wrench.vue'
 import SideBarTabConfigurationPollGroup from '../components/SideBar/SideBarTabConfigurationPollGroup.vue'
 
@@ -60,7 +60,7 @@ function closeSideBar() {
 			<template #icon>
 				<SidebarShareIcon />
 			</template>
-			<SideBarTabPollGroupShare />
+			<SideBarTabPollGroup />
 		</NcAppSidebarTab>
 	</NcAppSidebar>
 </template>
diff --git a/src/views/UserSettingsPage.vue b/src/views/UserSettingsPage.vue
index f033c3ac4d..77b6abe432 100644
--- a/src/views/UserSettingsPage.vue
+++ b/src/views/UserSettingsPage.vue
@@ -10,12 +10,11 @@ import { t } from '@nextcloud/l10n'
 import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
 
 import FlexSettings from '../components/Base/modules/FlexSettings.vue'
-import {
-	CalendarSettings,
-	FeatureSettings,
-	StyleSettings,
-} from '../components/Settings/UserSettings/index.ts'
-import { usePreferencesStore } from '../stores/preferences.ts'
+import CalendarSettings from '../components/Settings/UserSettings/CalendarSettings.vue'
+import FeatureSettings from '../components/Settings/UserSettings/FeatureSettings.vue'
+import StyleSettings from '../components/Settings/UserSettings/StyleSettings.vue'
+
+import { usePreferencesStore } from '../stores/preferences'
 
 const preferencesStore = usePreferencesStore()
 
diff --git a/src/views/Vote.vue b/src/views/Vote.vue
index 98b915606d..3c8d58d92f 100644
--- a/src/views/Vote.vue
+++ b/src/views/Vote.vue
@@ -24,17 +24,17 @@ import VoteInfoCards from '../components/Cards/VoteInfoCards.vue'
 import OptionsAddModal from '../components/Modals/OptionsAddModal.vue'
 import ActionOpenOptionsSidebar from '../components/Actions/modules/ActionOpenOptionsSidebar.vue'
 import HeaderBar from '../components/Base/modules/HeaderBar.vue'
-import CardAnonymousPollHint from '../components/Cards/modules/CardAnonymousPollHint.vue'
+import CardAnonymousPollHint from '../components/Cards/CardAnonymousPollHint.vue'
 
-import { usePollStore } from '../stores/poll.ts'
-import { useOptionsStore } from '../stores/options.ts'
-import { usePreferencesStore } from '../stores/preferences.ts'
-import { Event } from '../Types/index.ts'
+import { usePollStore } from '../stores/poll'
+import { useOptionsStore } from '../stores/options'
+import { usePreferencesStore } from '../stores/preferences'
+import { Event } from '../Types'
 import Collapsible from '../components/Base/modules/Collapsible.vue'
 import type { CollapsibleProps } from '../components/Base/modules/Collapsible.vue'
 import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import IntersectionObserver from '../components/Base/modules/IntersectionObserver.vue'
-import { useVotesStore } from '../stores/votes.ts'
+import { useVotesStore } from '../stores/votes'
 import { showError } from '@nextcloud/dialogs'
 import StickyDiv from '../components/Base/modules/StickyDiv.vue'