diff --git a/rspack.config.js b/rspack.config.js
index 29252e5ec72..b1374150960 100644
--- a/rspack.config.js
+++ b/rspack.config.js
@@ -40,19 +40,22 @@ module.exports = defineConfig((env) => {
 		devtool: isDev ? 'cheap-source-map' : 'source-map',
 
 		entry: {
-			'admin-settings': path.join(__dirname, 'src', 'mainAdminSettings.js'),
-			collections: path.join(__dirname, 'src', 'collections.js'),
+			// Main app entry point (path is used by Talk Desktop)
 			main: path.join(__dirname, 'src', 'main.js'),
-			recording: path.join(__dirname, 'src', 'mainRecording.js'),
-			'files-sidebar': path.join(__dirname, 'src', 'mainFilesSidebarLoader.js'),
-			'public-share-auth-form': path.join(__dirname, 'src', 'publicShareAuthForm.ts'),
-			'public-share-auth-sidebar': path.join(__dirname, 'src', 'mainPublicShareAuthSidebar.js'),
-			'public-share-sidebar': path.join(__dirname, 'src', 'mainPublicShareSidebar.js'),
-			'floating-call': path.join(__dirname, 'src', 'mainFloatingCallTrigger.ts'),
-			flow: path.join(__dirname, 'src', 'flow.js'),
-			deck: path.join(__dirname, 'src', 'deck.js'),
-			maps: path.join(__dirname, 'src', 'maps.js'),
-			search: path.join(__dirname, 'src', 'search.js'),
+			'admin-settings': path.join(__dirname, 'src', 'mainAdminSettings.js'),
+			// Integration apps entry points
+			collections: path.join(__dirname, 'src', 'integrations', 'collections.js'),
+			recording: path.join(__dirname, 'src', 'integrations', 'recording.js'),
+			'files-sidebar': path.join(__dirname, 'src', 'integrations', 'filesSidebarLoader.js'),
+			'public-share-auth-form': path.join(__dirname, 'src', 'integrations', 'talkPasswordProtectedAuthForm.ts'),
+			'public-share-auth-sidebar': path.join(__dirname, 'src', 'integrations', 'filesPublicShareAuthSidebar.js'),
+			'public-share-sidebar': path.join(__dirname, 'src', 'integrations', 'filesPublicShareSidebar.js'),
+			'floating-call': path.join(__dirname, 'src', 'integrations', 'floatingCallLoader.ts'),
+			flow: path.join(__dirname, 'src', 'integrations', 'flow.js'),
+			deck: path.join(__dirname, 'src', 'integrations', 'deck.js'),
+			maps: path.join(__dirname, 'src', 'integrations', 'maps.js'),
+			search: path.join(__dirname, 'src', 'integrations', 'search.js'),
+			// Styles entry point (path is used by Talk Desktop)
 			icons: path.join(__dirname, 'src', 'icons.css'),
 		},
 
diff --git a/src/views/AdminSettings.vue b/src/AdminSettingsApp.vue
similarity index 56%
rename from src/views/AdminSettings.vue
rename to src/AdminSettingsApp.vue
index ab6262cdc7f..462e8f3e6dd 100644
--- a/src/views/AdminSettings.vue
+++ b/src/AdminSettingsApp.vue
@@ -4,23 +4,23 @@
 -->
 
 <script setup lang="ts">
-import type { InitialState } from '../types/index.ts'
+import type { InitialState } from './types/index.ts'
 
 import { loadState } from '@nextcloud/initial-state'
 import { computed, ref } from 'vue'
-import AllowedGroups from '../components/AdminSettings/AllowedGroups.vue'
-import BotsSettings from '../components/AdminSettings/BotsSettings.vue'
-import FederationSettings from '../components/AdminSettings/FederationSettings.vue'
-import GeneralSettings from '../components/AdminSettings/GeneralSettings.vue'
-import HostedSignalingServer from '../components/AdminSettings/HostedSignalingServer.vue'
-import MatterbridgeIntegration from '../components/AdminSettings/MatterbridgeIntegration.vue'
-import RecordingServers from '../components/AdminSettings/RecordingServers.vue'
-import SignalingServers from '../components/AdminSettings/SignalingServers.vue'
-import SIPBridge from '../components/AdminSettings/SIPBridge.vue'
-import StunServers from '../components/AdminSettings/StunServers.vue'
-import TurnServers from '../components/AdminSettings/TurnServers.vue'
-import WebServerSetupChecks from '../components/AdminSettings/WebServerSetupChecks.vue'
-import { hasTalkFeature } from '../services/CapabilitiesManager.ts'
+import AllowedGroups from './components/AdminSettings/AllowedGroups.vue'
+import BotsSettings from './components/AdminSettings/BotsSettings.vue'
+import FederationSettings from './components/AdminSettings/FederationSettings.vue'
+import GeneralSettings from './components/AdminSettings/GeneralSettings.vue'
+import HostedSignalingServer from './components/AdminSettings/HostedSignalingServer.vue'
+import MatterbridgeIntegration from './components/AdminSettings/MatterbridgeIntegration.vue'
+import RecordingServers from './components/AdminSettings/RecordingServers.vue'
+import SignalingServers from './components/AdminSettings/SignalingServers.vue'
+import SIPBridge from './components/AdminSettings/SIPBridge.vue'
+import StunServers from './components/AdminSettings/StunServers.vue'
+import TurnServers from './components/AdminSettings/TurnServers.vue'
+import WebServerSetupChecks from './components/AdminSettings/WebServerSetupChecks.vue'
+import { hasTalkFeature } from './services/CapabilitiesManager.ts'
 
 const hasValidSubscription = loadState<InitialState['spreed']['has_valid_subscription']>('spreed', 'has_valid_subscription')
 
diff --git a/src/PublicShareAuthRequestPasswordButton.vue b/src/integrations/FilesPublicShare/FilesPublicShareAuthRequestPasswordButton.vue
similarity index 87%
rename from src/PublicShareAuthRequestPasswordButton.vue
rename to src/integrations/FilesPublicShare/FilesPublicShareAuthRequestPasswordButton.vue
index 84491c46480..cdad6947fd3 100644
--- a/src/PublicShareAuthRequestPasswordButton.vue
+++ b/src/integrations/FilesPublicShare/FilesPublicShareAuthRequestPasswordButton.vue
@@ -11,10 +11,10 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
-import IconTalkApp from '../img/app.svg?raw'
-import { getPublicShareAuthConversationToken } from './services/filesIntegrationServices.ts'
-import { useTokenStore } from './stores/token.ts'
-import { checkBrowser } from './utils/browserCheck.ts'
+import IconTalkApp from '../../../img/app.svg?raw'
+import { getPublicShareAuthConversationToken } from '../../services/filesIntegrationServices.ts'
+import { useTokenStore } from '../../stores/token.ts'
+import { checkBrowser } from '../../utils/browserCheck.ts'
 
 const tokenStore = useTokenStore()
 
diff --git a/src/PublicShareAuthSidebar.vue b/src/integrations/FilesPublicShare/FilesPublicShareAuthSidebar.vue
similarity index 85%
rename from src/PublicShareAuthSidebar.vue
rename to src/integrations/FilesPublicShare/FilesPublicShareAuthSidebar.vue
index 55eb0fea6a7..07365f06c00 100644
--- a/src/PublicShareAuthSidebar.vue
+++ b/src/integrations/FilesPublicShare/FilesPublicShareAuthSidebar.vue
@@ -30,30 +30,30 @@ import { getCurrentUser, getGuestNickname } from '@nextcloud/auth'
 import { emit } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 import { t } from '@nextcloud/l10n'
-import CallView from './components/CallView/CallView.vue'
-import MediaSettings from './components/MediaSettings/MediaSettings.vue'
-import PollManager from './components/PollViewer/PollManager.vue'
-import PollViewer from './components/PollViewer/PollViewer.vue'
-import InternalSignalingHint from './components/RightSidebar/InternalSignalingHint.vue'
-import TopBar from './components/TopBar/TopBar.vue'
-import TransitionWrapper from './components/UIShared/TransitionWrapper.vue'
-import { useGetMessagesProvider } from './composables/useGetMessages.ts'
-import { useHashCheck } from './composables/useHashCheck.js'
-import { useRecordingStatusSync } from './composables/useRecordingStatusSync.ts'
-import { useSessionIssueHandler } from './composables/useSessionIssueHandler.ts'
-import { EventBus } from './services/EventBus.ts'
+import CallView from '../../components/CallView/CallView.vue'
+import MediaSettings from '../../components/MediaSettings/MediaSettings.vue'
+import PollManager from '../../components/PollViewer/PollManager.vue'
+import PollViewer from '../../components/PollViewer/PollViewer.vue'
+import InternalSignalingHint from '../../components/RightSidebar/InternalSignalingHint.vue'
+import TopBar from '../../components/TopBar/TopBar.vue'
+import TransitionWrapper from '../../components/UIShared/TransitionWrapper.vue'
+import { useGetMessagesProvider } from '../../composables/useGetMessages.ts'
+import { useHashCheck } from '../../composables/useHashCheck.js'
+import { useRecordingStatusSync } from '../../composables/useRecordingStatusSync.ts'
+import { useSessionIssueHandler } from '../../composables/useSessionIssueHandler.ts'
+import { EventBus } from '../../services/EventBus.ts'
 import {
 	leaveConversationSync,
 	setGuestUserName,
-} from './services/participantsService.js'
-import SessionStorage from './services/SessionStorage.js'
-import { useActorStore } from './stores/actor.ts'
-import { useTokenStore } from './stores/token.ts'
-import { signalingKill } from './utils/webrtc/index.js'
+} from '../../services/participantsService.js'
+import SessionStorage from '../../services/SessionStorage.js'
+import { useActorStore } from '../../stores/actor.ts'
+import { useTokenStore } from '../../stores/token.ts'
+import { signalingKill } from '../../utils/webrtc/index.js'
 
 export default {
 
-	name: 'PublicShareAuthSidebar',
+	name: 'FilesPublicShareAuthSidebar',
 
 	components: {
 		InternalSignalingHint,
@@ -217,7 +217,7 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-@use './assets/variables.scss' as *;
+@use '../../assets/variables.scss' as *;
 
 /* Styles based on the NcAppSidebar */
 #talk-sidebar {
diff --git a/src/PublicShareSidebar.vue b/src/integrations/FilesPublicShare/FilesPublicShareSidebar.vue
similarity index 86%
rename from src/PublicShareSidebar.vue
rename to src/integrations/FilesPublicShare/FilesPublicShareSidebar.vue
index ba157a4986b..0d89c8ab3d2 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/integrations/FilesPublicShare/FilesPublicShareSidebar.vue
@@ -43,33 +43,33 @@ import { loadState } from '@nextcloud/initial-state'
 import { t } from '@nextcloud/l10n'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
-import CallFailedDialog from './components/CallView/CallFailedDialog.vue'
-import CallView from './components/CallView/CallView.vue'
-import MediaSettings from './components/MediaSettings/MediaSettings.vue'
-import PollManager from './components/PollViewer/PollManager.vue'
-import PollViewer from './components/PollViewer/PollViewer.vue'
-import InternalSignalingHint from './components/RightSidebar/InternalSignalingHint.vue'
-import CallButton from './components/TopBar/CallButton.vue'
-import TopBar from './components/TopBar/TopBar.vue'
-import TransitionWrapper from './components/UIShared/TransitionWrapper.vue'
-import { useGetMessagesProvider } from './composables/useGetMessages.ts'
-import { useHashCheck } from './composables/useHashCheck.js'
-import { useIsInCall } from './composables/useIsInCall.js'
-import { useRecordingStatusSync } from './composables/useRecordingStatusSync.ts'
-import { useSessionIssueHandler } from './composables/useSessionIssueHandler.ts'
-import { EventBus } from './services/EventBus.ts'
-import { getPublicShareConversationData } from './services/filesIntegrationServices.ts'
+import CallFailedDialog from '../../components/CallView/CallFailedDialog.vue'
+import CallView from '../../components/CallView/CallView.vue'
+import MediaSettings from '../../components/MediaSettings/MediaSettings.vue'
+import PollManager from '../../components/PollViewer/PollManager.vue'
+import PollViewer from '../../components/PollViewer/PollViewer.vue'
+import InternalSignalingHint from '../../components/RightSidebar/InternalSignalingHint.vue'
+import CallButton from '../../components/TopBar/CallButton.vue'
+import TopBar from '../../components/TopBar/TopBar.vue'
+import TransitionWrapper from '../../components/UIShared/TransitionWrapper.vue'
+import { useGetMessagesProvider } from '../../composables/useGetMessages.ts'
+import { useHashCheck } from '../../composables/useHashCheck.js'
+import { useIsInCall } from '../../composables/useIsInCall.js'
+import { useRecordingStatusSync } from '../../composables/useRecordingStatusSync.ts'
+import { useSessionIssueHandler } from '../../composables/useSessionIssueHandler.ts'
+import { EventBus } from '../../services/EventBus.ts'
+import { getPublicShareConversationData } from '../../services/filesIntegrationServices.ts'
 import {
 	leaveConversationSync,
-} from './services/participantsService.js'
-import SessionStorage from './services/SessionStorage.js'
-import { useActorStore } from './stores/actor.ts'
-import { useTokenStore } from './stores/token.ts'
-import { checkBrowser } from './utils/browserCheck.ts'
-import { signalingKill } from './utils/webrtc/index.js'
+} from '../../services/participantsService.js'
+import SessionStorage from '../../services/SessionStorage.js'
+import { useActorStore } from '../../stores/actor.ts'
+import { useTokenStore } from '../../stores/token.ts'
+import { checkBrowser } from '../../utils/browserCheck.ts'
+import { signalingKill } from '../../utils/webrtc/index.js'
 
 export default {
-	name: 'PublicShareSidebar',
+	name: 'FilesPublicShareSidebar',
 
 	components: {
 		InternalSignalingHint,
diff --git a/src/PublicShareSidebarTrigger.vue b/src/integrations/FilesPublicShare/FilesPublicShareSidebarTrigger.vue
similarity index 100%
rename from src/PublicShareSidebarTrigger.vue
rename to src/integrations/FilesPublicShare/FilesPublicShareSidebarTrigger.vue
diff --git a/src/views/FilesSidebarCallView.vue b/src/integrations/FilesSidebar/FilesSidebarCallView.vue
similarity index 86%
rename from src/views/FilesSidebarCallView.vue
rename to src/integrations/FilesSidebar/FilesSidebarCallView.vue
index a150b4f51c2..5460c494b56 100644
--- a/src/views/FilesSidebarCallView.vue
+++ b/src/integrations/FilesSidebar/FilesSidebarCallView.vue
@@ -5,11 +5,11 @@
 
 <script setup lang="ts">
 import { onBeforeUnmount } from 'vue'
-import CallView from '../components/CallView/CallView.vue'
-import TopBar from '../components/TopBar/TopBar.vue'
-import { useGetToken } from '../composables/useGetToken.ts'
-import { useHashCheck } from '../composables/useHashCheck.js'
-import { useSessionIssueHandler } from '../composables/useSessionIssueHandler.ts'
+import CallView from '../../components/CallView/CallView.vue'
+import TopBar from '../../components/TopBar/TopBar.vue'
+import { useGetToken } from '../../composables/useGetToken.ts'
+import { useHashCheck } from '../../composables/useHashCheck.js'
+import { useSessionIssueHandler } from '../../composables/useSessionIssueHandler.ts'
 
 useHashCheck()
 
@@ -84,7 +84,7 @@ header.app-sidebar-header.hidden-by-call > div:not(.talk-sidebar-callview), {
 </style>
 
 <style lang="scss" scoped>
-@use '../assets/variables.scss' as *;
+@use '../../assets/variables.scss' as *;
 
 #call-container {
 	position: relative;
diff --git a/src/views/FilesSidebarChatView.vue b/src/integrations/FilesSidebar/FilesSidebarChatView.vue
similarity index 66%
rename from src/views/FilesSidebarChatView.vue
rename to src/integrations/FilesSidebar/FilesSidebarChatView.vue
index 6ba9fd6ff7f..aaa7797d64a 100644
--- a/src/views/FilesSidebarChatView.vue
+++ b/src/integrations/FilesSidebar/FilesSidebarChatView.vue
@@ -17,15 +17,15 @@
 
 <script>
 
-import CallFailedDialog from '../components/CallView/CallFailedDialog.vue'
-import MediaSettings from '../components/MediaSettings/MediaSettings.vue'
-import PollManager from '../components/PollViewer/PollManager.vue'
-import PollViewer from '../components/PollViewer/PollViewer.vue'
-import InternalSignalingHint from '../components/RightSidebar/InternalSignalingHint.vue'
-import CallButton from '../components/TopBar/CallButton.vue'
-import { useGetMessagesProvider } from '../composables/useGetMessages.ts'
-import { useGetToken } from '../composables/useGetToken.ts'
-import { useIsInCall } from '../composables/useIsInCall.js'
+import CallFailedDialog from '../../components/CallView/CallFailedDialog.vue'
+import MediaSettings from '../../components/MediaSettings/MediaSettings.vue'
+import PollManager from '../../components/PollViewer/PollManager.vue'
+import PollViewer from '../../components/PollViewer/PollViewer.vue'
+import InternalSignalingHint from '../../components/RightSidebar/InternalSignalingHint.vue'
+import CallButton from '../../components/TopBar/CallButton.vue'
+import { useGetMessagesProvider } from '../../composables/useGetMessages.ts'
+import { useGetToken } from '../../composables/useGetToken.ts'
+import { useIsInCall } from '../../composables/useIsInCall.js'
 
 export default {
 
diff --git a/src/FilesSidebarLoaderApp.vue b/src/integrations/FilesSidebar/FilesSidebarLoaderApp.vue
similarity index 97%
rename from src/FilesSidebarLoaderApp.vue
rename to src/integrations/FilesSidebar/FilesSidebarLoaderApp.vue
index 5cac171bdb9..7169ff64eae 100644
--- a/src/FilesSidebarLoaderApp.vue
+++ b/src/integrations/FilesSidebar/FilesSidebarLoaderApp.vue
@@ -16,8 +16,8 @@ import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
 import IconMessageOutline from 'vue-material-design-icons/MessageOutline.vue'
 import IconShareVariant from 'vue-material-design-icons/ShareVariant.vue'
-import IconTalk from '../img/app-dark.svg?raw'
-import { getFileConversation } from './services/filesIntegrationServices.ts'
+import IconTalk from '../../../img/app-dark.svg?raw'
+import { getFileConversation } from '../../services/filesIntegrationServices.ts'
 
 const props = defineProps<{
 	node: INode
@@ -114,7 +114,7 @@ async function joinConversation() {
 			token.value = (await getFileConversation(props.node.fileid!)).data.ocs.data.token || ''
 		}
 
-		import('./mainFilesSidebar.js')
+		import('./filesSidebar.js')
 			.then((module) => {
 				module.mountApp(appContainer.value, props, token.value)
 				isTalkSidebarMounted.value = true
diff --git a/src/FilesSidebarTabApp.vue b/src/integrations/FilesSidebar/FilesSidebarTabApp.vue
similarity index 90%
rename from src/FilesSidebarTabApp.vue
rename to src/integrations/FilesSidebar/FilesSidebarTabApp.vue
index 9a36ec49f95..b8275a036bb 100644
--- a/src/FilesSidebarTabApp.vue
+++ b/src/integrations/FilesSidebar/FilesSidebarTabApp.vue
@@ -10,18 +10,18 @@
 <script>
 import { getCurrentUser } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
-import FilesSidebarCallView from './views/FilesSidebarCallView.vue'
-import FilesSidebarChatView from './views/FilesSidebarChatView.vue'
-import { useIsInCall } from './composables/useIsInCall.js'
-import { useRecordingStatusSync } from './composables/useRecordingStatusSync.ts'
-import { useSessionIssueHandler } from './composables/useSessionIssueHandler.ts'
-import { EventBus } from './services/EventBus.ts'
-import { leaveConversationSync } from './services/participantsService.js'
-import SessionStorage from './services/SessionStorage.js'
-import { useActorStore } from './stores/actor.ts'
-import { useTokenStore } from './stores/token.ts'
-import { checkBrowser } from './utils/browserCheck.ts'
-import { signalingKill, signalingWebRtcKill } from './utils/webrtc/index.js'
+import FilesSidebarCallView from './FilesSidebarCallView.vue'
+import FilesSidebarChatView from './FilesSidebarChatView.vue'
+import { useIsInCall } from '../../composables/useIsInCall.js'
+import { useRecordingStatusSync } from '../../composables/useRecordingStatusSync.ts'
+import { useSessionIssueHandler } from '../../composables/useSessionIssueHandler.ts'
+import { EventBus } from '../../services/EventBus.ts'
+import { leaveConversationSync } from '../../services/participantsService.js'
+import SessionStorage from '../../services/SessionStorage.js'
+import { useActorStore } from '../../stores/actor.ts'
+import { useTokenStore } from '../../stores/token.ts'
+import { checkBrowser } from '../../utils/browserCheck.ts'
+import { signalingKill, signalingWebRtcKill } from '../../utils/webrtc/index.js'
 
 let fetchCurrentConversationIntervalId
 
diff --git a/src/mainFilesSidebar.js b/src/integrations/FilesSidebar/filesSidebar.js
similarity index 81%
rename from src/mainFilesSidebar.js
rename to src/integrations/FilesSidebar/filesSidebar.js
index 87f8f4c6f32..a31e02723cc 100644
--- a/src/mainFilesSidebar.js
+++ b/src/integrations/FilesSidebar/filesSidebar.js
@@ -5,10 +5,10 @@
 
 import { createApp } from 'vue'
 import FilesSidebarTabApp from './FilesSidebarTabApp.vue'
-import { initializeTalk } from './init.js'
-import { createMemoryRouter } from './router/router.ts'
-import store from './store/index.js'
-import pinia from './stores/pinia.ts'
+import { createMemoryRouter } from '../../router/router.ts'
+import store from '../../store/index.js'
+import pinia from '../../stores/pinia.ts'
+import { initializeTalk } from '../../utils/init.js'
 
 /**
  * Mount a Talk integration app
diff --git a/src/FloatingCallOverlay.vue b/src/integrations/FloatingCall/FloatingCallOverlay.vue
similarity index 88%
rename from src/FloatingCallOverlay.vue
rename to src/integrations/FloatingCall/FloatingCallOverlay.vue
index e2410d02ade..6e95f15756f 100644
--- a/src/FloatingCallOverlay.vue
+++ b/src/integrations/FloatingCall/FloatingCallOverlay.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-import type { Conversation } from './types/index.ts'
+import type { Conversation } from '../../types/index.ts'
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { showError } from '@nextcloud/dialogs'
@@ -16,26 +16,26 @@ import { useStore } from 'vuex'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import IconDragHorizontal from 'vue-material-design-icons/DragHorizontal.vue'
 import IconOpenInNew from 'vue-material-design-icons/OpenInNew.vue'
-import CallFailedDialog from './components/CallView/CallFailedDialog.vue'
-import CallView from './components/CallView/CallView.vue'
-import MediaSettings from './components/MediaSettings/MediaSettings.vue'
-import CallTime from './components/TopBar/CallTime.vue'
-import { useHashCheck } from './composables/useHashCheck.js'
-import { useIsInCall } from './composables/useIsInCall.js'
-import { useRecordingStatusSync } from './composables/useRecordingStatusSync.ts'
-import { useSessionIssueHandler } from './composables/useSessionIssueHandler.ts'
-import { PARTICIPANT, SIGNALING } from './constants.ts'
-import { getTalkConfig } from './services/CapabilitiesManager.ts'
-import { EventBus } from './services/EventBus.ts'
+import CallFailedDialog from '../../components/CallView/CallFailedDialog.vue'
+import CallView from '../../components/CallView/CallView.vue'
+import MediaSettings from '../../components/MediaSettings/MediaSettings.vue'
+import CallTime from '../../components/TopBar/CallTime.vue'
+import { useHashCheck } from '../../composables/useHashCheck.js'
+import { useIsInCall } from '../../composables/useIsInCall.js'
+import { useRecordingStatusSync } from '../../composables/useRecordingStatusSync.ts'
+import { useSessionIssueHandler } from '../../composables/useSessionIssueHandler.ts'
+import { PARTICIPANT, SIGNALING } from '../../constants.ts'
+import { getTalkConfig } from '../../services/CapabilitiesManager.ts'
+import { EventBus } from '../../services/EventBus.ts'
 import {
 	leaveConversationSync,
-} from './services/participantsService.js'
-import SessionStorage from './services/SessionStorage.js'
-import { useActorStore } from './stores/actor.ts'
-import { useTokenStore } from './stores/token.ts'
-import { checkBrowser } from './utils/browserCheck.ts'
-import { generateAbsoluteUrl } from './utils/handleUrl.ts'
-import { signalingKill, signalingWebRtcKill } from './utils/webrtc/index.js'
+} from '../../services/participantsService.js'
+import SessionStorage from '../../services/SessionStorage.js'
+import { useActorStore } from '../../stores/actor.ts'
+import { useTokenStore } from '../../stores/token.ts'
+import { checkBrowser } from '../../utils/browserCheck.ts'
+import { generateAbsoluteUrl } from '../../utils/handleUrl.ts'
+import { signalingKill, signalingWebRtcKill } from '../../utils/webrtc/index.js'
 
 const props = defineProps<{
 	token: string
@@ -289,7 +289,7 @@ async function fetchCurrentConversation() {
 </template>
 
 <style lang="scss" scoped>
-@use './assets/variables.scss' as *;
+@use '../../assets/variables.scss' as *;
 
 .floating-call__container {
 	position: fixed;
diff --git a/src/mainFloatingCall.ts b/src/integrations/FloatingCall/floatingCall.ts
similarity index 81%
rename from src/mainFloatingCall.ts
rename to src/integrations/FloatingCall/floatingCall.ts
index b5ab5d0fe3e..003c56e7521 100644
--- a/src/mainFloatingCall.ts
+++ b/src/integrations/FloatingCall/floatingCall.ts
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Conversation } from './types/index.ts'
+import type { Conversation } from '../../types/index.ts'
 
 import { createApp, defineAsyncComponent, reactive } from 'vue'
-import { CONVERSATION } from './constants.ts'
-import { initializeTalk } from './init.js'
-import { createMemoryRouter } from './router/router.ts'
-import { createConversation } from './services/conversationsService.ts'
-import store from './store/index.js'
-import pinia from './stores/pinia.ts'
+import { CONVERSATION } from '../../constants.ts'
+import { createMemoryRouter } from '../../router/router.ts'
+import { createConversation } from '../../services/conversationsService.ts'
+import store from '../../store/index.js'
+import pinia from '../../stores/pinia.ts'
+import { initializeTalk } from '../../utils/init.js'
 
 initializeTalk()
 
diff --git a/src/RecordingApp.vue b/src/integrations/Recording/RecordingApp.vue
similarity index 82%
rename from src/RecordingApp.vue
rename to src/integrations/Recording/RecordingApp.vue
index f7bada6859f..7f4692adb83 100644
--- a/src/RecordingApp.vue
+++ b/src/integrations/Recording/RecordingApp.vue
@@ -6,12 +6,12 @@
 <script setup lang="ts">
 import { onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import CallView from './components/CallView/CallView.vue'
-import { useGetToken } from './composables/useGetToken.ts'
-import SessionStorage from './services/SessionStorage.js'
-import { useSoundsStore } from './stores/sounds.js'
-import { useTokenStore } from './stores/token.ts'
-import { signalingKill } from './utils/webrtc/index.js'
+import CallView from '../../components/CallView/CallView.vue'
+import { useGetToken } from '../../composables/useGetToken.ts'
+import SessionStorage from '../../services/SessionStorage.js'
+import { useSoundsStore } from '../../stores/sounds.js'
+import { useTokenStore } from '../../stores/token.ts'
+import { signalingKill } from '../../utils/webrtc/index.js'
 
 const router = useRouter()
 const route = useRoute()
diff --git a/src/PublicShareAuthForm.vue b/src/integrations/TalkPasswordProtected/TalkPasswordProtectedAuthForm.vue
similarity index 100%
rename from src/PublicShareAuthForm.vue
rename to src/integrations/TalkPasswordProtected/TalkPasswordProtectedAuthForm.vue
diff --git a/src/views/FlowPostToConversation.vue b/src/integrations/WorkflowEngine/FlowPostToConversation.vue
similarity index 95%
rename from src/views/FlowPostToConversation.vue
rename to src/integrations/WorkflowEngine/FlowPostToConversation.vue
index 2ce18874558..ee35332bb49 100644
--- a/src/views/FlowPostToConversation.vue
+++ b/src/integrations/WorkflowEngine/FlowPostToConversation.vue
@@ -26,8 +26,8 @@ import axios from '@nextcloud/axios'
 import { t } from '@nextcloud/l10n'
 import { generateOcsUrl } from '@nextcloud/router'
 import NcSelect from '@nextcloud/vue/components/NcSelect'
-import { CONVERSATION, FLOW, PARTICIPANT } from '../constants.ts'
-import { hasTalkFeature } from '../services/CapabilitiesManager.ts'
+import { CONVERSATION, FLOW, PARTICIPANT } from '../../constants.ts'
+import { hasTalkFeature } from '../../services/CapabilitiesManager.ts'
 
 const supportFederationV1 = hasTalkFeature('local', 'federation-v1')
 
diff --git a/src/collections.js b/src/integrations/collections.js
similarity index 90%
rename from src/collections.js
rename to src/integrations/collections.js
index abd1e6b6941..11b74e69116 100644
--- a/src/collections.js
+++ b/src/integrations/collections.js
@@ -5,7 +5,7 @@
 
 import { getCSPNonce } from '@nextcloud/auth'
 import { t } from '@nextcloud/l10n'
-import { requestRoomSelection } from './utils/requestRoomSelection.js'
+import { requestRoomSelection } from '../utils/requestRoomSelection.js'
 
 __webpack_nonce__ = getCSPNonce()
 // eslint-disable-next-line
diff --git a/src/deck.js b/src/integrations/deck.js
similarity index 94%
rename from src/deck.js
rename to src/integrations/deck.js
index 243bfdb366f..6eed645e4e4 100644
--- a/src/deck.js
+++ b/src/integrations/deck.js
@@ -8,8 +8,8 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 import { generateFilePath, generateUrl } from '@nextcloud/router'
 import escapeHtml from 'escape-html'
-import { postRichObjectToConversation } from './services/messagesService.ts'
-import { requestRoomSelection } from './utils/requestRoomSelection.js'
+import { postRichObjectToConversation } from '../services/messagesService.ts'
+import { requestRoomSelection } from '../utils/requestRoomSelection.js'
 
 import '@nextcloud/dialogs/style.css'
 
diff --git a/src/mainPublicShareAuthSidebar.js b/src/integrations/filesPublicShareAuthSidebar.js
similarity index 73%
rename from src/mainPublicShareAuthSidebar.js
rename to src/integrations/filesPublicShareAuthSidebar.js
index 338a9768806..efa8d82e819 100644
--- a/src/mainPublicShareAuthSidebar.js
+++ b/src/integrations/filesPublicShareAuthSidebar.js
@@ -6,12 +6,12 @@
 import { getCSPNonce } from '@nextcloud/auth'
 import { generateFilePath } from '@nextcloud/router'
 import { createApp } from 'vue'
-import PublicShareAuthRequestPasswordButton from './PublicShareAuthRequestPasswordButton.vue'
-import PublicShareAuthSidebar from './PublicShareAuthSidebar.vue'
-import { initializeTalkOnce } from './init.js'
-import { createMemoryRouter } from './router/router.ts'
-import store from './store/index.js'
-import pinia from './stores/pinia.ts'
+import FilesPublicShareAuthRequestPasswordButton from './FilesPublicShare/FilesPublicShareAuthRequestPasswordButton.vue'
+import FilesPublicShareAuthSidebar from './FilesPublicShare/FilesPublicShareAuthSidebar.vue'
+import { createMemoryRouter } from '../router/router.ts'
+import store from '../store/index.js'
+import pinia from '../stores/pinia.ts'
+import { initializeTalkOnce } from '../utils/init.js'
 
 initializeTalkOnce()
 
@@ -41,13 +41,13 @@ adjustLayout()
 
 const router = createMemoryRouter()
 
-createApp(PublicShareAuthRequestPasswordButton)
+createApp(FilesPublicShareAuthRequestPasswordButton)
 	.use(pinia)
 	.use(store)
 	.use(router)
 	.mount('#talk-public-share-auth')
 
-createApp(PublicShareAuthSidebar)
+createApp(FilesPublicShareAuthSidebar)
 	.use(pinia)
 	.use(store)
 	.use(router)
diff --git a/src/mainPublicShareSidebar.js b/src/integrations/filesPublicShareSidebar.js
similarity index 83%
rename from src/mainPublicShareSidebar.js
rename to src/integrations/filesPublicShareSidebar.js
index b0a53ed3358..919a643797f 100644
--- a/src/mainPublicShareSidebar.js
+++ b/src/integrations/filesPublicShareSidebar.js
@@ -7,12 +7,12 @@ import { getCSPNonce } from '@nextcloud/auth'
 import { generateFilePath } from '@nextcloud/router'
 import { getSharingToken } from '@nextcloud/sharing/public'
 import { createApp, reactive } from 'vue'
-import PublicShareSidebar from './PublicShareSidebar.vue'
-import PublicShareSidebarTrigger from './PublicShareSidebarTrigger.vue'
-import { initializeTalkOnce } from './init.js'
-import { createMemoryRouter } from './router/router.ts'
-import store from './store/index.js'
-import pinia from './stores/pinia.ts'
+import FilesPublicShareSidebar from './FilesPublicShare/FilesPublicShareSidebar.vue'
+import FilesPublicShareSidebarTrigger from './FilesPublicShare/FilesPublicShareSidebarTrigger.vue'
+import { createMemoryRouter } from '../router/router.ts'
+import store from '../store/index.js'
+import pinia from '../stores/pinia.ts'
+import { initializeTalkOnce } from '../utils/init.js'
 
 initializeTalkOnce()
 
@@ -48,7 +48,7 @@ function addTalkSidebarTrigger() {
 	const mountPoint = document.querySelector('.header-end') ?? document.getElementById('header')
 	mountPoint.appendChild(talkSidebarTriggerElement)
 
-	createApp(PublicShareSidebarTrigger, {
+	createApp(FilesPublicShareSidebarTrigger, {
 		sidebarState,
 		onClick: () => {
 			sidebarState.isOpen = !sidebarState.isOpen
@@ -68,7 +68,7 @@ function addTalkSidebar() {
 
 	const router = createMemoryRouter()
 
-	createApp(PublicShareSidebar, {
+	createApp(FilesPublicShareSidebar, {
 		shareToken: getSharingToken(),
 		state: sidebarState,
 	})
diff --git a/src/mainFilesSidebarLoader.js b/src/integrations/filesSidebarLoader.js
similarity index 92%
rename from src/mainFilesSidebarLoader.js
rename to src/integrations/filesSidebarLoader.js
index 3f1506e1799..fab357a7cd8 100644
--- a/src/mainFilesSidebarLoader.js
+++ b/src/integrations/filesSidebarLoader.js
@@ -7,7 +7,7 @@ import { getCSPNonce } from '@nextcloud/auth'
 import { FileType, getSidebar } from '@nextcloud/files'
 import { generateFilePath } from '@nextcloud/router'
 import { defineAsyncComponent, defineCustomElement } from 'vue'
-import IconTalk from '../img/app-dark.svg?raw'
+import IconTalk from '../../img/app-dark.svg?raw'
 
 // CSP config for webpack dynamic chunk loading
 __webpack_nonce__ = getCSPNonce()
@@ -20,7 +20,7 @@ __webpack_public_path__ = generateFilePath('spreed', '', 'js/')
 
 const TAB_TAG_NAME = 'talk-files_sidebar_tab'
 
-const FilesSidebarLoaderApp = defineAsyncComponent(() => import('./FilesSidebarLoaderApp.vue'))
+const FilesSidebarLoaderApp = defineAsyncComponent(() => import('./FilesSidebar/FilesSidebarLoaderApp.vue'))
 
 getSidebar()?.registerTab({
 	id: 'chat',
diff --git a/src/mainFloatingCallTrigger.ts b/src/integrations/floatingCallLoader.ts
similarity index 97%
rename from src/mainFloatingCallTrigger.ts
rename to src/integrations/floatingCallLoader.ts
index c121459773f..716e19e6a8b 100644
--- a/src/mainFloatingCallTrigger.ts
+++ b/src/integrations/floatingCallLoader.ts
@@ -57,7 +57,7 @@ function handleClick(event: PointerEvent) {
 		return
 	}
 
-	import('./mainFloatingCall.ts')
+	import('./FloatingCall/floatingCall.ts')
 		.then((module) => {
 			module.handleStartFloatingCall(url)
 		}).catch((err) => {
diff --git a/src/flow.js b/src/integrations/flow.js
similarity index 88%
rename from src/flow.js
rename to src/integrations/flow.js
index 5db4e700156..3971087918a 100644
--- a/src/flow.js
+++ b/src/integrations/flow.js
@@ -4,7 +4,7 @@
  */
 
 import { defineCustomElement } from 'vue'
-import FlowPostToConversation from './views/FlowPostToConversation.vue'
+import FlowPostToConversation from './WorkflowEngine/FlowPostToConversation.vue'
 
 const FlowPostToConversationComponent = defineCustomElement(FlowPostToConversation, {
 	shadowRoot: false,
diff --git a/src/maps.js b/src/integrations/maps.js
similarity index 94%
rename from src/maps.js
rename to src/integrations/maps.js
index d837e812eeb..db812190dca 100644
--- a/src/maps.js
+++ b/src/integrations/maps.js
@@ -8,8 +8,8 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 import { generateFilePath, generateUrl } from '@nextcloud/router'
 import escapeHtml from 'escape-html'
-import { postRichObjectToConversation } from './services/messagesService.ts'
-import { requestRoomSelection } from './utils/requestRoomSelection.js'
+import { postRichObjectToConversation } from '../services/messagesService.ts'
+import { requestRoomSelection } from '../utils/requestRoomSelection.js'
 
 import '@nextcloud/dialogs/style.css'
 
diff --git a/src/mainRecording.js b/src/integrations/recording.js
similarity index 86%
rename from src/mainRecording.js
rename to src/integrations/recording.js
index d75d7a9c134..92519fa7e1a 100644
--- a/src/mainRecording.js
+++ b/src/integrations/recording.js
@@ -7,15 +7,15 @@
 import { getCSPNonce } from '@nextcloud/auth'
 import { generateFilePath } from '@nextcloud/router'
 import { createApp, reactive } from 'vue'
-import RecordingApp from './RecordingApp.vue'
-import { createTalkRouter } from './router/router.ts'
-import store from './store/index.js'
-import pinia from './stores/pinia.ts'
+import RecordingApp from './Recording/RecordingApp.vue'
+import { createTalkRouter } from '../router/router.ts'
+import store from '../store/index.js'
+import pinia from '../stores/pinia.ts'
 import {
 	signalingGetSettingsForRecording,
 	signalingJoinCallForRecording,
 	signalingKill,
-} from './utils/webrtc/index.js'
+} from '../utils/webrtc/index.js'
 
 import '@nextcloud/dialogs/style.css'
 
diff --git a/src/search.js b/src/integrations/search.js
similarity index 93%
rename from src/search.js
rename to src/integrations/search.js
index 327c1fbb5b4..e3fa4b0b3e4 100644
--- a/src/search.js
+++ b/src/integrations/search.js
@@ -7,10 +7,10 @@ import { getCSPNonce } from '@nextcloud/auth'
 import { emit } from '@nextcloud/event-bus'
 import { t } from '@nextcloud/l10n'
 import { generateFilePath, imagePath } from '@nextcloud/router'
-import { requestRoomSelection } from './utils/requestRoomSelection.js'
+import { requestRoomSelection } from '../utils/requestRoomSelection.js'
 
 import '@nextcloud/dialogs/style.css'
-import './assets/unified-search.css'
+import '../assets/unified-search.css'
 
 /**
  *
diff --git a/src/publicShareAuthForm.ts b/src/integrations/talkPasswordProtectedAuthForm.ts
similarity index 80%
rename from src/publicShareAuthForm.ts
rename to src/integrations/talkPasswordProtectedAuthForm.ts
index 2c51f825825..f92114a8df8 100644
--- a/src/publicShareAuthForm.ts
+++ b/src/integrations/talkPasswordProtectedAuthForm.ts
@@ -6,7 +6,7 @@
 import { getCSPNonce } from '@nextcloud/auth'
 import { generateFilePath } from '@nextcloud/router'
 import { createApp } from 'vue'
-import PublicShareAuthForm from './PublicShareAuthForm.vue'
+import TalkPasswordProtectedAuthForm from './TalkPasswordProtected/TalkPasswordProtectedAuthForm.vue'
 
 __webpack_nonce__ = getCSPNonce()
 // Correct the root of the app for chunk loading
@@ -15,5 +15,5 @@ __webpack_nonce__ = getCSPNonce()
 // We do not want the index.php since we're loading files
 __webpack_public_path__ = generateFilePath('spreed', '', 'js/')
 
-createApp(PublicShareAuthForm)
+createApp(TalkPasswordProtectedAuthForm)
 	.mount('#talk-guest-auth')
diff --git a/src/main.js b/src/main.js
index 2bc60271107..4eaaf45da14 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,12 +8,12 @@ import { emit, subscribe } from '@nextcloud/event-bus'
 import { generateFilePath } from '@nextcloud/router'
 import { createApp, reactive, watch } from 'vue'
 import App from './App.vue'
-import { initializeTalkOnce } from './init.js'
 import { createTalkRouter } from './router/router.ts'
 import { SettingsAPI } from './services/SettingsAPI.ts'
 import store from './store/index.js'
 import pinia from './stores/pinia.ts'
 import { useSidebarStore } from './stores/sidebar.ts'
+import { initializeTalkOnce } from './utils/init.js'
 
 initializeTalkOnce()
 
diff --git a/src/mainAdminSettings.js b/src/mainAdminSettings.js
index ea39f6a416f..dc58c7f5b59 100644
--- a/src/mainAdminSettings.js
+++ b/src/mainAdminSettings.js
@@ -4,7 +4,7 @@
  */
 
 import { createApp } from 'vue'
-import AdminSettings from './views/AdminSettings.vue'
+import AdminSettings from './AdminSettingsApp.vue'
 
 import '@nextcloud/dialogs/style.css'
 import './assets/admin-settings.css'
diff --git a/src/init.js b/src/utils/init.js
similarity index 92%
rename from src/init.js
rename to src/utils/init.js
index 5725b0a31e2..27eea322fce 100644
--- a/src/init.js
+++ b/src/utils/init.js
@@ -6,11 +6,11 @@
 /** The purpose of this file is to wrap the logic shared by the different Talk entry points */
 
 import { reactive } from 'vue'
-import BrowserStorage from './services/BrowserStorage.js'
-import { setTalkSessionUniqueTabIdHeader } from './services/talkSessionUniqueTabId.ts'
-import { useIntegrationsStore } from './stores/integrations.js'
-import pinia from './stores/pinia.ts'
-import { isSafari } from './utils/browserCheck.ts'
+import BrowserStorage from '../services/BrowserStorage.js'
+import { setTalkSessionUniqueTabIdHeader } from '../services/talkSessionUniqueTabId.ts'
+import { useIntegrationsStore } from '../stores/integrations.js'
+import pinia from '../stores/pinia.ts'
+import { isSafari } from './browserCheck.ts'
 
 import '@nextcloud/dialogs/style.css'