diff --git a/Client/tauri-client/.gitignore b/Client/.gitignore
similarity index 100%
rename from Client/tauri-client/.gitignore
rename to Client/.gitignore
diff --git a/Client/tauri-client/.nvmrc b/Client/.nvmrc
similarity index 100%
rename from Client/tauri-client/.nvmrc
rename to Client/.nvmrc
diff --git a/Client/tauri-client/.oxlintrc.json b/Client/.oxlintrc.json
similarity index 100%
rename from Client/tauri-client/.oxlintrc.json
rename to Client/.oxlintrc.json
diff --git a/Client/tauri-client/.prettierignore b/Client/.prettierignore
similarity index 100%
rename from Client/tauri-client/.prettierignore
rename to Client/.prettierignore
diff --git a/Client/tauri-client/CLAUDE.md b/Client/CLAUDE.md
similarity index 100%
rename from Client/tauri-client/CLAUDE.md
rename to Client/CLAUDE.md
diff --git a/Client/tauri-client/eslint-rules.js b/Client/eslint-rules.js
similarity index 100%
rename from Client/tauri-client/eslint-rules.js
rename to Client/eslint-rules.js
diff --git a/Client/tauri-client/eslint.config.js b/Client/eslint.config.js
similarity index 100%
rename from Client/tauri-client/eslint.config.js
rename to Client/eslint.config.js
diff --git a/Client/tauri-client/index.html b/Client/index.html
similarity index 100%
rename from Client/tauri-client/index.html
rename to Client/index.html
diff --git a/Client/tauri-client/knip.json b/Client/knip.json
similarity index 100%
rename from Client/tauri-client/knip.json
rename to Client/knip.json
diff --git a/Client/tauri-client/package-lock.json b/Client/package-lock.json
similarity index 100%
rename from Client/tauri-client/package-lock.json
rename to Client/package-lock.json
diff --git a/Client/tauri-client/package.json b/Client/package.json
similarity index 100%
rename from Client/tauri-client/package.json
rename to Client/package.json
diff --git a/Client/tauri-client/playwright.config.admin.ts b/Client/playwright.config.admin.ts
similarity index 100%
rename from Client/tauri-client/playwright.config.admin.ts
rename to Client/playwright.config.admin.ts
diff --git a/Client/tauri-client/playwright.config.native.ts b/Client/playwright.config.native.ts
similarity index 100%
rename from Client/tauri-client/playwright.config.native.ts
rename to Client/playwright.config.native.ts
diff --git a/Client/tauri-client/playwright.config.prod.ts b/Client/playwright.config.prod.ts
similarity index 100%
rename from Client/tauri-client/playwright.config.prod.ts
rename to Client/playwright.config.prod.ts
diff --git a/Client/tauri-client/playwright.config.ts b/Client/playwright.config.ts
similarity index 100%
rename from Client/tauri-client/playwright.config.ts
rename to Client/playwright.config.ts
diff --git a/Client/tauri-client/public/rnnoise-worklet.js b/Client/public/rnnoise-worklet.js
similarity index 100%
rename from Client/tauri-client/public/rnnoise-worklet.js
rename to Client/public/rnnoise-worklet.js
diff --git a/Client/tauri-client/public/rnnoise.wasm b/Client/public/rnnoise.wasm
similarity index 100%
rename from Client/tauri-client/public/rnnoise.wasm
rename to Client/public/rnnoise.wasm
diff --git a/Client/tauri-client/public/vad-worklet.js b/Client/public/vad-worklet.js
similarity index 100%
rename from Client/tauri-client/public/vad-worklet.js
rename to Client/public/vad-worklet.js
diff --git a/Client/tauri-client/scripts/strip-appimage-bundled-libs.sh b/Client/scripts/strip-appimage-bundled-libs.sh
similarity index 100%
rename from Client/tauri-client/scripts/strip-appimage-bundled-libs.sh
rename to Client/scripts/strip-appimage-bundled-libs.sh
diff --git a/Client/tauri-client/src-tauri/.cargo/audit.toml b/Client/src-tauri/.cargo/audit.toml
similarity index 100%
rename from Client/tauri-client/src-tauri/.cargo/audit.toml
rename to Client/src-tauri/.cargo/audit.toml
diff --git a/Client/tauri-client/src-tauri/Cargo.lock b/Client/src-tauri/Cargo.lock
similarity index 100%
rename from Client/tauri-client/src-tauri/Cargo.lock
rename to Client/src-tauri/Cargo.lock
diff --git a/Client/tauri-client/src-tauri/Cargo.toml b/Client/src-tauri/Cargo.toml
similarity index 100%
rename from Client/tauri-client/src-tauri/Cargo.toml
rename to Client/src-tauri/Cargo.toml
diff --git a/Client/tauri-client/src-tauri/build.rs b/Client/src-tauri/build.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/build.rs
rename to Client/src-tauri/build.rs
diff --git a/Client/tauri-client/src-tauri/capabilities/default.json b/Client/src-tauri/capabilities/default.json
similarity index 100%
rename from Client/tauri-client/src-tauri/capabilities/default.json
rename to Client/src-tauri/capabilities/default.json
diff --git a/Client/tauri-client/src-tauri/icons/128x128.png b/Client/src-tauri/icons/128x128.png
similarity index 100%
rename from Client/tauri-client/src-tauri/icons/128x128.png
rename to Client/src-tauri/icons/128x128.png
diff --git a/Client/tauri-client/src-tauri/icons/128x128@2x.png b/Client/src-tauri/icons/128x128@2x.png
similarity index 100%
rename from Client/tauri-client/src-tauri/icons/128x128@2x.png
rename to Client/src-tauri/icons/128x128@2x.png
diff --git a/Client/tauri-client/src-tauri/icons/32x32.png b/Client/src-tauri/icons/32x32.png
similarity index 100%
rename from Client/tauri-client/src-tauri/icons/32x32.png
rename to Client/src-tauri/icons/32x32.png
diff --git a/Client/tauri-client/src-tauri/icons/icon.ico b/Client/src-tauri/icons/icon.ico
similarity index 100%
rename from Client/tauri-client/src-tauri/icons/icon.ico
rename to Client/src-tauri/icons/icon.ico
diff --git a/Client/tauri-client/src-tauri/icons/icon.png b/Client/src-tauri/icons/icon.png
similarity index 100%
rename from Client/tauri-client/src-tauri/icons/icon.png
rename to Client/src-tauri/icons/icon.png
diff --git a/Client/tauri-client/src-tauri/icons/oc-logo.svg b/Client/src-tauri/icons/oc-logo.svg
similarity index 100%
rename from Client/tauri-client/src-tauri/icons/oc-logo.svg
rename to Client/src-tauri/icons/oc-logo.svg
diff --git a/Client/tauri-client/src-tauri/src/commands.rs b/Client/src-tauri/src/commands.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/commands.rs
rename to Client/src-tauri/src/commands.rs
diff --git a/Client/tauri-client/src-tauri/src/constants.rs b/Client/src-tauri/src/constants.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/constants.rs
rename to Client/src-tauri/src/constants.rs
diff --git a/Client/tauri-client/src-tauri/src/credentials.rs b/Client/src-tauri/src/credentials.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/credentials.rs
rename to Client/src-tauri/src/credentials.rs
diff --git a/Client/tauri-client/src-tauri/src/dpapi.rs b/Client/src-tauri/src/dpapi.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/dpapi.rs
rename to Client/src-tauri/src/dpapi.rs
diff --git a/Client/tauri-client/src-tauri/src/fallback_crypto.rs b/Client/src-tauri/src/fallback_crypto.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/fallback_crypto.rs
rename to Client/src-tauri/src/fallback_crypto.rs
diff --git a/Client/tauri-client/src-tauri/src/http_proxy.rs b/Client/src-tauri/src/http_proxy.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/http_proxy.rs
rename to Client/src-tauri/src/http_proxy.rs
diff --git a/Client/tauri-client/src-tauri/src/lib.rs b/Client/src-tauri/src/lib.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/lib.rs
rename to Client/src-tauri/src/lib.rs
diff --git a/Client/tauri-client/src-tauri/src/linux_media.rs b/Client/src-tauri/src/linux_media.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/linux_media.rs
rename to Client/src-tauri/src/linux_media.rs
diff --git a/Client/tauri-client/src-tauri/src/livekit_proxy.rs b/Client/src-tauri/src/livekit_proxy.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/livekit_proxy.rs
rename to Client/src-tauri/src/livekit_proxy.rs
diff --git a/Client/tauri-client/src-tauri/src/main.rs b/Client/src-tauri/src/main.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/main.rs
rename to Client/src-tauri/src/main.rs
diff --git a/Client/tauri-client/src-tauri/src/ptt.rs b/Client/src-tauri/src/ptt.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/ptt.rs
rename to Client/src-tauri/src/ptt.rs
diff --git a/Client/tauri-client/src-tauri/src/secret_store.rs b/Client/src-tauri/src/secret_store.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/secret_store.rs
rename to Client/src-tauri/src/secret_store.rs
diff --git a/Client/tauri-client/src-tauri/src/tofu.rs b/Client/src-tauri/src/tofu.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/tofu.rs
rename to Client/src-tauri/src/tofu.rs
diff --git a/Client/tauri-client/src-tauri/src/tray.rs b/Client/src-tauri/src/tray.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/tray.rs
rename to Client/src-tauri/src/tray.rs
diff --git a/Client/tauri-client/src-tauri/src/update_commands.rs b/Client/src-tauri/src/update_commands.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/update_commands.rs
rename to Client/src-tauri/src/update_commands.rs
diff --git a/Client/tauri-client/src-tauri/src/ws_proxy.rs b/Client/src-tauri/src/ws_proxy.rs
similarity index 100%
rename from Client/tauri-client/src-tauri/src/ws_proxy.rs
rename to Client/src-tauri/src/ws_proxy.rs
diff --git a/Client/tauri-client/src-tauri/tauri.conf.json b/Client/src-tauri/tauri.conf.json
similarity index 100%
rename from Client/tauri-client/src-tauri/tauri.conf.json
rename to Client/src-tauri/tauri.conf.json
diff --git a/Client/tauri-client/src/assets/KLIPY Light with logo.svg b/Client/src/assets/KLIPY Light with logo.svg
similarity index 100%
rename from Client/tauri-client/src/assets/KLIPY Light with logo.svg
rename to Client/src/assets/KLIPY Light with logo.svg
diff --git a/Client/tauri-client/src/components/AdminActions.ts b/Client/src/components/AdminActions.ts
similarity index 100%
rename from Client/tauri-client/src/components/AdminActions.ts
rename to Client/src/components/AdminActions.ts
diff --git a/Client/tauri-client/src/components/CertMismatchModal.ts b/Client/src/components/CertMismatchModal.ts
similarity index 100%
rename from Client/tauri-client/src/components/CertMismatchModal.ts
rename to Client/src/components/CertMismatchModal.ts
diff --git a/Client/tauri-client/src/components/ChannelSidebar.ts b/Client/src/components/ChannelSidebar.ts
similarity index 100%
rename from Client/tauri-client/src/components/ChannelSidebar.ts
rename to Client/src/components/ChannelSidebar.ts
diff --git a/Client/tauri-client/src/components/ConnectedOverlay.ts b/Client/src/components/ConnectedOverlay.ts
similarity index 100%
rename from Client/tauri-client/src/components/ConnectedOverlay.ts
rename to Client/src/components/ConnectedOverlay.ts
diff --git a/Client/tauri-client/src/components/CreateChannelModal.ts b/Client/src/components/CreateChannelModal.ts
similarity index 100%
rename from Client/tauri-client/src/components/CreateChannelModal.ts
rename to Client/src/components/CreateChannelModal.ts
diff --git a/Client/tauri-client/src/components/DeleteChannelModal.ts b/Client/src/components/DeleteChannelModal.ts
similarity index 100%
rename from Client/tauri-client/src/components/DeleteChannelModal.ts
rename to Client/src/components/DeleteChannelModal.ts
diff --git a/Client/tauri-client/src/components/DmProfileSidebar.ts b/Client/src/components/DmProfileSidebar.ts
similarity index 100%
rename from Client/tauri-client/src/components/DmProfileSidebar.ts
rename to Client/src/components/DmProfileSidebar.ts
diff --git a/Client/tauri-client/src/components/DmSidebar.ts b/Client/src/components/DmSidebar.ts
similarity index 100%
rename from Client/tauri-client/src/components/DmSidebar.ts
rename to Client/src/components/DmSidebar.ts
diff --git a/Client/tauri-client/src/components/EditChannelModal.ts b/Client/src/components/EditChannelModal.ts
similarity index 100%
rename from Client/tauri-client/src/components/EditChannelModal.ts
rename to Client/src/components/EditChannelModal.ts
diff --git a/Client/tauri-client/src/components/EmojiAutocomplete.ts b/Client/src/components/EmojiAutocomplete.ts
similarity index 100%
rename from Client/tauri-client/src/components/EmojiAutocomplete.ts
rename to Client/src/components/EmojiAutocomplete.ts
diff --git a/Client/tauri-client/src/components/EmojiPicker.ts b/Client/src/components/EmojiPicker.ts
similarity index 100%
rename from Client/tauri-client/src/components/EmojiPicker.ts
rename to Client/src/components/EmojiPicker.ts
diff --git a/Client/tauri-client/src/components/GifPicker.ts b/Client/src/components/GifPicker.ts
similarity index 100%
rename from Client/tauri-client/src/components/GifPicker.ts
rename to Client/src/components/GifPicker.ts
diff --git a/Client/tauri-client/src/components/IncomingCallBanner.ts b/Client/src/components/IncomingCallBanner.ts
similarity index 100%
rename from Client/tauri-client/src/components/IncomingCallBanner.ts
rename to Client/src/components/IncomingCallBanner.ts
diff --git a/Client/tauri-client/src/components/InviteManager.ts b/Client/src/components/InviteManager.ts
similarity index 100%
rename from Client/tauri-client/src/components/InviteManager.ts
rename to Client/src/components/InviteManager.ts
diff --git a/Client/tauri-client/src/components/MemberList.ts b/Client/src/components/MemberList.ts
similarity index 100%
rename from Client/tauri-client/src/components/MemberList.ts
rename to Client/src/components/MemberList.ts
diff --git a/Client/tauri-client/src/components/MentionAutocomplete.ts b/Client/src/components/MentionAutocomplete.ts
similarity index 100%
rename from Client/tauri-client/src/components/MentionAutocomplete.ts
rename to Client/src/components/MentionAutocomplete.ts
diff --git a/Client/tauri-client/src/components/MessageInput.ts b/Client/src/components/MessageInput.ts
similarity index 100%
rename from Client/tauri-client/src/components/MessageInput.ts
rename to Client/src/components/MessageInput.ts
diff --git a/Client/tauri-client/src/components/MessageList.ts b/Client/src/components/MessageList.ts
similarity index 100%
rename from Client/tauri-client/src/components/MessageList.ts
rename to Client/src/components/MessageList.ts
diff --git a/Client/tauri-client/src/components/NsfwGate.ts b/Client/src/components/NsfwGate.ts
similarity index 100%
rename from Client/tauri-client/src/components/NsfwGate.ts
rename to Client/src/components/NsfwGate.ts
diff --git a/Client/tauri-client/src/components/PinnedMessages.ts b/Client/src/components/PinnedMessages.ts
similarity index 100%
rename from Client/tauri-client/src/components/PinnedMessages.ts
rename to Client/src/components/PinnedMessages.ts
diff --git a/Client/tauri-client/src/components/QuickSwitchOverlay.ts b/Client/src/components/QuickSwitchOverlay.ts
similarity index 100%
rename from Client/tauri-client/src/components/QuickSwitchOverlay.ts
rename to Client/src/components/QuickSwitchOverlay.ts
diff --git a/Client/tauri-client/src/components/QuickSwitcher.ts b/Client/src/components/QuickSwitcher.ts
similarity index 100%
rename from Client/tauri-client/src/components/QuickSwitcher.ts
rename to Client/src/components/QuickSwitcher.ts
diff --git a/Client/tauri-client/src/components/SearchOverlay.ts b/Client/src/components/SearchOverlay.ts
similarity index 100%
rename from Client/tauri-client/src/components/SearchOverlay.ts
rename to Client/src/components/SearchOverlay.ts
diff --git a/Client/tauri-client/src/components/ServerBanner.ts b/Client/src/components/ServerBanner.ts
similarity index 100%
rename from Client/tauri-client/src/components/ServerBanner.ts
rename to Client/src/components/ServerBanner.ts
diff --git a/Client/tauri-client/src/components/SettingsOverlay.ts b/Client/src/components/SettingsOverlay.ts
similarity index 100%
rename from Client/tauri-client/src/components/SettingsOverlay.ts
rename to Client/src/components/SettingsOverlay.ts
diff --git a/Client/tauri-client/src/components/StatusPicker.ts b/Client/src/components/StatusPicker.ts
similarity index 100%
rename from Client/tauri-client/src/components/StatusPicker.ts
rename to Client/src/components/StatusPicker.ts
diff --git a/Client/tauri-client/src/components/Toast.ts b/Client/src/components/Toast.ts
similarity index 100%
rename from Client/tauri-client/src/components/Toast.ts
rename to Client/src/components/Toast.ts
diff --git a/Client/tauri-client/src/components/TypingIndicator.ts b/Client/src/components/TypingIndicator.ts
similarity index 100%
rename from Client/tauri-client/src/components/TypingIndicator.ts
rename to Client/src/components/TypingIndicator.ts
diff --git a/Client/tauri-client/src/components/UpdateNotifier.ts b/Client/src/components/UpdateNotifier.ts
similarity index 100%
rename from Client/tauri-client/src/components/UpdateNotifier.ts
rename to Client/src/components/UpdateNotifier.ts
diff --git a/Client/tauri-client/src/components/UserBar.ts b/Client/src/components/UserBar.ts
similarity index 100%
rename from Client/tauri-client/src/components/UserBar.ts
rename to Client/src/components/UserBar.ts
diff --git a/Client/tauri-client/src/components/UserProfilePopup.ts b/Client/src/components/UserProfilePopup.ts
similarity index 100%
rename from Client/tauri-client/src/components/UserProfilePopup.ts
rename to Client/src/components/UserProfilePopup.ts
diff --git a/Client/tauri-client/src/components/VideoGrid.ts b/Client/src/components/VideoGrid.ts
similarity index 100%
rename from Client/tauri-client/src/components/VideoGrid.ts
rename to Client/src/components/VideoGrid.ts
diff --git a/Client/tauri-client/src/components/VoiceWidget.ts b/Client/src/components/VoiceWidget.ts
similarity index 100%
rename from Client/tauri-client/src/components/VoiceWidget.ts
rename to Client/src/components/VoiceWidget.ts
diff --git a/Client/tauri-client/src/components/channel-sidebar/context-menu.ts b/Client/src/components/channel-sidebar/context-menu.ts
similarity index 100%
rename from Client/tauri-client/src/components/channel-sidebar/context-menu.ts
rename to Client/src/components/channel-sidebar/context-menu.ts
diff --git a/Client/tauri-client/src/components/channel-sidebar/drag-reorder.ts b/Client/src/components/channel-sidebar/drag-reorder.ts
similarity index 100%
rename from Client/tauri-client/src/components/channel-sidebar/drag-reorder.ts
rename to Client/src/components/channel-sidebar/drag-reorder.ts
diff --git a/Client/tauri-client/src/components/channel-sidebar/volume-menu.ts b/Client/src/components/channel-sidebar/volume-menu.ts
similarity index 100%
rename from Client/tauri-client/src/components/channel-sidebar/volume-menu.ts
rename to Client/src/components/channel-sidebar/volume-menu.ts
diff --git a/Client/tauri-client/src/components/inline-autocomplete.ts b/Client/src/components/inline-autocomplete.ts
similarity index 100%
rename from Client/tauri-client/src/components/inline-autocomplete.ts
rename to Client/src/components/inline-autocomplete.ts
diff --git a/Client/tauri-client/src/components/message-list/attachments.ts b/Client/src/components/message-list/attachments.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/attachments.ts
rename to Client/src/components/message-list/attachments.ts
diff --git a/Client/tauri-client/src/components/message-list/content-parser.ts b/Client/src/components/message-list/content-parser.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/content-parser.ts
rename to Client/src/components/message-list/content-parser.ts
diff --git a/Client/tauri-client/src/components/message-list/custom-emoji.ts b/Client/src/components/message-list/custom-emoji.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/custom-emoji.ts
rename to Client/src/components/message-list/custom-emoji.ts
diff --git a/Client/tauri-client/src/components/message-list/embeds.ts b/Client/src/components/message-list/embeds.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/embeds.ts
rename to Client/src/components/message-list/embeds.ts
diff --git a/Client/tauri-client/src/components/message-list/fenwick.ts b/Client/src/components/message-list/fenwick.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/fenwick.ts
rename to Client/src/components/message-list/fenwick.ts
diff --git a/Client/tauri-client/src/components/message-list/formatting.ts b/Client/src/components/message-list/formatting.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/formatting.ts
rename to Client/src/components/message-list/formatting.ts
diff --git a/Client/tauri-client/src/components/message-list/markdown.ts b/Client/src/components/message-list/markdown.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/markdown.ts
rename to Client/src/components/message-list/markdown.ts
diff --git a/Client/tauri-client/src/components/message-list/media.ts b/Client/src/components/message-list/media.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/media.ts
rename to Client/src/components/message-list/media.ts
diff --git a/Client/tauri-client/src/components/message-list/reaction-tooltip.ts b/Client/src/components/message-list/reaction-tooltip.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/reaction-tooltip.ts
rename to Client/src/components/message-list/reaction-tooltip.ts
diff --git a/Client/tauri-client/src/components/message-list/reactions.ts b/Client/src/components/message-list/reactions.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/reactions.ts
rename to Client/src/components/message-list/reactions.ts
diff --git a/Client/tauri-client/src/components/message-list/renderers.ts b/Client/src/components/message-list/renderers.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/renderers.ts
rename to Client/src/components/message-list/renderers.ts
diff --git a/Client/tauri-client/src/components/message-list/syntax-highlight.ts b/Client/src/components/message-list/syntax-highlight.ts
similarity index 100%
rename from Client/tauri-client/src/components/message-list/syntax-highlight.ts
rename to Client/src/components/message-list/syntax-highlight.ts
diff --git a/Client/tauri-client/src/components/purge-prompt.ts b/Client/src/components/purge-prompt.ts
similarity index 100%
rename from Client/tauri-client/src/components/purge-prompt.ts
rename to Client/src/components/purge-prompt.ts
diff --git a/Client/tauri-client/src/components/settings/AccessibilityTab.ts b/Client/src/components/settings/AccessibilityTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/AccessibilityTab.ts
rename to Client/src/components/settings/AccessibilityTab.ts
diff --git a/Client/tauri-client/src/components/settings/AccountTab.ts b/Client/src/components/settings/AccountTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/AccountTab.ts
rename to Client/src/components/settings/AccountTab.ts
diff --git a/Client/tauri-client/src/components/settings/AdvancedTab.ts b/Client/src/components/settings/AdvancedTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/AdvancedTab.ts
rename to Client/src/components/settings/AdvancedTab.ts
diff --git a/Client/tauri-client/src/components/settings/AppearanceTab.ts b/Client/src/components/settings/AppearanceTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/AppearanceTab.ts
rename to Client/src/components/settings/AppearanceTab.ts
diff --git a/Client/tauri-client/src/components/settings/KeybindsTab.ts b/Client/src/components/settings/KeybindsTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/KeybindsTab.ts
rename to Client/src/components/settings/KeybindsTab.ts
diff --git a/Client/tauri-client/src/components/settings/LogsTab.ts b/Client/src/components/settings/LogsTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/LogsTab.ts
rename to Client/src/components/settings/LogsTab.ts
diff --git a/Client/tauri-client/src/components/settings/NotificationsTab.ts b/Client/src/components/settings/NotificationsTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/NotificationsTab.ts
rename to Client/src/components/settings/NotificationsTab.ts
diff --git a/Client/tauri-client/src/components/settings/TextImagesTab.ts b/Client/src/components/settings/TextImagesTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/TextImagesTab.ts
rename to Client/src/components/settings/TextImagesTab.ts
diff --git a/Client/tauri-client/src/components/settings/VoiceAudioTab.ts b/Client/src/components/settings/VoiceAudioTab.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/VoiceAudioTab.ts
rename to Client/src/components/settings/VoiceAudioTab.ts
diff --git a/Client/tauri-client/src/components/settings/helpers.ts b/Client/src/components/settings/helpers.ts
similarity index 100%
rename from Client/tauri-client/src/components/settings/helpers.ts
rename to Client/src/components/settings/helpers.ts
diff --git a/Client/tauri-client/src/lib/a11y.ts b/Client/src/lib/a11y.ts
similarity index 100%
rename from Client/tauri-client/src/lib/a11y.ts
rename to Client/src/lib/a11y.ts
diff --git a/Client/tauri-client/src/lib/admin-panel.ts b/Client/src/lib/admin-panel.ts
similarity index 100%
rename from Client/tauri-client/src/lib/admin-panel.ts
rename to Client/src/lib/admin-panel.ts
diff --git a/Client/tauri-client/src/lib/api.ts b/Client/src/lib/api.ts
similarity index 100%
rename from Client/tauri-client/src/lib/api.ts
rename to Client/src/lib/api.ts
diff --git a/Client/tauri-client/src/lib/appearance.ts b/Client/src/lib/appearance.ts
similarity index 100%
rename from Client/tauri-client/src/lib/appearance.ts
rename to Client/src/lib/appearance.ts
diff --git a/Client/tauri-client/src/lib/audioElements.ts b/Client/src/lib/audioElements.ts
similarity index 100%
rename from Client/tauri-client/src/lib/audioElements.ts
rename to Client/src/lib/audioElements.ts
diff --git a/Client/tauri-client/src/lib/audioPipeline.ts b/Client/src/lib/audioPipeline.ts
similarity index 100%
rename from Client/tauri-client/src/lib/audioPipeline.ts
rename to Client/src/lib/audioPipeline.ts
diff --git a/Client/tauri-client/src/lib/autoIdle.ts b/Client/src/lib/autoIdle.ts
similarity index 100%
rename from Client/tauri-client/src/lib/autoIdle.ts
rename to Client/src/lib/autoIdle.ts
diff --git a/Client/tauri-client/src/lib/avatar.ts b/Client/src/lib/avatar.ts
similarity index 100%
rename from Client/tauri-client/src/lib/avatar.ts
rename to Client/src/lib/avatar.ts
diff --git a/Client/tauri-client/src/lib/call-ring.ts b/Client/src/lib/call-ring.ts
similarity index 100%
rename from Client/tauri-client/src/lib/call-ring.ts
rename to Client/src/lib/call-ring.ts
diff --git a/Client/tauri-client/src/lib/cert-reconnect.ts b/Client/src/lib/cert-reconnect.ts
similarity index 100%
rename from Client/tauri-client/src/lib/cert-reconnect.ts
rename to Client/src/lib/cert-reconnect.ts
diff --git a/Client/tauri-client/src/lib/channel-mutes.ts b/Client/src/lib/channel-mutes.ts
similarity index 100%
rename from Client/tauri-client/src/lib/channel-mutes.ts
rename to Client/src/lib/channel-mutes.ts
diff --git a/Client/tauri-client/src/lib/channel-navigation.ts b/Client/src/lib/channel-navigation.ts
similarity index 100%
rename from Client/tauri-client/src/lib/channel-navigation.ts
rename to Client/src/lib/channel-navigation.ts
diff --git a/Client/tauri-client/src/lib/connectionStats.ts b/Client/src/lib/connectionStats.ts
similarity index 100%
rename from Client/tauri-client/src/lib/connectionStats.ts
rename to Client/src/lib/connectionStats.ts
diff --git a/Client/tauri-client/src/lib/constants.ts b/Client/src/lib/constants.ts
similarity index 100%
rename from Client/tauri-client/src/lib/constants.ts
rename to Client/src/lib/constants.ts
diff --git a/Client/tauri-client/src/lib/context-menu.ts b/Client/src/lib/context-menu.ts
similarity index 100%
rename from Client/tauri-client/src/lib/context-menu.ts
rename to Client/src/lib/context-menu.ts
diff --git a/Client/tauri-client/src/lib/credentials.ts b/Client/src/lib/credentials.ts
similarity index 100%
rename from Client/tauri-client/src/lib/credentials.ts
rename to Client/src/lib/credentials.ts
diff --git a/Client/tauri-client/src/lib/deep-link.ts b/Client/src/lib/deep-link.ts
similarity index 100%
rename from Client/tauri-client/src/lib/deep-link.ts
rename to Client/src/lib/deep-link.ts
diff --git a/Client/tauri-client/src/lib/deviceManager.ts b/Client/src/lib/deviceManager.ts
similarity index 100%
rename from Client/tauri-client/src/lib/deviceManager.ts
rename to Client/src/lib/deviceManager.ts
diff --git a/Client/tauri-client/src/lib/dispatcher.ts b/Client/src/lib/dispatcher.ts
similarity index 100%
rename from Client/tauri-client/src/lib/dispatcher.ts
rename to Client/src/lib/dispatcher.ts
diff --git a/Client/tauri-client/src/lib/disposable.ts b/Client/src/lib/disposable.ts
similarity index 100%
rename from Client/tauri-client/src/lib/disposable.ts
rename to Client/src/lib/disposable.ts
diff --git a/Client/tauri-client/src/lib/dom.ts b/Client/src/lib/dom.ts
similarity index 100%
rename from Client/tauri-client/src/lib/dom.ts
rename to Client/src/lib/dom.ts
diff --git a/Client/tauri-client/src/lib/e2eeCrypto.ts b/Client/src/lib/e2eeCrypto.ts
similarity index 100%
rename from Client/tauri-client/src/lib/e2eeCrypto.ts
rename to Client/src/lib/e2eeCrypto.ts
diff --git a/Client/tauri-client/src/lib/gifProvider.ts b/Client/src/lib/gifProvider.ts
similarity index 100%
rename from Client/tauri-client/src/lib/gifProvider.ts
rename to Client/src/lib/gifProvider.ts
diff --git a/Client/tauri-client/src/lib/hostValidation.ts b/Client/src/lib/hostValidation.ts
similarity index 100%
rename from Client/tauri-client/src/lib/hostValidation.ts
rename to Client/src/lib/hostValidation.ts
diff --git a/Client/tauri-client/src/lib/httpProxy.ts b/Client/src/lib/httpProxy.ts
similarity index 100%
rename from Client/tauri-client/src/lib/httpProxy.ts
rename to Client/src/lib/httpProxy.ts
diff --git a/Client/tauri-client/src/lib/icons.ts b/Client/src/lib/icons.ts
similarity index 100%
rename from Client/tauri-client/src/lib/icons.ts
rename to Client/src/lib/icons.ts
diff --git a/Client/tauri-client/src/lib/identity.ts b/Client/src/lib/identity.ts
similarity index 100%
rename from Client/tauri-client/src/lib/identity.ts
rename to Client/src/lib/identity.ts
diff --git a/Client/tauri-client/src/lib/livekitDiagnostics.ts b/Client/src/lib/livekitDiagnostics.ts
similarity index 100%
rename from Client/tauri-client/src/lib/livekitDiagnostics.ts
rename to Client/src/lib/livekitDiagnostics.ts
diff --git a/Client/tauri-client/src/lib/livekitE2EE.ts b/Client/src/lib/livekitE2EE.ts
similarity index 100%
rename from Client/tauri-client/src/lib/livekitE2EE.ts
rename to Client/src/lib/livekitE2EE.ts
diff --git a/Client/tauri-client/src/lib/livekitSession.ts b/Client/src/lib/livekitSession.ts
similarity index 100%
rename from Client/tauri-client/src/lib/livekitSession.ts
rename to Client/src/lib/livekitSession.ts
diff --git a/Client/tauri-client/src/lib/logPersistence.ts b/Client/src/lib/logPersistence.ts
similarity index 100%
rename from Client/tauri-client/src/lib/logPersistence.ts
rename to Client/src/lib/logPersistence.ts
diff --git a/Client/tauri-client/src/lib/logger.ts b/Client/src/lib/logger.ts
similarity index 100%
rename from Client/tauri-client/src/lib/logger.ts
rename to Client/src/lib/logger.ts
diff --git a/Client/tauri-client/src/lib/logout.ts b/Client/src/lib/logout.ts
similarity index 100%
rename from Client/tauri-client/src/lib/logout.ts
rename to Client/src/lib/logout.ts
diff --git a/Client/tauri-client/src/lib/media-visibility.ts b/Client/src/lib/media-visibility.ts
similarity index 100%
rename from Client/tauri-client/src/lib/media-visibility.ts
rename to Client/src/lib/media-visibility.ts
diff --git a/Client/tauri-client/src/lib/mentions.ts b/Client/src/lib/mentions.ts
similarity index 100%
rename from Client/tauri-client/src/lib/mentions.ts
rename to Client/src/lib/mentions.ts
diff --git a/Client/tauri-client/src/lib/message-navigation.ts b/Client/src/lib/message-navigation.ts
similarity index 100%
rename from Client/tauri-client/src/lib/message-navigation.ts
rename to Client/src/lib/message-navigation.ts
diff --git a/Client/tauri-client/src/lib/modalFactory.ts b/Client/src/lib/modalFactory.ts
similarity index 100%
rename from Client/tauri-client/src/lib/modalFactory.ts
rename to Client/src/lib/modalFactory.ts
diff --git a/Client/tauri-client/src/lib/navigation-guard.ts b/Client/src/lib/navigation-guard.ts
similarity index 100%
rename from Client/tauri-client/src/lib/navigation-guard.ts
rename to Client/src/lib/navigation-guard.ts
diff --git a/Client/tauri-client/src/lib/noise-suppression.ts b/Client/src/lib/noise-suppression.ts
similarity index 100%
rename from Client/tauri-client/src/lib/noise-suppression.ts
rename to Client/src/lib/noise-suppression.ts
diff --git a/Client/tauri-client/src/lib/notifications.ts b/Client/src/lib/notifications.ts
similarity index 100%
rename from Client/tauri-client/src/lib/notifications.ts
rename to Client/src/lib/notifications.ts
diff --git a/Client/tauri-client/src/lib/nsfw-gate.ts b/Client/src/lib/nsfw-gate.ts
similarity index 100%
rename from Client/tauri-client/src/lib/nsfw-gate.ts
rename to Client/src/lib/nsfw-gate.ts
diff --git a/Client/tauri-client/src/lib/os-motion.ts b/Client/src/lib/os-motion.ts
similarity index 100%
rename from Client/tauri-client/src/lib/os-motion.ts
rename to Client/src/lib/os-motion.ts
diff --git a/Client/tauri-client/src/lib/permissions.ts b/Client/src/lib/permissions.ts
similarity index 100%
rename from Client/tauri-client/src/lib/permissions.ts
rename to Client/src/lib/permissions.ts
diff --git a/Client/tauri-client/src/lib/preferences.ts b/Client/src/lib/preferences.ts
similarity index 100%
rename from Client/tauri-client/src/lib/preferences.ts
rename to Client/src/lib/preferences.ts
diff --git a/Client/tauri-client/src/lib/presence.ts b/Client/src/lib/presence.ts
similarity index 100%
rename from Client/tauri-client/src/lib/presence.ts
rename to Client/src/lib/presence.ts
diff --git a/Client/tauri-client/src/lib/profiles.ts b/Client/src/lib/profiles.ts
similarity index 100%
rename from Client/tauri-client/src/lib/profiles.ts
rename to Client/src/lib/profiles.ts
diff --git a/Client/tauri-client/src/lib/protocolTypes.ts b/Client/src/lib/protocolTypes.ts
similarity index 100%
rename from Client/tauri-client/src/lib/protocolTypes.ts
rename to Client/src/lib/protocolTypes.ts
diff --git a/Client/tauri-client/src/lib/ptt.ts b/Client/src/lib/ptt.ts
similarity index 100%
rename from Client/tauri-client/src/lib/ptt.ts
rename to Client/src/lib/ptt.ts
diff --git a/Client/tauri-client/src/lib/rate-limiter.ts b/Client/src/lib/rate-limiter.ts
similarity index 100%
rename from Client/tauri-client/src/lib/rate-limiter.ts
rename to Client/src/lib/rate-limiter.ts
diff --git a/Client/tauri-client/src/lib/read-state.ts b/Client/src/lib/read-state.ts
similarity index 100%
rename from Client/tauri-client/src/lib/read-state.ts
rename to Client/src/lib/read-state.ts
diff --git a/Client/tauri-client/src/lib/roomEventHandlers.ts b/Client/src/lib/roomEventHandlers.ts
similarity index 100%
rename from Client/tauri-client/src/lib/roomEventHandlers.ts
rename to Client/src/lib/roomEventHandlers.ts
diff --git a/Client/tauri-client/src/lib/router.ts b/Client/src/lib/router.ts
similarity index 100%
rename from Client/tauri-client/src/lib/router.ts
rename to Client/src/lib/router.ts
diff --git a/Client/tauri-client/src/lib/safe-render.ts b/Client/src/lib/safe-render.ts
similarity index 100%
rename from Client/tauri-client/src/lib/safe-render.ts
rename to Client/src/lib/safe-render.ts
diff --git a/Client/tauri-client/src/lib/screenShare.ts b/Client/src/lib/screenShare.ts
similarity index 100%
rename from Client/tauri-client/src/lib/screenShare.ts
rename to Client/src/lib/screenShare.ts
diff --git a/Client/tauri-client/src/lib/store.ts b/Client/src/lib/store.ts
similarity index 100%
rename from Client/tauri-client/src/lib/store.ts
rename to Client/src/lib/store.ts
diff --git a/Client/tauri-client/src/lib/streamPreview.ts b/Client/src/lib/streamPreview.ts
similarity index 100%
rename from Client/tauri-client/src/lib/streamPreview.ts
rename to Client/src/lib/streamPreview.ts
diff --git a/Client/tauri-client/src/lib/themes.ts b/Client/src/lib/themes.ts
similarity index 100%
rename from Client/tauri-client/src/lib/themes.ts
rename to Client/src/lib/themes.ts
diff --git a/Client/tauri-client/src/lib/toast.ts b/Client/src/lib/toast.ts
similarity index 100%
rename from Client/tauri-client/src/lib/toast.ts
rename to Client/src/lib/toast.ts
diff --git a/Client/tauri-client/src/lib/types.ts b/Client/src/lib/types.ts
similarity index 100%
rename from Client/tauri-client/src/lib/types.ts
rename to Client/src/lib/types.ts
diff --git a/Client/tauri-client/src/lib/updater.ts b/Client/src/lib/updater.ts
similarity index 100%
rename from Client/tauri-client/src/lib/updater.ts
rename to Client/src/lib/updater.ts
diff --git a/Client/tauri-client/src/lib/userStatus.ts b/Client/src/lib/userStatus.ts
similarity index 100%
rename from Client/tauri-client/src/lib/userStatus.ts
rename to Client/src/lib/userStatus.ts
diff --git a/Client/tauri-client/src/lib/window-state.ts b/Client/src/lib/window-state.ts
similarity index 100%
rename from Client/tauri-client/src/lib/window-state.ts
rename to Client/src/lib/window-state.ts
diff --git a/Client/tauri-client/src/lib/ws.ts b/Client/src/lib/ws.ts
similarity index 100%
rename from Client/tauri-client/src/lib/ws.ts
rename to Client/src/lib/ws.ts
diff --git a/Client/tauri-client/src/main.ts b/Client/src/main.ts
similarity index 100%
rename from Client/tauri-client/src/main.ts
rename to Client/src/main.ts
diff --git a/Client/tauri-client/src/pages/ConnectPage.ts b/Client/src/pages/ConnectPage.ts
similarity index 100%
rename from Client/tauri-client/src/pages/ConnectPage.ts
rename to Client/src/pages/ConnectPage.ts
diff --git a/Client/tauri-client/src/pages/MainPage.ts b/Client/src/pages/MainPage.ts
similarity index 100%
rename from Client/tauri-client/src/pages/MainPage.ts
rename to Client/src/pages/MainPage.ts
diff --git a/Client/tauri-client/src/pages/connect-page/LoginForm.ts b/Client/src/pages/connect-page/LoginForm.ts
similarity index 100%
rename from Client/tauri-client/src/pages/connect-page/LoginForm.ts
rename to Client/src/pages/connect-page/LoginForm.ts
diff --git a/Client/tauri-client/src/pages/connect-page/ServerPanel.ts b/Client/src/pages/connect-page/ServerPanel.ts
similarity index 100%
rename from Client/tauri-client/src/pages/connect-page/ServerPanel.ts
rename to Client/src/pages/connect-page/ServerPanel.ts
diff --git a/Client/tauri-client/src/pages/main-page/ChannelController.ts b/Client/src/pages/main-page/ChannelController.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/ChannelController.ts
rename to Client/src/pages/main-page/ChannelController.ts
diff --git a/Client/tauri-client/src/pages/main-page/ChatArea.ts b/Client/src/pages/main-page/ChatArea.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/ChatArea.ts
rename to Client/src/pages/main-page/ChatArea.ts
diff --git a/Client/tauri-client/src/pages/main-page/ChatHeader.ts b/Client/src/pages/main-page/ChatHeader.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/ChatHeader.ts
rename to Client/src/pages/main-page/ChatHeader.ts
diff --git a/Client/tauri-client/src/pages/main-page/GlobalKeybinds.ts b/Client/src/pages/main-page/GlobalKeybinds.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/GlobalKeybinds.ts
rename to Client/src/pages/main-page/GlobalKeybinds.ts
diff --git a/Client/tauri-client/src/pages/main-page/MemberPickerModal.ts b/Client/src/pages/main-page/MemberPickerModal.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/MemberPickerModal.ts
rename to Client/src/pages/main-page/MemberPickerModal.ts
diff --git a/Client/tauri-client/src/pages/main-page/MessageController.ts b/Client/src/pages/main-page/MessageController.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/MessageController.ts
rename to Client/src/pages/main-page/MessageController.ts
diff --git a/Client/tauri-client/src/pages/main-page/MessageJump.ts b/Client/src/pages/main-page/MessageJump.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/MessageJump.ts
rename to Client/src/pages/main-page/MessageJump.ts
diff --git a/Client/tauri-client/src/pages/main-page/OverlayManagers.ts b/Client/src/pages/main-page/OverlayManagers.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/OverlayManagers.ts
rename to Client/src/pages/main-page/OverlayManagers.ts
diff --git a/Client/tauri-client/src/pages/main-page/ReactionController.ts b/Client/src/pages/main-page/ReactionController.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/ReactionController.ts
rename to Client/src/pages/main-page/ReactionController.ts
diff --git a/Client/tauri-client/src/pages/main-page/SidebarArea.ts b/Client/src/pages/main-page/SidebarArea.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/SidebarArea.ts
rename to Client/src/pages/main-page/SidebarArea.ts
diff --git a/Client/tauri-client/src/pages/main-page/SidebarDmHelpers.ts b/Client/src/pages/main-page/SidebarDmHelpers.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/SidebarDmHelpers.ts
rename to Client/src/pages/main-page/SidebarDmHelpers.ts
diff --git a/Client/tauri-client/src/pages/main-page/SidebarDmSection.ts b/Client/src/pages/main-page/SidebarDmSection.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/SidebarDmSection.ts
rename to Client/src/pages/main-page/SidebarDmSection.ts
diff --git a/Client/tauri-client/src/pages/main-page/SidebarMemberSection.ts b/Client/src/pages/main-page/SidebarMemberSection.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/SidebarMemberSection.ts
rename to Client/src/pages/main-page/SidebarMemberSection.ts
diff --git a/Client/tauri-client/src/pages/main-page/VideoModeController.ts b/Client/src/pages/main-page/VideoModeController.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/VideoModeController.ts
rename to Client/src/pages/main-page/VideoModeController.ts
diff --git a/Client/tauri-client/src/pages/main-page/VoiceCallbacks.ts b/Client/src/pages/main-page/VoiceCallbacks.ts
similarity index 100%
rename from Client/tauri-client/src/pages/main-page/VoiceCallbacks.ts
rename to Client/src/pages/main-page/VoiceCallbacks.ts
diff --git a/Client/tauri-client/src/stores/auth.store.ts b/Client/src/stores/auth.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/auth.store.ts
rename to Client/src/stores/auth.store.ts
diff --git a/Client/tauri-client/src/stores/blocks.store.ts b/Client/src/stores/blocks.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/blocks.store.ts
rename to Client/src/stores/blocks.store.ts
diff --git a/Client/tauri-client/src/stores/channels.store.ts b/Client/src/stores/channels.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/channels.store.ts
rename to Client/src/stores/channels.store.ts
diff --git a/Client/tauri-client/src/stores/dm.store.ts b/Client/src/stores/dm.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/dm.store.ts
rename to Client/src/stores/dm.store.ts
diff --git a/Client/tauri-client/src/stores/emoji.store.ts b/Client/src/stores/emoji.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/emoji.store.ts
rename to Client/src/stores/emoji.store.ts
diff --git a/Client/tauri-client/src/stores/members.store.ts b/Client/src/stores/members.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/members.store.ts
rename to Client/src/stores/members.store.ts
diff --git a/Client/tauri-client/src/stores/messages.store.ts b/Client/src/stores/messages.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/messages.store.ts
rename to Client/src/stores/messages.store.ts
diff --git a/Client/tauri-client/src/stores/ui.store.ts b/Client/src/stores/ui.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/ui.store.ts
rename to Client/src/stores/ui.store.ts
diff --git a/Client/tauri-client/src/stores/voice.store.ts b/Client/src/stores/voice.store.ts
similarity index 100%
rename from Client/tauri-client/src/stores/voice.store.ts
rename to Client/src/stores/voice.store.ts
diff --git a/Client/tauri-client/src/styles/app.css b/Client/src/styles/app.css
similarity index 100%
rename from Client/tauri-client/src/styles/app.css
rename to Client/src/styles/app.css
diff --git a/Client/tauri-client/src/styles/base.css b/Client/src/styles/base.css
similarity index 100%
rename from Client/tauri-client/src/styles/base.css
rename to Client/src/styles/base.css
diff --git a/Client/tauri-client/src/styles/login.css b/Client/src/styles/login.css
similarity index 100%
rename from Client/tauri-client/src/styles/login.css
rename to Client/src/styles/login.css
diff --git a/Client/tauri-client/src/styles/theme-neon-glow.css b/Client/src/styles/theme-neon-glow.css
similarity index 100%
rename from Client/tauri-client/src/styles/theme-neon-glow.css
rename to Client/src/styles/theme-neon-glow.css
diff --git a/Client/tauri-client/src/styles/tokens.css b/Client/src/styles/tokens.css
similarity index 100%
rename from Client/tauri-client/src/styles/tokens.css
rename to Client/src/styles/tokens.css
diff --git a/Client/tauri-client/src/types/jitsi-rnnoise.d.ts b/Client/src/types/jitsi-rnnoise.d.ts
similarity index 100%
rename from Client/tauri-client/src/types/jitsi-rnnoise.d.ts
rename to Client/src/types/jitsi-rnnoise.d.ts
diff --git a/Client/tauri-client/src/vite-env.d.ts b/Client/src/vite-env.d.ts
similarity index 100%
rename from Client/tauri-client/src/vite-env.d.ts
rename to Client/src/vite-env.d.ts
diff --git a/Client/tauri-client/stryker.config.mjs b/Client/stryker.config.mjs
similarity index 100%
rename from Client/tauri-client/stryker.config.mjs
rename to Client/stryker.config.mjs
diff --git a/Client/tauri-client/tests/browser/smoke.test.ts b/Client/tests/browser/smoke.test.ts
similarity index 100%
rename from Client/tauri-client/tests/browser/smoke.test.ts
rename to Client/tests/browser/smoke.test.ts
diff --git a/Client/tauri-client/tests/e2e/E2E-ISSUES.md b/Client/tests/e2e/E2E-ISSUES.md
similarity index 100%
rename from Client/tauri-client/tests/e2e/E2E-ISSUES.md
rename to Client/tests/e2e/E2E-ISSUES.md
diff --git a/Client/tauri-client/tests/e2e/a11y-smoke.spec.ts b/Client/tests/e2e/a11y-smoke.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/a11y-smoke.spec.ts
rename to Client/tests/e2e/a11y-smoke.spec.ts
diff --git a/Client/tauri-client/tests/e2e/admin/admin-panel.spec.ts b/Client/tests/e2e/admin/admin-panel.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/admin/admin-panel.spec.ts
rename to Client/tests/e2e/admin/admin-panel.spec.ts
diff --git a/Client/tauri-client/tests/e2e/admin/start-server.sh b/Client/tests/e2e/admin/start-server.sh
similarity index 100%
rename from Client/tauri-client/tests/e2e/admin/start-server.sh
rename to Client/tests/e2e/admin/start-server.sh
diff --git a/Client/tauri-client/tests/e2e/banners-toasts.spec.ts b/Client/tests/e2e/banners-toasts.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/banners-toasts.spec.ts
rename to Client/tests/e2e/banners-toasts.spec.ts
diff --git a/Client/tauri-client/tests/e2e/cert-tofu.spec.ts b/Client/tests/e2e/cert-tofu.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/cert-tofu.spec.ts
rename to Client/tests/e2e/cert-tofu.spec.ts
diff --git a/Client/tauri-client/tests/e2e/channel-sidebar.spec.ts b/Client/tests/e2e/channel-sidebar.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/channel-sidebar.spec.ts
rename to Client/tests/e2e/channel-sidebar.spec.ts
diff --git a/Client/tauri-client/tests/e2e/channel-switch-messages.spec.ts b/Client/tests/e2e/channel-switch-messages.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/channel-switch-messages.spec.ts
rename to Client/tests/e2e/channel-switch-messages.spec.ts
diff --git a/Client/tauri-client/tests/e2e/chat-header.spec.ts b/Client/tests/e2e/chat-header.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/chat-header.spec.ts
rename to Client/tests/e2e/chat-header.spec.ts
diff --git a/Client/tauri-client/tests/e2e/connect-page.spec.ts b/Client/tests/e2e/connect-page.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/connect-page.spec.ts
rename to Client/tests/e2e/connect-page.spec.ts
diff --git a/Client/tauri-client/tests/e2e/connect-settings.spec.ts b/Client/tests/e2e/connect-settings.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/connect-settings.spec.ts
rename to Client/tests/e2e/connect-settings.spec.ts
diff --git a/Client/tauri-client/tests/e2e/connected-overlay.spec.ts b/Client/tests/e2e/connected-overlay.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/connected-overlay.spec.ts
rename to Client/tests/e2e/connected-overlay.spec.ts
diff --git a/Client/tauri-client/tests/e2e/dm-system.spec.ts b/Client/tests/e2e/dm-system.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/dm-system.spec.ts
rename to Client/tests/e2e/dm-system.spec.ts
diff --git a/Client/tauri-client/tests/e2e/emoji-insertion.spec.ts b/Client/tests/e2e/emoji-insertion.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/emoji-insertion.spec.ts
rename to Client/tests/e2e/emoji-insertion.spec.ts
diff --git a/Client/tauri-client/tests/e2e/emoji-voicemod.parity.spec.ts b/Client/tests/e2e/emoji-voicemod.parity.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/emoji-voicemod.parity.spec.ts
rename to Client/tests/e2e/emoji-voicemod.parity.spec.ts
diff --git a/Client/tauri-client/tests/e2e/gating-badges.parity.spec.ts b/Client/tests/e2e/gating-badges.parity.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/gating-badges.parity.spec.ts
rename to Client/tests/e2e/gating-badges.parity.spec.ts
diff --git a/Client/tauri-client/tests/e2e/global-teardown.ts b/Client/tests/e2e/global-teardown.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/global-teardown.ts
rename to Client/tests/e2e/global-teardown.ts
diff --git a/Client/tauri-client/tests/e2e/health-status.spec.ts b/Client/tests/e2e/health-status.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/health-status.spec.ts
rename to Client/tests/e2e/health-status.spec.ts
diff --git a/Client/tauri-client/tests/e2e/helpers.ts b/Client/tests/e2e/helpers.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/helpers.ts
rename to Client/tests/e2e/helpers.ts
diff --git a/Client/tauri-client/tests/e2e/logout-flow.spec.ts b/Client/tests/e2e/logout-flow.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/logout-flow.spec.ts
rename to Client/tests/e2e/logout-flow.spec.ts
diff --git a/Client/tauri-client/tests/e2e/main-layout.spec.ts b/Client/tests/e2e/main-layout.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/main-layout.spec.ts
rename to Client/tests/e2e/main-layout.spec.ts
diff --git a/Client/tauri-client/tests/e2e/member-list.spec.ts b/Client/tests/e2e/member-list.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/member-list.spec.ts
rename to Client/tests/e2e/member-list.spec.ts
diff --git a/Client/tauri-client/tests/e2e/message-actions.spec.ts b/Client/tests/e2e/message-actions.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/message-actions.spec.ts
rename to Client/tests/e2e/message-actions.spec.ts
diff --git a/Client/tauri-client/tests/e2e/message-edit-delete.spec.ts b/Client/tests/e2e/message-edit-delete.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/message-edit-delete.spec.ts
rename to Client/tests/e2e/message-edit-delete.spec.ts
diff --git a/Client/tauri-client/tests/e2e/message-input.spec.ts b/Client/tests/e2e/message-input.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/message-input.spec.ts
rename to Client/tests/e2e/message-input.spec.ts
diff --git a/Client/tauri-client/tests/e2e/message-list.spec.ts b/Client/tests/e2e/message-list.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/message-list.spec.ts
rename to Client/tests/e2e/message-list.spec.ts
diff --git a/Client/tauri-client/tests/e2e/message-send-flow.spec.ts b/Client/tests/e2e/message-send-flow.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/message-send-flow.spec.ts
rename to Client/tests/e2e/message-send-flow.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native-fixture-persistent.ts b/Client/tests/e2e/native-fixture-persistent.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native-fixture-persistent.ts
rename to Client/tests/e2e/native-fixture-persistent.ts
diff --git a/Client/tauri-client/tests/e2e/native-fixture.ts b/Client/tests/e2e/native-fixture.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native-fixture.ts
rename to Client/tests/e2e/native-fixture.ts
diff --git a/Client/tauri-client/tests/e2e/native/app-layout.spec.ts b/Client/tests/e2e/native/app-layout.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/app-layout.spec.ts
rename to Client/tests/e2e/native/app-layout.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/auth-flow.spec.ts b/Client/tests/e2e/native/auth-flow.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/auth-flow.spec.ts
rename to Client/tests/e2e/native/auth-flow.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/channel-navigation.spec.ts b/Client/tests/e2e/native/channel-navigation.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/channel-navigation.spec.ts
rename to Client/tests/e2e/native/channel-navigation.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/chat-operations.spec.ts b/Client/tests/e2e/native/chat-operations.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/chat-operations.spec.ts
rename to Client/tests/e2e/native/chat-operations.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/dm-system.spec.ts b/Client/tests/e2e/native/dm-system.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/dm-system.spec.ts
rename to Client/tests/e2e/native/dm-system.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/helpers.ts b/Client/tests/e2e/native/helpers.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/helpers.ts
rename to Client/tests/e2e/native/helpers.ts
diff --git a/Client/tauri-client/tests/e2e/native/overlays.spec.ts b/Client/tests/e2e/native/overlays.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/overlays.spec.ts
rename to Client/tests/e2e/native/overlays.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/reconnection.spec.ts b/Client/tests/e2e/native/reconnection.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/reconnection.spec.ts
rename to Client/tests/e2e/native/reconnection.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/settings-overlay.spec.ts b/Client/tests/e2e/native/settings-overlay.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/settings-overlay.spec.ts
rename to Client/tests/e2e/native/settings-overlay.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/smoke.spec.ts b/Client/tests/e2e/native/smoke.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/smoke.spec.ts
rename to Client/tests/e2e/native/smoke.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/theme-persistence.spec.ts b/Client/tests/e2e/native/theme-persistence.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/theme-persistence.spec.ts
rename to Client/tests/e2e/native/theme-persistence.spec.ts
diff --git a/Client/tauri-client/tests/e2e/native/voice-controls.spec.ts b/Client/tests/e2e/native/voice-controls.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/native/voice-controls.spec.ts
rename to Client/tests/e2e/native/voice-controls.spec.ts
diff --git a/Client/tauri-client/tests/e2e/overlays.spec.ts b/Client/tests/e2e/overlays.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/overlays.spec.ts
rename to Client/tests/e2e/overlays.spec.ts
diff --git a/Client/tauri-client/tests/e2e/reconnection.spec.ts b/Client/tests/e2e/reconnection.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/reconnection.spec.ts
rename to Client/tests/e2e/reconnection.spec.ts
diff --git a/Client/tauri-client/tests/e2e/register-flow.spec.ts b/Client/tests/e2e/register-flow.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/register-flow.spec.ts
rename to Client/tests/e2e/register-flow.spec.ts
diff --git a/Client/tauri-client/tests/e2e/reply-flow.spec.ts b/Client/tests/e2e/reply-flow.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/reply-flow.spec.ts
rename to Client/tests/e2e/reply-flow.spec.ts
diff --git a/Client/tauri-client/tests/e2e/settings-overlay.spec.ts b/Client/tests/e2e/settings-overlay.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/settings-overlay.spec.ts
rename to Client/tests/e2e/settings-overlay.spec.ts
diff --git a/Client/tauri-client/tests/e2e/sidebar-header.spec.ts b/Client/tests/e2e/sidebar-header.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/sidebar-header.spec.ts
rename to Client/tests/e2e/sidebar-header.spec.ts
diff --git a/Client/tauri-client/tests/e2e/social.parity.spec.ts b/Client/tests/e2e/social.parity.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/social.parity.spec.ts
rename to Client/tests/e2e/social.parity.spec.ts
diff --git a/Client/tauri-client/tests/e2e/theme-persistence.spec.ts b/Client/tests/e2e/theme-persistence.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/theme-persistence.spec.ts
rename to Client/tests/e2e/theme-persistence.spec.ts
diff --git a/Client/tauri-client/tests/e2e/toast.spec.ts b/Client/tests/e2e/toast.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/toast.spec.ts
rename to Client/tests/e2e/toast.spec.ts
diff --git a/Client/tauri-client/tests/e2e/totp-flow.spec.ts b/Client/tests/e2e/totp-flow.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/totp-flow.spec.ts
rename to Client/tests/e2e/totp-flow.spec.ts
diff --git a/Client/tauri-client/tests/e2e/typing-indicator-ws.spec.ts b/Client/tests/e2e/typing-indicator-ws.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/typing-indicator-ws.spec.ts
rename to Client/tests/e2e/typing-indicator-ws.spec.ts
diff --git a/Client/tauri-client/tests/e2e/typing-indicator.spec.ts b/Client/tests/e2e/typing-indicator.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/typing-indicator.spec.ts
rename to Client/tests/e2e/typing-indicator.spec.ts
diff --git a/Client/tauri-client/tests/e2e/updater.spec.ts b/Client/tests/e2e/updater.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/updater.spec.ts
rename to Client/tests/e2e/updater.spec.ts
diff --git a/Client/tauri-client/tests/e2e/user-bar.spec.ts b/Client/tests/e2e/user-bar.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/user-bar.spec.ts
rename to Client/tests/e2e/user-bar.spec.ts
diff --git a/Client/tauri-client/tests/e2e/voice-channel.spec.ts b/Client/tests/e2e/voice-channel.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/voice-channel.spec.ts
rename to Client/tests/e2e/voice-channel.spec.ts
diff --git a/Client/tauri-client/tests/e2e/voice-e2ee-verify.spec.ts b/Client/tests/e2e/voice-e2ee-verify.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/voice-e2ee-verify.spec.ts
rename to Client/tests/e2e/voice-e2ee-verify.spec.ts
diff --git a/Client/tauri-client/tests/e2e/voice-lifecycle.spec.ts b/Client/tests/e2e/voice-lifecycle.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/voice-lifecycle.spec.ts
rename to Client/tests/e2e/voice-lifecycle.spec.ts
diff --git a/Client/tauri-client/tests/e2e/voice-widget.spec.ts b/Client/tests/e2e/voice-widget.spec.ts
similarity index 100%
rename from Client/tauri-client/tests/e2e/voice-widget.spec.ts
rename to Client/tests/e2e/voice-widget.spec.ts
diff --git a/Client/tauri-client/tests/helpers/fixtures.ts b/Client/tests/helpers/fixtures.ts
similarity index 100%
rename from Client/tauri-client/tests/helpers/fixtures.ts
rename to Client/tests/helpers/fixtures.ts
diff --git a/Client/tauri-client/tests/helpers/mock-ws.ts b/Client/tests/helpers/mock-ws.ts
similarity index 100%
rename from Client/tauri-client/tests/helpers/mock-ws.ts
rename to Client/tests/helpers/mock-ws.ts
diff --git a/Client/tauri-client/tests/helpers/test-harness.ts b/Client/tests/helpers/test-harness.ts
similarity index 100%
rename from Client/tauri-client/tests/helpers/test-harness.ts
rename to Client/tests/helpers/test-harness.ts
diff --git a/Client/tauri-client/tests/helpers/test-utils.ts b/Client/tests/helpers/test-utils.ts
similarity index 100%
rename from Client/tauri-client/tests/helpers/test-utils.ts
rename to Client/tests/helpers/test-utils.ts
diff --git a/Client/tauri-client/tests/integration/stores.test.ts b/Client/tests/integration/stores.test.ts
similarity index 100%
rename from Client/tauri-client/tests/integration/stores.test.ts
rename to Client/tests/integration/stores.test.ts
diff --git a/Client/tauri-client/tests/setup.ts b/Client/tests/setup.ts
similarity index 100%
rename from Client/tauri-client/tests/setup.ts
rename to Client/tests/setup.ts
diff --git a/Client/tauri-client/tests/types/jsdom.d.ts b/Client/tests/types/jsdom.d.ts
similarity index 100%
rename from Client/tauri-client/tests/types/jsdom.d.ts
rename to Client/tests/types/jsdom.d.ts
diff --git a/Client/tauri-client/tests/unit/AccessibilityTab.test.ts b/Client/tests/unit/AccessibilityTab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/AccessibilityTab.test.ts
rename to Client/tests/unit/AccessibilityTab.test.ts
diff --git a/Client/tauri-client/tests/unit/a11y.test.ts b/Client/tests/unit/a11y.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/a11y.test.ts
rename to Client/tests/unit/a11y.test.ts
diff --git a/Client/tauri-client/tests/unit/accessibility-tab.test.ts b/Client/tests/unit/accessibility-tab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/accessibility-tab.test.ts
rename to Client/tests/unit/accessibility-tab.test.ts
diff --git a/Client/tauri-client/tests/unit/account-tab-profile.test.ts b/Client/tests/unit/account-tab-profile.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/account-tab-profile.test.ts
rename to Client/tests/unit/account-tab-profile.test.ts
diff --git a/Client/tauri-client/tests/unit/admin-actions.test.ts b/Client/tests/unit/admin-actions.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/admin-actions.test.ts
rename to Client/tests/unit/admin-actions.test.ts
diff --git a/Client/tauri-client/tests/unit/admin-panel.test.ts b/Client/tests/unit/admin-panel.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/admin-panel.test.ts
rename to Client/tests/unit/admin-panel.test.ts
diff --git a/Client/tauri-client/tests/unit/admin-static-channel-perms.test.ts b/Client/tests/unit/admin-static-channel-perms.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/admin-static-channel-perms.test.ts
rename to Client/tests/unit/admin-static-channel-perms.test.ts
diff --git a/Client/tauri-client/tests/unit/advanced-tab.test.ts b/Client/tests/unit/advanced-tab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/advanced-tab.test.ts
rename to Client/tests/unit/advanced-tab.test.ts
diff --git a/Client/tauri-client/tests/unit/api.test.ts b/Client/tests/unit/api.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/api.test.ts
rename to Client/tests/unit/api.test.ts
diff --git a/Client/tauri-client/tests/unit/appearance-high-contrast.test.ts b/Client/tests/unit/appearance-high-contrast.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/appearance-high-contrast.test.ts
rename to Client/tests/unit/appearance-high-contrast.test.ts
diff --git a/Client/tauri-client/tests/unit/appearance-tab.test.ts b/Client/tests/unit/appearance-tab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/appearance-tab.test.ts
rename to Client/tests/unit/appearance-tab.test.ts
diff --git a/Client/tauri-client/tests/unit/attachments-auth.test.ts b/Client/tests/unit/attachments-auth.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/attachments-auth.test.ts
rename to Client/tests/unit/attachments-auth.test.ts
diff --git a/Client/tauri-client/tests/unit/attachments-cache.test.ts b/Client/tests/unit/attachments-cache.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/attachments-cache.test.ts
rename to Client/tests/unit/attachments-cache.test.ts
diff --git a/Client/tauri-client/tests/unit/attachments-ipv6-host.test.ts b/Client/tests/unit/attachments-ipv6-host.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/attachments-ipv6-host.test.ts
rename to Client/tests/unit/attachments-ipv6-host.test.ts
diff --git a/Client/tauri-client/tests/unit/attachments-media.test.ts b/Client/tests/unit/attachments-media.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/attachments-media.test.ts
rename to Client/tests/unit/attachments-media.test.ts
diff --git a/Client/tauri-client/tests/unit/attachments-render.test.ts b/Client/tests/unit/attachments-render.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/attachments-render.test.ts
rename to Client/tests/unit/attachments-render.test.ts
diff --git a/Client/tauri-client/tests/unit/audio-elements.test.ts b/Client/tests/unit/audio-elements.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/audio-elements.test.ts
rename to Client/tests/unit/audio-elements.test.ts
diff --git a/Client/tauri-client/tests/unit/audio-pipeline-core.test.ts b/Client/tests/unit/audio-pipeline-core.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/audio-pipeline-core.test.ts
rename to Client/tests/unit/audio-pipeline-core.test.ts
diff --git a/Client/tauri-client/tests/unit/audio-pipeline-gain.test.ts b/Client/tests/unit/audio-pipeline-gain.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/audio-pipeline-gain.test.ts
rename to Client/tests/unit/audio-pipeline-gain.test.ts
diff --git a/Client/tauri-client/tests/unit/audio-pipeline-vad-fallback.test.ts b/Client/tests/unit/audio-pipeline-vad-fallback.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/audio-pipeline-vad-fallback.test.ts
rename to Client/tests/unit/audio-pipeline-vad-fallback.test.ts
diff --git a/Client/tauri-client/tests/unit/audio-pipeline-vad-worklet-teardown.test.ts b/Client/tests/unit/audio-pipeline-vad-worklet-teardown.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/audio-pipeline-vad-worklet-teardown.test.ts
rename to Client/tests/unit/audio-pipeline-vad-worklet-teardown.test.ts
diff --git a/Client/tauri-client/tests/unit/audio-pipeline-vad-worklet.test.ts b/Client/tests/unit/audio-pipeline-vad-worklet.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/audio-pipeline-vad-worklet.test.ts
rename to Client/tests/unit/audio-pipeline-vad-worklet.test.ts
diff --git a/Client/tauri-client/tests/unit/auth-store.test.ts b/Client/tests/unit/auth-store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/auth-store.test.ts
rename to Client/tests/unit/auth-store.test.ts
diff --git a/Client/tauri-client/tests/unit/auth.store.test.ts b/Client/tests/unit/auth.store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/auth.store.test.ts
rename to Client/tests/unit/auth.store.test.ts
diff --git a/Client/tauri-client/tests/unit/auto-idle.test.ts b/Client/tests/unit/auto-idle.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/auto-idle.test.ts
rename to Client/tests/unit/auto-idle.test.ts
diff --git a/Client/tauri-client/tests/unit/autocomplete-filters.property.test.ts b/Client/tests/unit/autocomplete-filters.property.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/autocomplete-filters.property.test.ts
rename to Client/tests/unit/autocomplete-filters.property.test.ts
diff --git a/Client/tauri-client/tests/unit/avatar.test.ts b/Client/tests/unit/avatar.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/avatar.test.ts
rename to Client/tests/unit/avatar.test.ts
diff --git a/Client/tauri-client/tests/unit/base-font-size-css.test.ts b/Client/tests/unit/base-font-size-css.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/base-font-size-css.test.ts
rename to Client/tests/unit/base-font-size-css.test.ts
diff --git a/Client/tauri-client/tests/unit/blocks-store.test.ts b/Client/tests/unit/blocks-store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/blocks-store.test.ts
rename to Client/tests/unit/blocks-store.test.ts
diff --git a/Client/tauri-client/tests/unit/call-ring.test.ts b/Client/tests/unit/call-ring.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/call-ring.test.ts
rename to Client/tests/unit/call-ring.test.ts
diff --git a/Client/tauri-client/tests/unit/capabilities-scope.test.ts b/Client/tests/unit/capabilities-scope.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/capabilities-scope.test.ts
rename to Client/tests/unit/capabilities-scope.test.ts
diff --git a/Client/tauri-client/tests/unit/cert-first-use-modal.test.ts b/Client/tests/unit/cert-first-use-modal.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/cert-first-use-modal.test.ts
rename to Client/tests/unit/cert-first-use-modal.test.ts
diff --git a/Client/tauri-client/tests/unit/cert-mismatch-modal.test.ts b/Client/tests/unit/cert-mismatch-modal.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/cert-mismatch-modal.test.ts
rename to Client/tests/unit/cert-mismatch-modal.test.ts
diff --git a/Client/tauri-client/tests/unit/cert-reconnect.test.ts b/Client/tests/unit/cert-reconnect.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/cert-reconnect.test.ts
rename to Client/tests/unit/cert-reconnect.test.ts
diff --git a/Client/tauri-client/tests/unit/channel-controller.test.ts b/Client/tests/unit/channel-controller.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/channel-controller.test.ts
rename to Client/tests/unit/channel-controller.test.ts
diff --git a/Client/tauri-client/tests/unit/channel-mute-ui.test.ts b/Client/tests/unit/channel-mute-ui.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/channel-mute-ui.test.ts
rename to Client/tests/unit/channel-mute-ui.test.ts
diff --git a/Client/tauri-client/tests/unit/channel-mutes.test.ts b/Client/tests/unit/channel-mutes.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/channel-mutes.test.ts
rename to Client/tests/unit/channel-mutes.test.ts
diff --git a/Client/tauri-client/tests/unit/channel-navigation.test.ts b/Client/tests/unit/channel-navigation.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/channel-navigation.test.ts
rename to Client/tests/unit/channel-navigation.test.ts
diff --git a/Client/tauri-client/tests/unit/channel-sidebar-read-state.test.ts b/Client/tests/unit/channel-sidebar-read-state.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/channel-sidebar-read-state.test.ts
rename to Client/tests/unit/channel-sidebar-read-state.test.ts
diff --git a/Client/tauri-client/tests/unit/channel-sidebar.test.ts b/Client/tests/unit/channel-sidebar.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/channel-sidebar.test.ts
rename to Client/tests/unit/channel-sidebar.test.ts
diff --git a/Client/tauri-client/tests/unit/channels.store.test.ts b/Client/tests/unit/channels.store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/channels.store.test.ts
rename to Client/tests/unit/channels.store.test.ts
diff --git a/Client/tauri-client/tests/unit/chat-area.test.ts b/Client/tests/unit/chat-area.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/chat-area.test.ts
rename to Client/tests/unit/chat-area.test.ts
diff --git a/Client/tauri-client/tests/unit/chat-header.test.ts b/Client/tests/unit/chat-header.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/chat-header.test.ts
rename to Client/tests/unit/chat-header.test.ts
diff --git a/Client/tauri-client/tests/unit/chat.test.ts b/Client/tests/unit/chat.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/chat.test.ts
rename to Client/tests/unit/chat.test.ts
diff --git a/Client/tauri-client/tests/unit/components/QuickSwitchOverlay.test.ts b/Client/tests/unit/components/QuickSwitchOverlay.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/components/QuickSwitchOverlay.test.ts
rename to Client/tests/unit/components/QuickSwitchOverlay.test.ts
diff --git a/Client/tauri-client/tests/unit/components/TypingIndicator.test.ts b/Client/tests/unit/components/TypingIndicator.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/components/TypingIndicator.test.ts
rename to Client/tests/unit/components/TypingIndicator.test.ts
diff --git a/Client/tauri-client/tests/unit/connect-page.test.ts b/Client/tests/unit/connect-page.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/connect-page.test.ts
rename to Client/tests/unit/connect-page.test.ts
diff --git a/Client/tauri-client/tests/unit/connected-overlay.test.ts b/Client/tests/unit/connected-overlay.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/connected-overlay.test.ts
rename to Client/tests/unit/connected-overlay.test.ts
diff --git a/Client/tauri-client/tests/unit/connection-stats.test.ts b/Client/tests/unit/connection-stats.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/connection-stats.test.ts
rename to Client/tests/unit/connection-stats.test.ts
diff --git a/Client/tauri-client/tests/unit/content-markdown.test.ts b/Client/tests/unit/content-markdown.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/content-markdown.test.ts
rename to Client/tests/unit/content-markdown.test.ts
diff --git a/Client/tauri-client/tests/unit/context-menu.test.ts b/Client/tests/unit/context-menu.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/context-menu.test.ts
rename to Client/tests/unit/context-menu.test.ts
diff --git a/Client/tauri-client/tests/unit/create-channel-modal.test.ts b/Client/tests/unit/create-channel-modal.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/create-channel-modal.test.ts
rename to Client/tests/unit/create-channel-modal.test.ts
diff --git a/Client/tauri-client/tests/unit/credentials.test.ts b/Client/tests/unit/credentials.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/credentials.test.ts
rename to Client/tests/unit/credentials.test.ts
diff --git a/Client/tauri-client/tests/unit/custom-emoji.test.ts b/Client/tests/unit/custom-emoji.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/custom-emoji.test.ts
rename to Client/tests/unit/custom-emoji.test.ts
diff --git a/Client/tauri-client/tests/unit/deep-link-init.test.ts b/Client/tests/unit/deep-link-init.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/deep-link-init.test.ts
rename to Client/tests/unit/deep-link-init.test.ts
diff --git a/Client/tauri-client/tests/unit/deep-link.test.ts b/Client/tests/unit/deep-link.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/deep-link.test.ts
rename to Client/tests/unit/deep-link.test.ts
diff --git a/Client/tauri-client/tests/unit/delete-channel-modal.test.ts b/Client/tests/unit/delete-channel-modal.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/delete-channel-modal.test.ts
rename to Client/tests/unit/delete-channel-modal.test.ts
diff --git a/Client/tauri-client/tests/unit/device-manager.test.ts b/Client/tests/unit/device-manager.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/device-manager.test.ts
rename to Client/tests/unit/device-manager.test.ts
diff --git a/Client/tauri-client/tests/unit/dispatcher.test.ts b/Client/tests/unit/dispatcher.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/dispatcher.test.ts
rename to Client/tests/unit/dispatcher.test.ts
diff --git a/Client/tauri-client/tests/unit/disposable.test.ts b/Client/tests/unit/disposable.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/disposable.test.ts
rename to Client/tests/unit/disposable.test.ts
diff --git a/Client/tauri-client/tests/unit/dm-groups.test.ts b/Client/tests/unit/dm-groups.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/dm-groups.test.ts
rename to Client/tests/unit/dm-groups.test.ts
diff --git a/Client/tauri-client/tests/unit/dm-profile-sidebar.test.ts b/Client/tests/unit/dm-profile-sidebar.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/dm-profile-sidebar.test.ts
rename to Client/tests/unit/dm-profile-sidebar.test.ts
diff --git a/Client/tauri-client/tests/unit/dm-sidebar.test.ts b/Client/tests/unit/dm-sidebar.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/dm-sidebar.test.ts
rename to Client/tests/unit/dm-sidebar.test.ts
diff --git a/Client/tauri-client/tests/unit/dm-store.test.ts b/Client/tests/unit/dm-store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/dm-store.test.ts
rename to Client/tests/unit/dm-store.test.ts
diff --git a/Client/tauri-client/tests/unit/dom.test.ts b/Client/tests/unit/dom.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/dom.test.ts
rename to Client/tests/unit/dom.test.ts
diff --git a/Client/tauri-client/tests/unit/drag-reorder.test.ts b/Client/tests/unit/drag-reorder.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/drag-reorder.test.ts
rename to Client/tests/unit/drag-reorder.test.ts
diff --git a/Client/tauri-client/tests/unit/e2eeCrypto.test.ts b/Client/tests/unit/e2eeCrypto.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/e2eeCrypto.test.ts
rename to Client/tests/unit/e2eeCrypto.test.ts
diff --git a/Client/tauri-client/tests/unit/edit-channel-modal.test.ts b/Client/tests/unit/edit-channel-modal.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/edit-channel-modal.test.ts
rename to Client/tests/unit/edit-channel-modal.test.ts
diff --git a/Client/tauri-client/tests/unit/embeds.test.ts b/Client/tests/unit/embeds.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/embeds.test.ts
rename to Client/tests/unit/embeds.test.ts
diff --git a/Client/tauri-client/tests/unit/emoji-autocomplete.test.ts b/Client/tests/unit/emoji-autocomplete.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/emoji-autocomplete.test.ts
rename to Client/tests/unit/emoji-autocomplete.test.ts
diff --git a/Client/tauri-client/tests/unit/emoji-picker.test.ts b/Client/tests/unit/emoji-picker.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/emoji-picker.test.ts
rename to Client/tests/unit/emoji-picker.test.ts
diff --git a/Client/tauri-client/tests/unit/eslint-rules.test.ts b/Client/tests/unit/eslint-rules.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/eslint-rules.test.ts
rename to Client/tests/unit/eslint-rules.test.ts
diff --git a/Client/tauri-client/tests/unit/gif-picker.test.ts b/Client/tests/unit/gif-picker.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/gif-picker.test.ts
rename to Client/tests/unit/gif-picker.test.ts
diff --git a/Client/tauri-client/tests/unit/gif-provider.test.ts b/Client/tests/unit/gif-provider.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/gif-provider.test.ts
rename to Client/tests/unit/gif-provider.test.ts
diff --git a/Client/tauri-client/tests/unit/global-keybinds.test.ts b/Client/tests/unit/global-keybinds.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/global-keybinds.test.ts
rename to Client/tests/unit/global-keybinds.test.ts
diff --git a/Client/tauri-client/tests/unit/helpers/ws-mocks.ts b/Client/tests/unit/helpers/ws-mocks.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/helpers/ws-mocks.ts
rename to Client/tests/unit/helpers/ws-mocks.ts
diff --git a/Client/tauri-client/tests/unit/host-validation.test.ts b/Client/tests/unit/host-validation.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/host-validation.test.ts
rename to Client/tests/unit/host-validation.test.ts
diff --git a/Client/tauri-client/tests/unit/http-proxy.test.ts b/Client/tests/unit/http-proxy.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/http-proxy.test.ts
rename to Client/tests/unit/http-proxy.test.ts
diff --git a/Client/tauri-client/tests/unit/icons.test.ts b/Client/tests/unit/icons.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/icons.test.ts
rename to Client/tests/unit/icons.test.ts
diff --git a/Client/tauri-client/tests/unit/identity-mismatch-modal.test.ts b/Client/tests/unit/identity-mismatch-modal.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/identity-mismatch-modal.test.ts
rename to Client/tests/unit/identity-mismatch-modal.test.ts
diff --git a/Client/tauri-client/tests/unit/identity.test.ts b/Client/tests/unit/identity.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/identity.test.ts
rename to Client/tests/unit/identity.test.ts
diff --git a/Client/tauri-client/tests/unit/invite-manager.test.ts b/Client/tests/unit/invite-manager.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/invite-manager.test.ts
rename to Client/tests/unit/invite-manager.test.ts
diff --git a/Client/tauri-client/tests/unit/keybinds-tab.test.ts b/Client/tests/unit/keybinds-tab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/keybinds-tab.test.ts
rename to Client/tests/unit/keybinds-tab.test.ts
diff --git a/Client/tauri-client/tests/unit/livekit-diagnostics.test.ts b/Client/tests/unit/livekit-diagnostics.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/livekit-diagnostics.test.ts
rename to Client/tests/unit/livekit-diagnostics.test.ts
diff --git a/Client/tauri-client/tests/unit/livekit-e2ee.test.ts b/Client/tests/unit/livekit-e2ee.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/livekit-e2ee.test.ts
rename to Client/tests/unit/livekit-e2ee.test.ts
diff --git a/Client/tauri-client/tests/unit/livekit-session.test.ts b/Client/tests/unit/livekit-session.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/livekit-session.test.ts
rename to Client/tests/unit/livekit-session.test.ts
diff --git a/Client/tauri-client/tests/unit/log-persistence.test.ts b/Client/tests/unit/log-persistence.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/log-persistence.test.ts
rename to Client/tests/unit/log-persistence.test.ts
diff --git a/Client/tauri-client/tests/unit/logger.test.ts b/Client/tests/unit/logger.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/logger.test.ts
rename to Client/tests/unit/logger.test.ts
diff --git a/Client/tauri-client/tests/unit/login-form-totp-reentrancy.test.ts b/Client/tests/unit/login-form-totp-reentrancy.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/login-form-totp-reentrancy.test.ts
rename to Client/tests/unit/login-form-totp-reentrancy.test.ts
diff --git a/Client/tauri-client/tests/unit/login-form-totp-retry.test.ts b/Client/tests/unit/login-form-totp-retry.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/login-form-totp-retry.test.ts
rename to Client/tests/unit/login-form-totp-retry.test.ts
diff --git a/Client/tauri-client/tests/unit/login-form-totp-success-latch.test.ts b/Client/tests/unit/login-form-totp-success-latch.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/login-form-totp-success-latch.test.ts
rename to Client/tests/unit/login-form-totp-success-latch.test.ts
diff --git a/Client/tauri-client/tests/unit/logout.test.ts b/Client/tests/unit/logout.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/logout.test.ts
rename to Client/tests/unit/logout.test.ts
diff --git a/Client/tauri-client/tests/unit/logs-tab.test.ts b/Client/tests/unit/logs-tab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/logs-tab.test.ts
rename to Client/tests/unit/logs-tab.test.ts
diff --git a/Client/tauri-client/tests/unit/main-page.test.ts b/Client/tests/unit/main-page.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/main-page.test.ts
rename to Client/tests/unit/main-page.test.ts
diff --git a/Client/tauri-client/tests/unit/main.test.ts b/Client/tests/unit/main.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/main.test.ts
rename to Client/tests/unit/main.test.ts
diff --git a/Client/tauri-client/tests/unit/markdown-parser.property.test.ts b/Client/tests/unit/markdown-parser.property.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/markdown-parser.property.test.ts
rename to Client/tests/unit/markdown-parser.property.test.ts
diff --git a/Client/tauri-client/tests/unit/media-cache.test.ts b/Client/tests/unit/media-cache.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/media-cache.test.ts
rename to Client/tests/unit/media-cache.test.ts
diff --git a/Client/tauri-client/tests/unit/media-visibility.test.ts b/Client/tests/unit/media-visibility.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/media-visibility.test.ts
rename to Client/tests/unit/media-visibility.test.ts
diff --git a/Client/tauri-client/tests/unit/media.test.ts b/Client/tests/unit/media.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/media.test.ts
rename to Client/tests/unit/media.test.ts
diff --git a/Client/tauri-client/tests/unit/member-list.test.ts b/Client/tests/unit/member-list.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/member-list.test.ts
rename to Client/tests/unit/member-list.test.ts
diff --git a/Client/tauri-client/tests/unit/member-picker-group.test.ts b/Client/tests/unit/member-picker-group.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/member-picker-group.test.ts
rename to Client/tests/unit/member-picker-group.test.ts
diff --git a/Client/tauri-client/tests/unit/member-picker-modal.test.ts b/Client/tests/unit/member-picker-modal.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/member-picker-modal.test.ts
rename to Client/tests/unit/member-picker-modal.test.ts
diff --git a/Client/tauri-client/tests/unit/member-profile-fields.test.ts b/Client/tests/unit/member-profile-fields.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/member-profile-fields.test.ts
rename to Client/tests/unit/member-profile-fields.test.ts
diff --git a/Client/tauri-client/tests/unit/members.store.test.ts b/Client/tests/unit/members.store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/members.store.test.ts
rename to Client/tests/unit/members.store.test.ts
diff --git a/Client/tauri-client/tests/unit/mention-autocomplete.test.ts b/Client/tests/unit/mention-autocomplete.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/mention-autocomplete.test.ts
rename to Client/tests/unit/mention-autocomplete.test.ts
diff --git a/Client/tauri-client/tests/unit/mention-emoji-parsing.property.test.ts b/Client/tests/unit/mention-emoji-parsing.property.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/mention-emoji-parsing.property.test.ts
rename to Client/tests/unit/mention-emoji-parsing.property.test.ts
diff --git a/Client/tauri-client/tests/unit/mentions-render.test.ts b/Client/tests/unit/mentions-render.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/mentions-render.test.ts
rename to Client/tests/unit/mentions-render.test.ts
diff --git a/Client/tauri-client/tests/unit/message-controller.test.ts b/Client/tests/unit/message-controller.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-controller.test.ts
rename to Client/tests/unit/message-controller.test.ts
diff --git a/Client/tauri-client/tests/unit/message-input.test.ts b/Client/tests/unit/message-input.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-input.test.ts
rename to Client/tests/unit/message-input.test.ts
diff --git a/Client/tauri-client/tests/unit/message-jump.test.ts b/Client/tests/unit/message-jump.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-jump.test.ts
rename to Client/tests/unit/message-jump.test.ts
diff --git a/Client/tauri-client/tests/unit/message-list-media-release.test.ts b/Client/tests/unit/message-list-media-release.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-list-media-release.test.ts
rename to Client/tests/unit/message-list-media-release.test.ts
diff --git a/Client/tauri-client/tests/unit/message-list-new-divider.test.ts b/Client/tests/unit/message-list-new-divider.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-list-new-divider.test.ts
rename to Client/tests/unit/message-list-new-divider.test.ts
diff --git a/Client/tauri-client/tests/unit/message-list-optimistic-height-key.test.ts b/Client/tests/unit/message-list-optimistic-height-key.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-list-optimistic-height-key.test.ts
rename to Client/tests/unit/message-list-optimistic-height-key.test.ts
diff --git a/Client/tauri-client/tests/unit/message-list-prepend-scroll-anchor.test.ts b/Client/tests/unit/message-list-prepend-scroll-anchor.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-list-prepend-scroll-anchor.test.ts
rename to Client/tests/unit/message-list-prepend-scroll-anchor.test.ts
diff --git a/Client/tauri-client/tests/unit/message-list-row-listener-leak.test.ts b/Client/tests/unit/message-list-row-listener-leak.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-list-row-listener-leak.test.ts
rename to Client/tests/unit/message-list-row-listener-leak.test.ts
diff --git a/Client/tauri-client/tests/unit/message-list.test.ts b/Client/tests/unit/message-list.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/message-list.test.ts
rename to Client/tests/unit/message-list.test.ts
diff --git a/Client/tauri-client/tests/unit/messages-store-detached.test.ts b/Client/tests/unit/messages-store-detached.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/messages-store-detached.test.ts
rename to Client/tests/unit/messages-store-detached.test.ts
diff --git a/Client/tauri-client/tests/unit/messages.store.test.ts b/Client/tests/unit/messages.store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/messages.store.test.ts
rename to Client/tests/unit/messages.store.test.ts
diff --git a/Client/tauri-client/tests/unit/modal-factory.test.ts b/Client/tests/unit/modal-factory.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/modal-factory.test.ts
rename to Client/tests/unit/modal-factory.test.ts
diff --git a/Client/tauri-client/tests/unit/msg-actions-bar-focus-css.test.ts b/Client/tests/unit/msg-actions-bar-focus-css.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/msg-actions-bar-focus-css.test.ts
rename to Client/tests/unit/msg-actions-bar-focus-css.test.ts
diff --git a/Client/tauri-client/tests/unit/navigation-guard.test.ts b/Client/tests/unit/navigation-guard.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/navigation-guard.test.ts
rename to Client/tests/unit/navigation-guard.test.ts
diff --git a/Client/tauri-client/tests/unit/noise-suppression-restart.test.ts b/Client/tests/unit/noise-suppression-restart.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/noise-suppression-restart.test.ts
rename to Client/tests/unit/noise-suppression-restart.test.ts
diff --git a/Client/tauri-client/tests/unit/notifications.test.ts b/Client/tests/unit/notifications.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/notifications.test.ts
rename to Client/tests/unit/notifications.test.ts
diff --git a/Client/tauri-client/tests/unit/nsfw-gate.test.ts b/Client/tests/unit/nsfw-gate.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/nsfw-gate.test.ts
rename to Client/tests/unit/nsfw-gate.test.ts
diff --git a/Client/tauri-client/tests/unit/os-motion.test.ts b/Client/tests/unit/os-motion.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/os-motion.test.ts
rename to Client/tests/unit/os-motion.test.ts
diff --git a/Client/tauri-client/tests/unit/overlay-managers.test.ts b/Client/tests/unit/overlay-managers.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/overlay-managers.test.ts
rename to Client/tests/unit/overlay-managers.test.ts
diff --git a/Client/tauri-client/tests/unit/permissions.test.ts b/Client/tests/unit/permissions.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/permissions.test.ts
rename to Client/tests/unit/permissions.test.ts
diff --git a/Client/tauri-client/tests/unit/pinned-messages.test.ts b/Client/tests/unit/pinned-messages.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/pinned-messages.test.ts
rename to Client/tests/unit/pinned-messages.test.ts
diff --git a/Client/tauri-client/tests/unit/preferences.test.ts b/Client/tests/unit/preferences.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/preferences.test.ts
rename to Client/tests/unit/preferences.test.ts
diff --git a/Client/tauri-client/tests/unit/presence-sender.test.ts b/Client/tests/unit/presence-sender.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/presence-sender.test.ts
rename to Client/tests/unit/presence-sender.test.ts
diff --git a/Client/tauri-client/tests/unit/profiles.test.ts b/Client/tests/unit/profiles.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/profiles.test.ts
rename to Client/tests/unit/profiles.test.ts
diff --git a/Client/tauri-client/tests/unit/ptt.test.ts b/Client/tests/unit/ptt.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/ptt.test.ts
rename to Client/tests/unit/ptt.test.ts
diff --git a/Client/tauri-client/tests/unit/quick-switcher.test.ts b/Client/tests/unit/quick-switcher.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/quick-switcher.test.ts
rename to Client/tests/unit/quick-switcher.test.ts
diff --git a/Client/tauri-client/tests/unit/rate-limiter.test.ts b/Client/tests/unit/rate-limiter.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/rate-limiter.test.ts
rename to Client/tests/unit/rate-limiter.test.ts
diff --git a/Client/tauri-client/tests/unit/reaction-controller.test.ts b/Client/tests/unit/reaction-controller.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/reaction-controller.test.ts
rename to Client/tests/unit/reaction-controller.test.ts
diff --git a/Client/tauri-client/tests/unit/reaction-tooltip.test.ts b/Client/tests/unit/reaction-tooltip.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/reaction-tooltip.test.ts
rename to Client/tests/unit/reaction-tooltip.test.ts
diff --git a/Client/tauri-client/tests/unit/reactions-keyboard.test.ts b/Client/tests/unit/reactions-keyboard.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/reactions-keyboard.test.ts
rename to Client/tests/unit/reactions-keyboard.test.ts
diff --git a/Client/tauri-client/tests/unit/read-state.test.ts b/Client/tests/unit/read-state.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/read-state.test.ts
rename to Client/tests/unit/read-state.test.ts
diff --git a/Client/tauri-client/tests/unit/renderers.test.ts b/Client/tests/unit/renderers.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/renderers.test.ts
rename to Client/tests/unit/renderers.test.ts
diff --git a/Client/tauri-client/tests/unit/rnnoise-worklet.test.ts b/Client/tests/unit/rnnoise-worklet.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/rnnoise-worklet.test.ts
rename to Client/tests/unit/rnnoise-worklet.test.ts
diff --git a/Client/tauri-client/tests/unit/room-event-handlers.test.ts b/Client/tests/unit/room-event-handlers.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/room-event-handlers.test.ts
rename to Client/tests/unit/room-event-handlers.test.ts
diff --git a/Client/tauri-client/tests/unit/router.test.ts b/Client/tests/unit/router.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/router.test.ts
rename to Client/tests/unit/router.test.ts
diff --git a/Client/tauri-client/tests/unit/safe-render.test.ts b/Client/tests/unit/safe-render.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/safe-render.test.ts
rename to Client/tests/unit/safe-render.test.ts
diff --git a/Client/tauri-client/tests/unit/screen-share-button.test.ts b/Client/tests/unit/screen-share-button.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/screen-share-button.test.ts
rename to Client/tests/unit/screen-share-button.test.ts
diff --git a/Client/tauri-client/tests/unit/screen-share-fps.test.ts b/Client/tests/unit/screen-share-fps.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/screen-share-fps.test.ts
rename to Client/tests/unit/screen-share-fps.test.ts
diff --git a/Client/tauri-client/tests/unit/screen-share-tracks.test.ts b/Client/tests/unit/screen-share-tracks.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/screen-share-tracks.test.ts
rename to Client/tests/unit/screen-share-tracks.test.ts
diff --git a/Client/tauri-client/tests/unit/search-overlay.test.ts b/Client/tests/unit/search-overlay.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/search-overlay.test.ts
rename to Client/tests/unit/search-overlay.test.ts
diff --git a/Client/tauri-client/tests/unit/server-banner.test.ts b/Client/tests/unit/server-banner.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/server-banner.test.ts
rename to Client/tests/unit/server-banner.test.ts
diff --git a/Client/tauri-client/tests/unit/server-panel.test.ts b/Client/tests/unit/server-panel.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/server-panel.test.ts
rename to Client/tests/unit/server-panel.test.ts
diff --git a/Client/tauri-client/tests/unit/settings-helpers.test.ts b/Client/tests/unit/settings-helpers.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/settings-helpers.test.ts
rename to Client/tests/unit/settings-helpers.test.ts
diff --git a/Client/tauri-client/tests/unit/settings-overlay.test.ts b/Client/tests/unit/settings-overlay.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/settings-overlay.test.ts
rename to Client/tests/unit/settings-overlay.test.ts
diff --git a/Client/tauri-client/tests/unit/sidebar-area.test.ts b/Client/tests/unit/sidebar-area.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/sidebar-area.test.ts
rename to Client/tests/unit/sidebar-area.test.ts
diff --git a/Client/tauri-client/tests/unit/sidebar-dm-helpers.test.ts b/Client/tests/unit/sidebar-dm-helpers.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/sidebar-dm-helpers.test.ts
rename to Client/tests/unit/sidebar-dm-helpers.test.ts
diff --git a/Client/tauri-client/tests/unit/sidebar-dm-section.test.ts b/Client/tests/unit/sidebar-dm-section.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/sidebar-dm-section.test.ts
rename to Client/tests/unit/sidebar-dm-section.test.ts
diff --git a/Client/tauri-client/tests/unit/sidebar-member-section.test.ts b/Client/tests/unit/sidebar-member-section.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/sidebar-member-section.test.ts
rename to Client/tests/unit/sidebar-member-section.test.ts
diff --git a/Client/tauri-client/tests/unit/status-picker-custom.test.ts b/Client/tests/unit/status-picker-custom.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/status-picker-custom.test.ts
rename to Client/tests/unit/status-picker-custom.test.ts
diff --git a/Client/tauri-client/tests/unit/status-picker-userbar.test.ts b/Client/tests/unit/status-picker-userbar.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/status-picker-userbar.test.ts
rename to Client/tests/unit/status-picker-userbar.test.ts
diff --git a/Client/tauri-client/tests/unit/store.test.ts b/Client/tests/unit/store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/store.test.ts
rename to Client/tests/unit/store.test.ts
diff --git a/Client/tauri-client/tests/unit/stored-appearance.test.ts b/Client/tests/unit/stored-appearance.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/stored-appearance.test.ts
rename to Client/tests/unit/stored-appearance.test.ts
diff --git a/Client/tauri-client/tests/unit/stream-preview.test.ts b/Client/tests/unit/stream-preview.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/stream-preview.test.ts
rename to Client/tests/unit/stream-preview.test.ts
diff --git a/Client/tauri-client/tests/unit/tauri-conf-webview2-args.test.ts b/Client/tests/unit/tauri-conf-webview2-args.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/tauri-conf-webview2-args.test.ts
rename to Client/tests/unit/tauri-conf-webview2-args.test.ts
diff --git a/Client/tauri-client/tests/unit/test-harness.test.ts b/Client/tests/unit/test-harness.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/test-harness.test.ts
rename to Client/tests/unit/test-harness.test.ts
diff --git a/Client/tauri-client/tests/unit/text-images-tab.test.ts b/Client/tests/unit/text-images-tab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/text-images-tab.test.ts
rename to Client/tests/unit/text-images-tab.test.ts
diff --git a/Client/tauri-client/tests/unit/themes.test.ts b/Client/tests/unit/themes.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/themes.test.ts
rename to Client/tests/unit/themes.test.ts
diff --git a/Client/tauri-client/tests/unit/toast-coverage.test.ts b/Client/tests/unit/toast-coverage.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/toast-coverage.test.ts
rename to Client/tests/unit/toast-coverage.test.ts
diff --git a/Client/tauri-client/tests/unit/toast.test.ts b/Client/tests/unit/toast.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/toast.test.ts
rename to Client/tests/unit/toast.test.ts
diff --git a/Client/tauri-client/tests/unit/totp-settings.test.ts b/Client/tests/unit/totp-settings.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/totp-settings.test.ts
rename to Client/tests/unit/totp-settings.test.ts
diff --git a/Client/tauri-client/tests/unit/types.test.ts b/Client/tests/unit/types.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/types.test.ts
rename to Client/tests/unit/types.test.ts
diff --git a/Client/tauri-client/tests/unit/typing-indicator.test.ts b/Client/tests/unit/typing-indicator.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/typing-indicator.test.ts
rename to Client/tests/unit/typing-indicator.test.ts
diff --git a/Client/tauri-client/tests/unit/ui.store.test.ts b/Client/tests/unit/ui.store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/ui.store.test.ts
rename to Client/tests/unit/ui.store.test.ts
diff --git a/Client/tauri-client/tests/unit/update-notifier.test.ts b/Client/tests/unit/update-notifier.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/update-notifier.test.ts
rename to Client/tests/unit/update-notifier.test.ts
diff --git a/Client/tauri-client/tests/unit/updater.test.ts b/Client/tests/unit/updater.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/updater.test.ts
rename to Client/tests/unit/updater.test.ts
diff --git a/Client/tauri-client/tests/unit/user-bar.test.ts b/Client/tests/unit/user-bar.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/user-bar.test.ts
rename to Client/tests/unit/user-bar.test.ts
diff --git a/Client/tauri-client/tests/unit/user-profile-popup.test.ts b/Client/tests/unit/user-profile-popup.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/user-profile-popup.test.ts
rename to Client/tests/unit/user-profile-popup.test.ts
diff --git a/Client/tauri-client/tests/unit/user-status.test.ts b/Client/tests/unit/user-status.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/user-status.test.ts
rename to Client/tests/unit/user-status.test.ts
diff --git a/Client/tauri-client/tests/unit/vad-worklet-timing.test.ts b/Client/tests/unit/vad-worklet-timing.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/vad-worklet-timing.test.ts
rename to Client/tests/unit/vad-worklet-timing.test.ts
diff --git a/Client/tauri-client/tests/unit/video-grid-track-muted-css.test.ts b/Client/tests/unit/video-grid-track-muted-css.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/video-grid-track-muted-css.test.ts
rename to Client/tests/unit/video-grid-track-muted-css.test.ts
diff --git a/Client/tauri-client/tests/unit/video-grid.test.ts b/Client/tests/unit/video-grid.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/video-grid.test.ts
rename to Client/tests/unit/video-grid.test.ts
diff --git a/Client/tauri-client/tests/unit/video-mode-controller.test.ts b/Client/tests/unit/video-mode-controller.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/video-mode-controller.test.ts
rename to Client/tests/unit/video-mode-controller.test.ts
diff --git a/Client/tauri-client/tests/unit/voice-audio-tab.test.ts b/Client/tests/unit/voice-audio-tab.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/voice-audio-tab.test.ts
rename to Client/tests/unit/voice-audio-tab.test.ts
diff --git a/Client/tauri-client/tests/unit/voice-callbacks.test.ts b/Client/tests/unit/voice-callbacks.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/voice-callbacks.test.ts
rename to Client/tests/unit/voice-callbacks.test.ts
diff --git a/Client/tauri-client/tests/unit/voice-disconnect.test.ts b/Client/tests/unit/voice-disconnect.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/voice-disconnect.test.ts
rename to Client/tests/unit/voice-disconnect.test.ts
diff --git a/Client/tauri-client/tests/unit/voice-widget.test.ts b/Client/tests/unit/voice-widget.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/voice-widget.test.ts
rename to Client/tests/unit/voice-widget.test.ts
diff --git a/Client/tauri-client/tests/unit/voice.store.test.ts b/Client/tests/unit/voice.store.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/voice.store.test.ts
rename to Client/tests/unit/voice.store.test.ts
diff --git a/Client/tauri-client/tests/unit/volume-menu.test.ts b/Client/tests/unit/volume-menu.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/volume-menu.test.ts
rename to Client/tests/unit/volume-menu.test.ts
diff --git a/Client/tauri-client/tests/unit/window-state-restore.test.ts b/Client/tests/unit/window-state-restore.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/window-state-restore.test.ts
rename to Client/tests/unit/window-state-restore.test.ts
diff --git a/Client/tauri-client/tests/unit/window-state.test.ts b/Client/tests/unit/window-state.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/window-state.test.ts
rename to Client/tests/unit/window-state.test.ts
diff --git a/Client/tauri-client/tests/unit/ws-active-channel.test.ts b/Client/tests/unit/ws-active-channel.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/ws-active-channel.test.ts
rename to Client/tests/unit/ws-active-channel.test.ts
diff --git a/Client/tauri-client/tests/unit/ws-cert.test.ts b/Client/tests/unit/ws-cert.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/ws-cert.test.ts
rename to Client/tests/unit/ws-cert.test.ts
diff --git a/Client/tauri-client/tests/unit/ws-lifecycle.test.ts b/Client/tests/unit/ws-lifecycle.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/ws-lifecycle.test.ts
rename to Client/tests/unit/ws-lifecycle.test.ts
diff --git a/Client/tauri-client/tests/unit/ws-messaging.test.ts b/Client/tests/unit/ws-messaging.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/ws-messaging.test.ts
rename to Client/tests/unit/ws-messaging.test.ts
diff --git a/Client/tauri-client/tests/unit/ws-reconnect.test.ts b/Client/tests/unit/ws-reconnect.test.ts
similarity index 100%
rename from Client/tauri-client/tests/unit/ws-reconnect.test.ts
rename to Client/tests/unit/ws-reconnect.test.ts
diff --git a/Client/tauri-client/tsconfig.build.json b/Client/tsconfig.build.json
similarity index 100%
rename from Client/tauri-client/tsconfig.build.json
rename to Client/tsconfig.build.json
diff --git a/Client/tauri-client/tsconfig.e2e.json b/Client/tsconfig.e2e.json
similarity index 100%
rename from Client/tauri-client/tsconfig.e2e.json
rename to Client/tsconfig.e2e.json
diff --git a/Client/tauri-client/tsconfig.json b/Client/tsconfig.json
similarity index 100%
rename from Client/tauri-client/tsconfig.json
rename to Client/tsconfig.json
diff --git a/Client/tauri-client/vite.config.ts b/Client/vite.config.ts
similarity index 100%
rename from Client/tauri-client/vite.config.ts
rename to Client/vite.config.ts
diff --git a/Client/tauri-client/vitest.config.browser.ts b/Client/vitest.config.browser.ts
similarity index 100%
rename from Client/tauri-client/vitest.config.browser.ts
rename to Client/vitest.config.browser.ts
diff --git a/Client/tauri-client/vitest.config.ts b/Client/vitest.config.ts
similarity index 100%
rename from Client/tauri-client/vitest.config.ts
rename to Client/vitest.config.ts