diff --git a/gitbutler-ui/.env.development b/app/.env.development similarity index 100% rename from gitbutler-ui/.env.development rename to app/.env.development diff --git a/gitbutler-ui/.env.nightly b/app/.env.nightly similarity index 100% rename from gitbutler-ui/.env.nightly rename to app/.env.nightly diff --git a/gitbutler-ui/.env.production b/app/.env.production similarity index 100% rename from gitbutler-ui/.env.production rename to app/.env.production diff --git a/gitbutler-ui/.eslintignore b/app/.eslintignore similarity index 100% rename from gitbutler-ui/.eslintignore rename to app/.eslintignore diff --git a/gitbutler-ui/.eslintrc.cjs b/app/.eslintrc.cjs similarity index 100% rename from gitbutler-ui/.eslintrc.cjs rename to app/.eslintrc.cjs diff --git a/gitbutler-ui/.gitignore b/app/.gitignore similarity index 100% rename from gitbutler-ui/.gitignore rename to app/.gitignore diff --git a/gitbutler-ui/.npmrc b/app/.npmrc similarity index 100% rename from gitbutler-ui/.npmrc rename to app/.npmrc diff --git a/gitbutler-ui/.prettierignore b/app/.prettierignore similarity index 100% rename from gitbutler-ui/.prettierignore rename to app/.prettierignore diff --git a/gitbutler-ui/.prettierrc b/app/.prettierrc similarity index 100% rename from gitbutler-ui/.prettierrc rename to app/.prettierrc diff --git a/gitbutler-ui/package.json b/app/package.json similarity index 100% rename from gitbutler-ui/package.json rename to app/package.json diff --git a/gitbutler-ui/postcss.config.cjs b/app/postcss.config.cjs similarity index 100% rename from gitbutler-ui/postcss.config.cjs rename to app/postcss.config.cjs diff --git a/gitbutler-ui/src/app.d.ts b/app/src/app.d.ts similarity index 100% rename from gitbutler-ui/src/app.d.ts rename to app/src/app.d.ts diff --git a/gitbutler-ui/src/app.html b/app/src/app.html similarity index 100% rename from gitbutler-ui/src/app.html rename to app/src/app.html diff --git a/gitbutler-ui/src/global.d.ts b/app/src/global.d.ts similarity index 100% rename from gitbutler-ui/src/global.d.ts rename to app/src/global.d.ts diff --git a/gitbutler-ui/src/hooks.client.ts b/app/src/hooks.client.ts similarity index 100% rename from gitbutler-ui/src/hooks.client.ts rename to app/src/hooks.client.ts diff --git a/gitbutler-ui/src/lib/analytics/posthog.ts b/app/src/lib/analytics/posthog.ts similarity index 100% rename from gitbutler-ui/src/lib/analytics/posthog.ts rename to app/src/lib/analytics/posthog.ts diff --git a/gitbutler-ui/src/lib/analytics/sentry.ts b/app/src/lib/analytics/sentry.ts similarity index 100% rename from gitbutler-ui/src/lib/analytics/sentry.ts rename to app/src/lib/analytics/sentry.ts diff --git a/gitbutler-ui/src/lib/assets/dzen-pc.svg b/app/src/lib/assets/dzen-pc.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/dzen-pc.svg rename to app/src/lib/assets/dzen-pc.svg diff --git a/gitbutler-ui/src/lib/assets/empty-state/lane-new.svg b/app/src/lib/assets/empty-state/lane-new.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/empty-state/lane-new.svg rename to app/src/lib/assets/empty-state/lane-new.svg diff --git a/gitbutler-ui/src/lib/assets/empty-state/lane-no-changes.svg b/app/src/lib/assets/empty-state/lane-no-changes.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/empty-state/lane-no-changes.svg rename to app/src/lib/assets/empty-state/lane-no-changes.svg diff --git a/gitbutler-ui/src/lib/assets/empty-state/no-branches.svg b/app/src/lib/assets/empty-state/no-branches.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/empty-state/no-branches.svg rename to app/src/lib/assets/empty-state/no-branches.svg diff --git a/gitbutler-ui/src/lib/assets/gb-logo.svg b/app/src/lib/assets/gb-logo.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/gb-logo.svg rename to app/src/lib/assets/gb-logo.svg diff --git a/gitbutler-ui/src/lib/assets/illustrations/analytics.svg b/app/src/lib/assets/illustrations/analytics.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/illustrations/analytics.svg rename to app/src/lib/assets/illustrations/analytics.svg diff --git a/gitbutler-ui/src/lib/assets/illustrations/direction-doubt.svg b/app/src/lib/assets/illustrations/direction-doubt.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/illustrations/direction-doubt.svg rename to app/src/lib/assets/illustrations/direction-doubt.svg diff --git a/gitbutler-ui/src/lib/assets/illustrations/load-error.svg b/app/src/lib/assets/illustrations/load-error.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/illustrations/load-error.svg rename to app/src/lib/assets/illustrations/load-error.svg diff --git a/gitbutler-ui/src/lib/assets/illustrations/new-project.svg b/app/src/lib/assets/illustrations/new-project.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/illustrations/new-project.svg rename to app/src/lib/assets/illustrations/new-project.svg diff --git a/gitbutler-ui/src/lib/assets/new-branch/bottom-sheet.svg b/app/src/lib/assets/new-branch/bottom-sheet.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/new-branch/bottom-sheet.svg rename to app/src/lib/assets/new-branch/bottom-sheet.svg diff --git a/gitbutler-ui/src/lib/assets/new-branch/hand.svg b/app/src/lib/assets/new-branch/hand.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/new-branch/hand.svg rename to app/src/lib/assets/new-branch/hand.svg diff --git a/gitbutler-ui/src/lib/assets/new-branch/middle-sheet.svg b/app/src/lib/assets/new-branch/middle-sheet.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/new-branch/middle-sheet.svg rename to app/src/lib/assets/new-branch/middle-sheet.svg diff --git a/gitbutler-ui/src/lib/assets/new-branch/top-sheet.svg b/app/src/lib/assets/new-branch/top-sheet.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/new-branch/top-sheet.svg rename to app/src/lib/assets/new-branch/top-sheet.svg diff --git a/gitbutler-ui/src/lib/assets/no-projects/new-project.svg b/app/src/lib/assets/no-projects/new-project.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/no-projects/new-project.svg rename to app/src/lib/assets/no-projects/new-project.svg diff --git a/gitbutler-ui/src/lib/assets/no-projects/signin.svg b/app/src/lib/assets/no-projects/signin.svg similarity index 100% rename from gitbutler-ui/src/lib/assets/no-projects/signin.svg rename to app/src/lib/assets/no-projects/signin.svg diff --git a/gitbutler-ui/src/lib/backend/aiClient.ts b/app/src/lib/backend/aiClient.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/aiClient.ts rename to app/src/lib/backend/aiClient.ts diff --git a/gitbutler-ui/src/lib/backend/aiClients/anthropic.ts b/app/src/lib/backend/aiClients/anthropic.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/aiClients/anthropic.ts rename to app/src/lib/backend/aiClients/anthropic.ts diff --git a/gitbutler-ui/src/lib/backend/aiClients/butler.ts b/app/src/lib/backend/aiClients/butler.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/aiClients/butler.ts rename to app/src/lib/backend/aiClients/butler.ts diff --git a/gitbutler-ui/src/lib/backend/aiClients/openAI.ts b/app/src/lib/backend/aiClients/openAI.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/aiClients/openAI.ts rename to app/src/lib/backend/aiClients/openAI.ts diff --git a/gitbutler-ui/src/lib/backend/aiService.test.ts b/app/src/lib/backend/aiService.test.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/aiService.test.ts rename to app/src/lib/backend/aiService.test.ts diff --git a/gitbutler-ui/src/lib/backend/aiService.ts b/app/src/lib/backend/aiService.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/aiService.ts rename to app/src/lib/backend/aiService.ts diff --git a/gitbutler-ui/src/lib/backend/auth.ts b/app/src/lib/backend/auth.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/auth.ts rename to app/src/lib/backend/auth.ts diff --git a/gitbutler-ui/src/lib/backend/cloud.ts b/app/src/lib/backend/cloud.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/cloud.ts rename to app/src/lib/backend/cloud.ts diff --git a/gitbutler-ui/src/lib/backend/data.ts b/app/src/lib/backend/data.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/data.ts rename to app/src/lib/backend/data.ts diff --git a/gitbutler-ui/src/lib/backend/fetches.ts b/app/src/lib/backend/fetches.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/fetches.ts rename to app/src/lib/backend/fetches.ts diff --git a/gitbutler-ui/src/lib/backend/gitConfigService.ts b/app/src/lib/backend/gitConfigService.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/gitConfigService.ts rename to app/src/lib/backend/gitConfigService.ts diff --git a/gitbutler-ui/src/lib/backend/github.ts b/app/src/lib/backend/github.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/github.ts rename to app/src/lib/backend/github.ts diff --git a/gitbutler-ui/src/lib/backend/heads.ts b/app/src/lib/backend/heads.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/heads.ts rename to app/src/lib/backend/heads.ts diff --git a/gitbutler-ui/src/lib/backend/indexes.ts b/app/src/lib/backend/indexes.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/indexes.ts rename to app/src/lib/backend/indexes.ts diff --git a/gitbutler-ui/src/lib/backend/ipc.ts b/app/src/lib/backend/ipc.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/ipc.ts rename to app/src/lib/backend/ipc.ts diff --git a/gitbutler-ui/src/lib/backend/projects.ts b/app/src/lib/backend/projects.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/projects.ts rename to app/src/lib/backend/projects.ts diff --git a/gitbutler-ui/src/lib/backend/prompt.ts b/app/src/lib/backend/prompt.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/prompt.ts rename to app/src/lib/backend/prompt.ts diff --git a/gitbutler-ui/src/lib/backend/updater.ts b/app/src/lib/backend/updater.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/updater.ts rename to app/src/lib/backend/updater.ts diff --git a/gitbutler-ui/src/lib/backend/zip.ts b/app/src/lib/backend/zip.ts similarity index 100% rename from gitbutler-ui/src/lib/backend/zip.ts rename to app/src/lib/backend/zip.ts diff --git a/gitbutler-ui/src/lib/branches/service.ts b/app/src/lib/branches/service.ts similarity index 100% rename from gitbutler-ui/src/lib/branches/service.ts rename to app/src/lib/branches/service.ts diff --git a/gitbutler-ui/src/lib/branches/types.ts b/app/src/lib/branches/types.ts similarity index 100% rename from gitbutler-ui/src/lib/branches/types.ts rename to app/src/lib/branches/types.ts diff --git a/gitbutler-ui/src/lib/clickOutside.ts b/app/src/lib/clickOutside.ts similarity index 100% rename from gitbutler-ui/src/lib/clickOutside.ts rename to app/src/lib/clickOutside.ts diff --git a/gitbutler-ui/src/lib/components/AISettings.svelte b/app/src/lib/components/AISettings.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AISettings.svelte rename to app/src/lib/components/AISettings.svelte diff --git a/gitbutler-ui/src/lib/components/AccountLink.svelte b/app/src/lib/components/AccountLink.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AccountLink.svelte rename to app/src/lib/components/AccountLink.svelte diff --git a/gitbutler-ui/src/lib/components/ActiveBranchStatus.svelte b/app/src/lib/components/ActiveBranchStatus.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ActiveBranchStatus.svelte rename to app/src/lib/components/ActiveBranchStatus.svelte diff --git a/gitbutler-ui/src/lib/components/AheadBehind.svelte b/app/src/lib/components/AheadBehind.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AheadBehind.svelte rename to app/src/lib/components/AheadBehind.svelte diff --git a/gitbutler-ui/src/lib/components/AnalyticsConfirmation.svelte b/app/src/lib/components/AnalyticsConfirmation.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AnalyticsConfirmation.svelte rename to app/src/lib/components/AnalyticsConfirmation.svelte diff --git a/gitbutler-ui/src/lib/components/AnalyticsSettings.svelte b/app/src/lib/components/AnalyticsSettings.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AnalyticsSettings.svelte rename to app/src/lib/components/AnalyticsSettings.svelte diff --git a/gitbutler-ui/src/lib/components/AppUpdater.svelte b/app/src/lib/components/AppUpdater.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AppUpdater.svelte rename to app/src/lib/components/AppUpdater.svelte diff --git a/gitbutler-ui/src/lib/components/AuthorIcon.svelte b/app/src/lib/components/AuthorIcon.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AuthorIcon.svelte rename to app/src/lib/components/AuthorIcon.svelte diff --git a/gitbutler-ui/src/lib/components/AuthorIcons.svelte b/app/src/lib/components/AuthorIcons.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/AuthorIcons.svelte rename to app/src/lib/components/AuthorIcons.svelte diff --git a/gitbutler-ui/src/lib/components/BackButton.svelte b/app/src/lib/components/BackButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BackButton.svelte rename to app/src/lib/components/BackButton.svelte diff --git a/gitbutler-ui/src/lib/components/Badge.svelte b/app/src/lib/components/Badge.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Badge.svelte rename to app/src/lib/components/Badge.svelte diff --git a/gitbutler-ui/src/lib/components/BaseBranch.svelte b/app/src/lib/components/BaseBranch.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BaseBranch.svelte rename to app/src/lib/components/BaseBranch.svelte diff --git a/gitbutler-ui/src/lib/components/BaseBranchCard.svelte b/app/src/lib/components/BaseBranchCard.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BaseBranchCard.svelte rename to app/src/lib/components/BaseBranchCard.svelte diff --git a/gitbutler-ui/src/lib/components/Board.svelte b/app/src/lib/components/Board.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Board.svelte rename to app/src/lib/components/Board.svelte diff --git a/gitbutler-ui/src/lib/components/BranchCard.svelte b/app/src/lib/components/BranchCard.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchCard.svelte rename to app/src/lib/components/BranchCard.svelte diff --git a/gitbutler-ui/src/lib/components/BranchCommits.svelte b/app/src/lib/components/BranchCommits.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchCommits.svelte rename to app/src/lib/components/BranchCommits.svelte diff --git a/gitbutler-ui/src/lib/components/BranchFiles.svelte b/app/src/lib/components/BranchFiles.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchFiles.svelte rename to app/src/lib/components/BranchFiles.svelte diff --git a/gitbutler-ui/src/lib/components/BranchFilesHeader.svelte b/app/src/lib/components/BranchFilesHeader.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchFilesHeader.svelte rename to app/src/lib/components/BranchFilesHeader.svelte diff --git a/gitbutler-ui/src/lib/components/BranchFilesList.svelte b/app/src/lib/components/BranchFilesList.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchFilesList.svelte rename to app/src/lib/components/BranchFilesList.svelte diff --git a/gitbutler-ui/src/lib/components/BranchHeader.svelte b/app/src/lib/components/BranchHeader.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchHeader.svelte rename to app/src/lib/components/BranchHeader.svelte diff --git a/gitbutler-ui/src/lib/components/BranchIcon.svelte b/app/src/lib/components/BranchIcon.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchIcon.svelte rename to app/src/lib/components/BranchIcon.svelte diff --git a/gitbutler-ui/src/lib/components/BranchItem.svelte b/app/src/lib/components/BranchItem.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchItem.svelte rename to app/src/lib/components/BranchItem.svelte diff --git a/gitbutler-ui/src/lib/components/BranchLabel.svelte b/app/src/lib/components/BranchLabel.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchLabel.svelte rename to app/src/lib/components/BranchLabel.svelte diff --git a/gitbutler-ui/src/lib/components/BranchLane.svelte b/app/src/lib/components/BranchLane.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchLane.svelte rename to app/src/lib/components/BranchLane.svelte diff --git a/gitbutler-ui/src/lib/components/BranchLanePopupMenu.svelte b/app/src/lib/components/BranchLanePopupMenu.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchLanePopupMenu.svelte rename to app/src/lib/components/BranchLanePopupMenu.svelte diff --git a/gitbutler-ui/src/lib/components/BranchPreviewHeader.svelte b/app/src/lib/components/BranchPreviewHeader.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchPreviewHeader.svelte rename to app/src/lib/components/BranchPreviewHeader.svelte diff --git a/gitbutler-ui/src/lib/components/Branches.svelte b/app/src/lib/components/Branches.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Branches.svelte rename to app/src/lib/components/Branches.svelte diff --git a/gitbutler-ui/src/lib/components/BranchesHeader.svelte b/app/src/lib/components/BranchesHeader.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/BranchesHeader.svelte rename to app/src/lib/components/BranchesHeader.svelte diff --git a/gitbutler-ui/src/lib/components/Button.svelte b/app/src/lib/components/Button.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Button.svelte rename to app/src/lib/components/Button.svelte diff --git a/gitbutler-ui/src/lib/components/CardSection.svelte b/app/src/lib/components/CardSection.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CardSection.svelte rename to app/src/lib/components/CardSection.svelte diff --git a/gitbutler-ui/src/lib/components/Checkbox.svelte b/app/src/lib/components/Checkbox.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Checkbox.svelte rename to app/src/lib/components/Checkbox.svelte diff --git a/gitbutler-ui/src/lib/components/CloudForm.svelte b/app/src/lib/components/CloudForm.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CloudForm.svelte rename to app/src/lib/components/CloudForm.svelte diff --git a/gitbutler-ui/src/lib/components/CommitCard.svelte b/app/src/lib/components/CommitCard.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CommitCard.svelte rename to app/src/lib/components/CommitCard.svelte diff --git a/gitbutler-ui/src/lib/components/CommitDialog.svelte b/app/src/lib/components/CommitDialog.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CommitDialog.svelte rename to app/src/lib/components/CommitDialog.svelte diff --git a/gitbutler-ui/src/lib/components/CommitList.svelte b/app/src/lib/components/CommitList.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CommitList.svelte rename to app/src/lib/components/CommitList.svelte diff --git a/gitbutler-ui/src/lib/components/CommitListFooter.svelte b/app/src/lib/components/CommitListFooter.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CommitListFooter.svelte rename to app/src/lib/components/CommitListFooter.svelte diff --git a/gitbutler-ui/src/lib/components/CommitListHeader.svelte b/app/src/lib/components/CommitListHeader.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CommitListHeader.svelte rename to app/src/lib/components/CommitListHeader.svelte diff --git a/gitbutler-ui/src/lib/components/CommitListItem.svelte b/app/src/lib/components/CommitListItem.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CommitListItem.svelte rename to app/src/lib/components/CommitListItem.svelte diff --git a/gitbutler-ui/src/lib/components/CredentialCheck.svelte b/app/src/lib/components/CredentialCheck.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/CredentialCheck.svelte rename to app/src/lib/components/CredentialCheck.svelte diff --git a/gitbutler-ui/src/lib/components/DecorativeSplitView.svelte b/app/src/lib/components/DecorativeSplitView.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/DecorativeSplitView.svelte rename to app/src/lib/components/DecorativeSplitView.svelte diff --git a/gitbutler-ui/src/lib/components/DetailsForm.svelte b/app/src/lib/components/DetailsForm.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/DetailsForm.svelte rename to app/src/lib/components/DetailsForm.svelte diff --git a/gitbutler-ui/src/lib/components/Differ/CodeHighlighter.ts b/app/src/lib/components/Differ/CodeHighlighter.ts similarity index 100% rename from gitbutler-ui/src/lib/components/Differ/CodeHighlighter.ts rename to app/src/lib/components/Differ/CodeHighlighter.ts diff --git a/gitbutler-ui/src/lib/components/Differ/Differ.svelte b/app/src/lib/components/Differ/Differ.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Differ/Differ.svelte rename to app/src/lib/components/Differ/Differ.svelte diff --git a/gitbutler-ui/src/lib/components/Differ/colors/gruvbox-alternative.css b/app/src/lib/components/Differ/colors/gruvbox-alternative.css similarity index 100% rename from gitbutler-ui/src/lib/components/Differ/colors/gruvbox-alternative.css rename to app/src/lib/components/Differ/colors/gruvbox-alternative.css diff --git a/gitbutler-ui/src/lib/components/Differ/colors/gruvbox.css b/app/src/lib/components/Differ/colors/gruvbox.css similarity index 100% rename from gitbutler-ui/src/lib/components/Differ/colors/gruvbox.css rename to app/src/lib/components/Differ/colors/gruvbox.css diff --git a/gitbutler-ui/src/lib/components/Differ/index.ts b/app/src/lib/components/Differ/index.ts similarity index 100% rename from gitbutler-ui/src/lib/components/Differ/index.ts rename to app/src/lib/components/Differ/index.ts diff --git a/gitbutler-ui/src/lib/components/Differ/renderer.ts b/app/src/lib/components/Differ/renderer.ts similarity index 100% rename from gitbutler-ui/src/lib/components/Differ/renderer.ts rename to app/src/lib/components/Differ/renderer.ts diff --git a/gitbutler-ui/src/lib/components/DomainButton.svelte b/app/src/lib/components/DomainButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/DomainButton.svelte rename to app/src/lib/components/DomainButton.svelte diff --git a/gitbutler-ui/src/lib/components/DropDownButton.svelte b/app/src/lib/components/DropDownButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/DropDownButton.svelte rename to app/src/lib/components/DropDownButton.svelte diff --git a/gitbutler-ui/src/lib/components/DropzoneOverlay.svelte b/app/src/lib/components/DropzoneOverlay.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/DropzoneOverlay.svelte rename to app/src/lib/components/DropzoneOverlay.svelte diff --git a/gitbutler-ui/src/lib/components/FileCard.svelte b/app/src/lib/components/FileCard.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileCard.svelte rename to app/src/lib/components/FileCard.svelte diff --git a/gitbutler-ui/src/lib/components/FileCardHeader.svelte b/app/src/lib/components/FileCardHeader.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileCardHeader.svelte rename to app/src/lib/components/FileCardHeader.svelte diff --git a/gitbutler-ui/src/lib/components/FileContextMenu.svelte b/app/src/lib/components/FileContextMenu.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileContextMenu.svelte rename to app/src/lib/components/FileContextMenu.svelte diff --git a/gitbutler-ui/src/lib/components/FileDiff.svelte b/app/src/lib/components/FileDiff.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileDiff.svelte rename to app/src/lib/components/FileDiff.svelte diff --git a/gitbutler-ui/src/lib/components/FileListItem.svelte b/app/src/lib/components/FileListItem.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileListItem.svelte rename to app/src/lib/components/FileListItem.svelte diff --git a/gitbutler-ui/src/lib/components/FileStatusCircle.svelte b/app/src/lib/components/FileStatusCircle.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileStatusCircle.svelte rename to app/src/lib/components/FileStatusCircle.svelte diff --git a/gitbutler-ui/src/lib/components/FileStatusIcons.svelte b/app/src/lib/components/FileStatusIcons.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileStatusIcons.svelte rename to app/src/lib/components/FileStatusIcons.svelte diff --git a/gitbutler-ui/src/lib/components/FileStatusTag.svelte b/app/src/lib/components/FileStatusTag.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FileStatusTag.svelte rename to app/src/lib/components/FileStatusTag.svelte diff --git a/gitbutler-ui/src/lib/components/FilterPopupMenu.svelte b/app/src/lib/components/FilterPopupMenu.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FilterPopupMenu.svelte rename to app/src/lib/components/FilterPopupMenu.svelte diff --git a/gitbutler-ui/src/lib/components/Footer.svelte b/app/src/lib/components/Footer.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Footer.svelte rename to app/src/lib/components/Footer.svelte diff --git a/gitbutler-ui/src/lib/components/FullviewLoading.svelte b/app/src/lib/components/FullviewLoading.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/FullviewLoading.svelte rename to app/src/lib/components/FullviewLoading.svelte diff --git a/gitbutler-ui/src/lib/components/GithubIntegration.svelte b/app/src/lib/components/GithubIntegration.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/GithubIntegration.svelte rename to app/src/lib/components/GithubIntegration.svelte diff --git a/gitbutler-ui/src/lib/components/HunkContextMenu.svelte b/app/src/lib/components/HunkContextMenu.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/HunkContextMenu.svelte rename to app/src/lib/components/HunkContextMenu.svelte diff --git a/gitbutler-ui/src/lib/components/HunkLine.svelte b/app/src/lib/components/HunkLine.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/HunkLine.svelte rename to app/src/lib/components/HunkLine.svelte diff --git a/gitbutler-ui/src/lib/components/HunkViewer.svelte b/app/src/lib/components/HunkViewer.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/HunkViewer.svelte rename to app/src/lib/components/HunkViewer.svelte diff --git a/gitbutler-ui/src/lib/components/Icon.svelte b/app/src/lib/components/Icon.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Icon.svelte rename to app/src/lib/components/Icon.svelte diff --git a/gitbutler-ui/src/lib/components/IconButton.svelte b/app/src/lib/components/IconButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/IconButton.svelte rename to app/src/lib/components/IconButton.svelte diff --git a/gitbutler-ui/src/lib/components/IconLink.svelte b/app/src/lib/components/IconLink.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/IconLink.svelte rename to app/src/lib/components/IconLink.svelte diff --git a/gitbutler-ui/src/lib/components/InfoMessage.svelte b/app/src/lib/components/InfoMessage.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/InfoMessage.svelte rename to app/src/lib/components/InfoMessage.svelte diff --git a/gitbutler-ui/src/lib/components/KeysForm.svelte b/app/src/lib/components/KeysForm.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/KeysForm.svelte rename to app/src/lib/components/KeysForm.svelte diff --git a/gitbutler-ui/src/lib/components/LargeDiffMessage.svelte b/app/src/lib/components/LargeDiffMessage.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/LargeDiffMessage.svelte rename to app/src/lib/components/LargeDiffMessage.svelte diff --git a/gitbutler-ui/src/lib/components/Link.svelte b/app/src/lib/components/Link.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Link.svelte rename to app/src/lib/components/Link.svelte diff --git a/gitbutler-ui/src/lib/components/ListItem.svelte b/app/src/lib/components/ListItem.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ListItem.svelte rename to app/src/lib/components/ListItem.svelte diff --git a/gitbutler-ui/src/lib/components/Login.svelte b/app/src/lib/components/Login.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Login.svelte rename to app/src/lib/components/Login.svelte diff --git a/gitbutler-ui/src/lib/components/MergeButton.svelte b/app/src/lib/components/MergeButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/MergeButton.svelte rename to app/src/lib/components/MergeButton.svelte diff --git a/gitbutler-ui/src/lib/components/Modal.svelte b/app/src/lib/components/Modal.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Modal.svelte rename to app/src/lib/components/Modal.svelte diff --git a/gitbutler-ui/src/lib/components/Navigation.svelte b/app/src/lib/components/Navigation.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Navigation.svelte rename to app/src/lib/components/Navigation.svelte diff --git a/gitbutler-ui/src/lib/components/NewBranchDropZone.svelte b/app/src/lib/components/NewBranchDropZone.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/NewBranchDropZone.svelte rename to app/src/lib/components/NewBranchDropZone.svelte diff --git a/gitbutler-ui/src/lib/components/NotOnGitButlerBranch.svelte b/app/src/lib/components/NotOnGitButlerBranch.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/NotOnGitButlerBranch.svelte rename to app/src/lib/components/NotOnGitButlerBranch.svelte diff --git a/gitbutler-ui/src/lib/components/Overlay.svelte b/app/src/lib/components/Overlay.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Overlay.svelte rename to app/src/lib/components/Overlay.svelte diff --git a/gitbutler-ui/src/lib/components/PassphraseBox.svelte b/app/src/lib/components/PassphraseBox.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PassphraseBox.svelte rename to app/src/lib/components/PassphraseBox.svelte diff --git a/gitbutler-ui/src/lib/components/PopupMenu.svelte b/app/src/lib/components/PopupMenu.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PopupMenu.svelte rename to app/src/lib/components/PopupMenu.svelte diff --git a/gitbutler-ui/src/lib/components/PopupMenuItem.svelte b/app/src/lib/components/PopupMenuItem.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PopupMenuItem.svelte rename to app/src/lib/components/PopupMenuItem.svelte diff --git a/gitbutler-ui/src/lib/components/PreferencesForm.svelte b/app/src/lib/components/PreferencesForm.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PreferencesForm.svelte rename to app/src/lib/components/PreferencesForm.svelte diff --git a/gitbutler-ui/src/lib/components/ProblemLoadingRepo.svelte b/app/src/lib/components/ProblemLoadingRepo.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProblemLoadingRepo.svelte rename to app/src/lib/components/ProblemLoadingRepo.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectAvatar.svelte b/app/src/lib/components/ProjectAvatar.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectAvatar.svelte rename to app/src/lib/components/ProjectAvatar.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectNameLabel.svelte b/app/src/lib/components/ProjectNameLabel.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectNameLabel.svelte rename to app/src/lib/components/ProjectNameLabel.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectSelector.svelte b/app/src/lib/components/ProjectSelector.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectSelector.svelte rename to app/src/lib/components/ProjectSelector.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectSettingsMenuAction.svelte b/app/src/lib/components/ProjectSettingsMenuAction.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectSettingsMenuAction.svelte rename to app/src/lib/components/ProjectSettingsMenuAction.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectSetup.svelte b/app/src/lib/components/ProjectSetup.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectSetup.svelte rename to app/src/lib/components/ProjectSetup.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectSetupTarget.svelte b/app/src/lib/components/ProjectSetupTarget.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectSetupTarget.svelte rename to app/src/lib/components/ProjectSetupTarget.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectSwitcher.svelte b/app/src/lib/components/ProjectSwitcher.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectSwitcher.svelte rename to app/src/lib/components/ProjectSwitcher.svelte diff --git a/gitbutler-ui/src/lib/components/ProjectsPopup.svelte b/app/src/lib/components/ProjectsPopup.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ProjectsPopup.svelte rename to app/src/lib/components/ProjectsPopup.svelte diff --git a/gitbutler-ui/src/lib/components/PromptModal.svelte b/app/src/lib/components/PromptModal.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PromptModal.svelte rename to app/src/lib/components/PromptModal.svelte diff --git a/gitbutler-ui/src/lib/components/PullRequestCard.svelte b/app/src/lib/components/PullRequestCard.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PullRequestCard.svelte rename to app/src/lib/components/PullRequestCard.svelte diff --git a/gitbutler-ui/src/lib/components/PullRequestPreview.svelte b/app/src/lib/components/PullRequestPreview.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PullRequestPreview.svelte rename to app/src/lib/components/PullRequestPreview.svelte diff --git a/gitbutler-ui/src/lib/components/PushButton.svelte b/app/src/lib/components/PushButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/PushButton.svelte rename to app/src/lib/components/PushButton.svelte diff --git a/gitbutler-ui/src/lib/components/RadioButton.svelte b/app/src/lib/components/RadioButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/RadioButton.svelte rename to app/src/lib/components/RadioButton.svelte diff --git a/gitbutler-ui/src/lib/components/RemoteBranchPreview.svelte b/app/src/lib/components/RemoteBranchPreview.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/RemoteBranchPreview.svelte rename to app/src/lib/components/RemoteBranchPreview.svelte diff --git a/gitbutler-ui/src/lib/components/RemoveProjectButton.svelte b/app/src/lib/components/RemoveProjectButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/RemoveProjectButton.svelte rename to app/src/lib/components/RemoveProjectButton.svelte diff --git a/gitbutler-ui/src/lib/components/Resizer.svelte b/app/src/lib/components/Resizer.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Resizer.svelte rename to app/src/lib/components/Resizer.svelte diff --git a/gitbutler-ui/src/lib/components/ScrollableContainer.svelte b/app/src/lib/components/ScrollableContainer.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ScrollableContainer.svelte rename to app/src/lib/components/ScrollableContainer.svelte diff --git a/gitbutler-ui/src/lib/components/Scrollbar.svelte b/app/src/lib/components/Scrollbar.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Scrollbar.svelte rename to app/src/lib/components/Scrollbar.svelte diff --git a/gitbutler-ui/src/lib/components/SectionCard.svelte b/app/src/lib/components/SectionCard.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/SectionCard.svelte rename to app/src/lib/components/SectionCard.svelte diff --git a/gitbutler-ui/src/lib/components/SegmentControl/Segment.svelte b/app/src/lib/components/SegmentControl/Segment.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/SegmentControl/Segment.svelte rename to app/src/lib/components/SegmentControl/Segment.svelte diff --git a/gitbutler-ui/src/lib/components/SegmentControl/SegmentedControl.svelte b/app/src/lib/components/SegmentControl/SegmentedControl.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/SegmentControl/SegmentedControl.svelte rename to app/src/lib/components/SegmentControl/SegmentedControl.svelte diff --git a/gitbutler-ui/src/lib/components/SegmentControl/segment.ts b/app/src/lib/components/SegmentControl/segment.ts similarity index 100% rename from gitbutler-ui/src/lib/components/SegmentControl/segment.ts rename to app/src/lib/components/SegmentControl/segment.ts diff --git a/gitbutler-ui/src/lib/components/Select.svelte b/app/src/lib/components/Select.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Select.svelte rename to app/src/lib/components/Select.svelte diff --git a/gitbutler-ui/src/lib/components/SelectItem.svelte b/app/src/lib/components/SelectItem.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/SelectItem.svelte rename to app/src/lib/components/SelectItem.svelte diff --git a/gitbutler-ui/src/lib/components/SetupFeature.svelte b/app/src/lib/components/SetupFeature.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/SetupFeature.svelte rename to app/src/lib/components/SetupFeature.svelte diff --git a/gitbutler-ui/src/lib/components/ShareIssueModal.svelte b/app/src/lib/components/ShareIssueModal.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ShareIssueModal.svelte rename to app/src/lib/components/ShareIssueModal.svelte diff --git a/gitbutler-ui/src/lib/components/SomethingWentWrong.svelte b/app/src/lib/components/SomethingWentWrong.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/SomethingWentWrong.svelte rename to app/src/lib/components/SomethingWentWrong.svelte diff --git a/gitbutler-ui/src/lib/components/Spacer.svelte b/app/src/lib/components/Spacer.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Spacer.svelte rename to app/src/lib/components/Spacer.svelte diff --git a/gitbutler-ui/src/lib/components/SyncButton.svelte b/app/src/lib/components/SyncButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/SyncButton.svelte rename to app/src/lib/components/SyncButton.svelte diff --git a/gitbutler-ui/src/lib/components/Tag.svelte b/app/src/lib/components/Tag.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Tag.svelte rename to app/src/lib/components/Tag.svelte diff --git a/gitbutler-ui/src/lib/components/TextArea.svelte b/app/src/lib/components/TextArea.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/TextArea.svelte rename to app/src/lib/components/TextArea.svelte diff --git a/gitbutler-ui/src/lib/components/TextBox.svelte b/app/src/lib/components/TextBox.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/TextBox.svelte rename to app/src/lib/components/TextBox.svelte diff --git a/gitbutler-ui/src/lib/components/ThemeSelector.svelte b/app/src/lib/components/ThemeSelector.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ThemeSelector.svelte rename to app/src/lib/components/ThemeSelector.svelte diff --git a/gitbutler-ui/src/lib/components/TimeAgo.svelte b/app/src/lib/components/TimeAgo.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/TimeAgo.svelte rename to app/src/lib/components/TimeAgo.svelte diff --git a/gitbutler-ui/src/lib/components/Toggle.svelte b/app/src/lib/components/Toggle.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Toggle.svelte rename to app/src/lib/components/Toggle.svelte diff --git a/gitbutler-ui/src/lib/components/UpdateBaseButton.svelte b/app/src/lib/components/UpdateBaseButton.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/UpdateBaseButton.svelte rename to app/src/lib/components/UpdateBaseButton.svelte diff --git a/gitbutler-ui/src/lib/components/ViewPrContextMenu.svelte b/app/src/lib/components/ViewPrContextMenu.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/ViewPrContextMenu.svelte rename to app/src/lib/components/ViewPrContextMenu.svelte diff --git a/gitbutler-ui/src/lib/components/Welcome.svelte b/app/src/lib/components/Welcome.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/Welcome.svelte rename to app/src/lib/components/Welcome.svelte diff --git a/gitbutler-ui/src/lib/components/WelcomeAction.svelte b/app/src/lib/components/WelcomeAction.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/WelcomeAction.svelte rename to app/src/lib/components/WelcomeAction.svelte diff --git a/gitbutler-ui/src/lib/components/WelcomeSigninAction.svelte b/app/src/lib/components/WelcomeSigninAction.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/WelcomeSigninAction.svelte rename to app/src/lib/components/WelcomeSigninAction.svelte diff --git a/gitbutler-ui/src/lib/components/contextmenu/ContextMenu.svelte b/app/src/lib/components/contextmenu/ContextMenu.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/contextmenu/ContextMenu.svelte rename to app/src/lib/components/contextmenu/ContextMenu.svelte diff --git a/gitbutler-ui/src/lib/components/contextmenu/ContextMenuItem.svelte b/app/src/lib/components/contextmenu/ContextMenuItem.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/contextmenu/ContextMenuItem.svelte rename to app/src/lib/components/contextmenu/ContextMenuItem.svelte diff --git a/gitbutler-ui/src/lib/components/contextmenu/ContextMenuSection.svelte b/app/src/lib/components/contextmenu/ContextMenuSection.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/contextmenu/ContextMenuSection.svelte rename to app/src/lib/components/contextmenu/ContextMenuSection.svelte diff --git a/gitbutler-ui/src/lib/components/contextmenu/contextMenu.ts b/app/src/lib/components/contextmenu/contextMenu.ts similarity index 100% rename from gitbutler-ui/src/lib/components/contextmenu/contextMenu.ts rename to app/src/lib/components/contextmenu/contextMenu.ts diff --git a/gitbutler-ui/src/lib/components/settings/ContentWrapper.svelte b/app/src/lib/components/settings/ContentWrapper.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/settings/ContentWrapper.svelte rename to app/src/lib/components/settings/ContentWrapper.svelte diff --git a/gitbutler-ui/src/lib/components/settings/ProfileSIdebar.svelte b/app/src/lib/components/settings/ProfileSIdebar.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/settings/ProfileSIdebar.svelte rename to app/src/lib/components/settings/ProfileSIdebar.svelte diff --git a/gitbutler-ui/src/lib/components/settings/Section.svelte b/app/src/lib/components/settings/Section.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/settings/Section.svelte rename to app/src/lib/components/settings/Section.svelte diff --git a/gitbutler-ui/src/lib/components/settings/SupportersBanner.svelte b/app/src/lib/components/settings/SupportersBanner.svelte similarity index 100% rename from gitbutler-ui/src/lib/components/settings/SupportersBanner.svelte rename to app/src/lib/components/settings/SupportersBanner.svelte diff --git a/gitbutler-ui/src/lib/config/appSettings.ts b/app/src/lib/config/appSettings.ts similarity index 100% rename from gitbutler-ui/src/lib/config/appSettings.ts rename to app/src/lib/config/appSettings.ts diff --git a/gitbutler-ui/src/lib/config/config.ts b/app/src/lib/config/config.ts similarity index 100% rename from gitbutler-ui/src/lib/config/config.ts rename to app/src/lib/config/config.ts diff --git a/gitbutler-ui/src/lib/diff/characterIdMap.ts b/app/src/lib/diff/characterIdMap.ts similarity index 100% rename from gitbutler-ui/src/lib/diff/characterIdMap.ts rename to app/src/lib/diff/characterIdMap.ts diff --git a/gitbutler-ui/src/lib/diff/index.ts b/app/src/lib/diff/index.ts similarity index 100% rename from gitbutler-ui/src/lib/diff/index.ts rename to app/src/lib/diff/index.ts diff --git a/gitbutler-ui/src/lib/dragging/draggable.ts b/app/src/lib/dragging/draggable.ts similarity index 100% rename from gitbutler-ui/src/lib/dragging/draggable.ts rename to app/src/lib/dragging/draggable.ts diff --git a/gitbutler-ui/src/lib/dragging/draggables.ts b/app/src/lib/dragging/draggables.ts similarity index 100% rename from gitbutler-ui/src/lib/dragging/draggables.ts rename to app/src/lib/dragging/draggables.ts diff --git a/gitbutler-ui/src/lib/dragging/dropzone.ts b/app/src/lib/dragging/dropzone.ts similarity index 100% rename from gitbutler-ui/src/lib/dragging/dropzone.ts rename to app/src/lib/dragging/dropzone.ts diff --git a/gitbutler-ui/src/lib/ext-icons/index.ts b/app/src/lib/ext-icons/index.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/index.ts rename to app/src/lib/ext-icons/index.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/typeMap.ts b/app/src/lib/ext-icons/vsi/typeMap.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/typeMap.ts rename to app/src/lib/ext-icons/vsi/typeMap.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons1.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons1.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons1.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons1.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons10.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons10.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons10.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons10.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons11.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons11.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons11.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons11.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons12.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons12.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons12.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons12.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons13.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons13.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons13.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons13.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons14.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons14.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons14.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons14.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons2.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons2.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons2.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons2.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons3.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons3.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons3.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons3.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons4.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons4.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons4.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons4.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons5.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons5.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons5.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons5.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons6.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons6.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons6.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons6.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons7.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons7.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons7.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons7.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons8.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons8.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons8.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons8.ts diff --git a/gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons9.ts b/app/src/lib/ext-icons/vsi/vsiFileIcons9.ts similarity index 100% rename from gitbutler-ui/src/lib/ext-icons/vsi/vsiFileIcons9.ts rename to app/src/lib/ext-icons/vsi/vsiFileIcons9.ts diff --git a/gitbutler-ui/src/lib/github/service.ts b/app/src/lib/github/service.ts similarity index 100% rename from gitbutler-ui/src/lib/github/service.ts rename to app/src/lib/github/service.ts diff --git a/gitbutler-ui/src/lib/github/types.ts b/app/src/lib/github/types.ts similarity index 100% rename from gitbutler-ui/src/lib/github/types.ts rename to app/src/lib/github/types.ts diff --git a/gitbutler-ui/src/lib/gravatar/url.ts b/app/src/lib/gravatar/url.ts similarity index 100% rename from gitbutler-ui/src/lib/gravatar/url.ts rename to app/src/lib/gravatar/url.ts diff --git a/gitbutler-ui/src/lib/icons/icons.json b/app/src/lib/icons/icons.json similarity index 100% rename from gitbutler-ui/src/lib/icons/icons.json rename to app/src/lib/icons/icons.json diff --git a/gitbutler-ui/src/lib/notifications/ToastController.svelte b/app/src/lib/notifications/ToastController.svelte similarity index 100% rename from gitbutler-ui/src/lib/notifications/ToastController.svelte rename to app/src/lib/notifications/ToastController.svelte diff --git a/gitbutler-ui/src/lib/notifications/toasts.ts b/app/src/lib/notifications/toasts.ts similarity index 100% rename from gitbutler-ui/src/lib/notifications/toasts.ts rename to app/src/lib/notifications/toasts.ts diff --git a/gitbutler-ui/src/lib/persisted/persisted.ts b/app/src/lib/persisted/persisted.ts similarity index 100% rename from gitbutler-ui/src/lib/persisted/persisted.ts rename to app/src/lib/persisted/persisted.ts diff --git a/gitbutler-ui/src/lib/rxjs/store.ts b/app/src/lib/rxjs/store.ts similarity index 100% rename from gitbutler-ui/src/lib/rxjs/store.ts rename to app/src/lib/rxjs/store.ts diff --git a/gitbutler-ui/src/lib/settings/userSettings.ts b/app/src/lib/settings/userSettings.ts similarity index 100% rename from gitbutler-ui/src/lib/settings/userSettings.ts rename to app/src/lib/settings/userSettings.ts diff --git a/gitbutler-ui/src/lib/stores/fetches.ts b/app/src/lib/stores/fetches.ts similarity index 100% rename from gitbutler-ui/src/lib/stores/fetches.ts rename to app/src/lib/stores/fetches.ts diff --git a/gitbutler-ui/src/lib/stores/head.ts b/app/src/lib/stores/head.ts similarity index 100% rename from gitbutler-ui/src/lib/stores/head.ts rename to app/src/lib/stores/head.ts diff --git a/gitbutler-ui/src/lib/stores/remoteBranches.ts b/app/src/lib/stores/remoteBranches.ts similarity index 100% rename from gitbutler-ui/src/lib/stores/remoteBranches.ts rename to app/src/lib/stores/remoteBranches.ts diff --git a/gitbutler-ui/src/lib/stores/user.ts b/app/src/lib/stores/user.ts similarity index 100% rename from gitbutler-ui/src/lib/stores/user.ts rename to app/src/lib/stores/user.ts diff --git a/gitbutler-ui/src/lib/utils/branch.ts b/app/src/lib/utils/branch.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/branch.ts rename to app/src/lib/utils/branch.ts diff --git a/gitbutler-ui/src/lib/utils/clipboard.ts b/app/src/lib/utils/clipboard.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/clipboard.ts rename to app/src/lib/utils/clipboard.ts diff --git a/gitbutler-ui/src/lib/utils/commitMessage.test.ts b/app/src/lib/utils/commitMessage.test.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/commitMessage.test.ts rename to app/src/lib/utils/commitMessage.test.ts diff --git a/gitbutler-ui/src/lib/utils/commitMessage.ts b/app/src/lib/utils/commitMessage.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/commitMessage.ts rename to app/src/lib/utils/commitMessage.ts diff --git a/gitbutler-ui/src/lib/utils/context.ts b/app/src/lib/utils/context.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/context.ts rename to app/src/lib/utils/context.ts diff --git a/gitbutler-ui/src/lib/utils/debounce.ts b/app/src/lib/utils/debounce.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/debounce.ts rename to app/src/lib/utils/debounce.ts diff --git a/gitbutler-ui/src/lib/utils/events.ts b/app/src/lib/utils/events.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/events.ts rename to app/src/lib/utils/events.ts diff --git a/gitbutler-ui/src/lib/utils/fileSections.test.ts b/app/src/lib/utils/fileSections.test.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/fileSections.test.ts rename to app/src/lib/utils/fileSections.test.ts diff --git a/gitbutler-ui/src/lib/utils/fileSections.ts b/app/src/lib/utils/fileSections.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/fileSections.ts rename to app/src/lib/utils/fileSections.ts diff --git a/gitbutler-ui/src/lib/utils/fileStatus.ts b/app/src/lib/utils/fileStatus.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/fileStatus.ts rename to app/src/lib/utils/fileStatus.ts diff --git a/gitbutler-ui/src/lib/utils/hotkeys.ts b/app/src/lib/utils/hotkeys.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/hotkeys.ts rename to app/src/lib/utils/hotkeys.ts diff --git a/gitbutler-ui/src/lib/utils/joinClassNames.ts b/app/src/lib/utils/joinClassNames.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/joinClassNames.ts rename to app/src/lib/utils/joinClassNames.ts diff --git a/gitbutler-ui/src/lib/utils/metrics.ts b/app/src/lib/utils/metrics.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/metrics.ts rename to app/src/lib/utils/metrics.ts diff --git a/gitbutler-ui/src/lib/utils/paths.ts b/app/src/lib/utils/paths.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/paths.ts rename to app/src/lib/utils/paths.ts diff --git a/gitbutler-ui/src/lib/utils/pxToRem.ts b/app/src/lib/utils/pxToRem.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/pxToRem.ts rename to app/src/lib/utils/pxToRem.ts diff --git a/gitbutler-ui/src/lib/utils/selectFilesInList.ts b/app/src/lib/utils/selectFilesInList.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/selectFilesInList.ts rename to app/src/lib/utils/selectFilesInList.ts diff --git a/gitbutler-ui/src/lib/utils/selection.ts b/app/src/lib/utils/selection.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/selection.ts rename to app/src/lib/utils/selection.ts diff --git a/gitbutler-ui/src/lib/utils/sleep.ts b/app/src/lib/utils/sleep.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/sleep.ts rename to app/src/lib/utils/sleep.ts diff --git a/gitbutler-ui/src/lib/utils/string.ts b/app/src/lib/utils/string.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/string.ts rename to app/src/lib/utils/string.ts diff --git a/gitbutler-ui/src/lib/utils/theme.ts b/app/src/lib/utils/theme.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/theme.ts rename to app/src/lib/utils/theme.ts diff --git a/gitbutler-ui/src/lib/utils/time.ts b/app/src/lib/utils/time.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/time.ts rename to app/src/lib/utils/time.ts diff --git a/gitbutler-ui/src/lib/utils/timeAgo.ts b/app/src/lib/utils/timeAgo.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/timeAgo.ts rename to app/src/lib/utils/timeAgo.ts diff --git a/gitbutler-ui/src/lib/utils/toasts.ts b/app/src/lib/utils/toasts.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/toasts.ts rename to app/src/lib/utils/toasts.ts diff --git a/gitbutler-ui/src/lib/utils/tooltip.ts b/app/src/lib/utils/tooltip.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/tooltip.ts rename to app/src/lib/utils/tooltip.ts diff --git a/gitbutler-ui/src/lib/utils/typeguards.ts b/app/src/lib/utils/typeguards.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/typeguards.ts rename to app/src/lib/utils/typeguards.ts diff --git a/gitbutler-ui/src/lib/utils/unsubscribe.test.ts b/app/src/lib/utils/unsubscribe.test.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/unsubscribe.test.ts rename to app/src/lib/utils/unsubscribe.test.ts diff --git a/gitbutler-ui/src/lib/utils/unsubscribe.ts b/app/src/lib/utils/unsubscribe.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/unsubscribe.ts rename to app/src/lib/utils/unsubscribe.ts diff --git a/gitbutler-ui/src/lib/utils/url.ts b/app/src/lib/utils/url.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/url.ts rename to app/src/lib/utils/url.ts diff --git a/gitbutler-ui/src/lib/utils/useAutoHeight.ts b/app/src/lib/utils/useAutoHeight.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/useAutoHeight.ts rename to app/src/lib/utils/useAutoHeight.ts diff --git a/gitbutler-ui/src/lib/utils/useResize.ts b/app/src/lib/utils/useResize.ts similarity index 100% rename from gitbutler-ui/src/lib/utils/useResize.ts rename to app/src/lib/utils/useResize.ts diff --git a/gitbutler-ui/src/lib/vbranches/branchController.ts b/app/src/lib/vbranches/branchController.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/branchController.ts rename to app/src/lib/vbranches/branchController.ts diff --git a/gitbutler-ui/src/lib/vbranches/branchStoresCache.ts b/app/src/lib/vbranches/branchStoresCache.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/branchStoresCache.ts rename to app/src/lib/vbranches/branchStoresCache.ts diff --git a/gitbutler-ui/src/lib/vbranches/contexts.ts b/app/src/lib/vbranches/contexts.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/contexts.ts rename to app/src/lib/vbranches/contexts.ts diff --git a/gitbutler-ui/src/lib/vbranches/fileSelection.ts b/app/src/lib/vbranches/fileSelection.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/fileSelection.ts rename to app/src/lib/vbranches/fileSelection.ts diff --git a/gitbutler-ui/src/lib/vbranches/filetree.test.ts b/app/src/lib/vbranches/filetree.test.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/filetree.test.ts rename to app/src/lib/vbranches/filetree.test.ts diff --git a/gitbutler-ui/src/lib/vbranches/filetree.ts b/app/src/lib/vbranches/filetree.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/filetree.ts rename to app/src/lib/vbranches/filetree.ts diff --git a/gitbutler-ui/src/lib/vbranches/ownership.ts b/app/src/lib/vbranches/ownership.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/ownership.ts rename to app/src/lib/vbranches/ownership.ts diff --git a/gitbutler-ui/src/lib/vbranches/remoteCommits.ts b/app/src/lib/vbranches/remoteCommits.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/remoteCommits.ts rename to app/src/lib/vbranches/remoteCommits.ts diff --git a/gitbutler-ui/src/lib/vbranches/tooltip.ts b/app/src/lib/vbranches/tooltip.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/tooltip.ts rename to app/src/lib/vbranches/tooltip.ts diff --git a/gitbutler-ui/src/lib/vbranches/types.ts b/app/src/lib/vbranches/types.ts similarity index 100% rename from gitbutler-ui/src/lib/vbranches/types.ts rename to app/src/lib/vbranches/types.ts diff --git a/gitbutler-ui/src/routes/+error.svelte b/app/src/routes/+error.svelte similarity index 100% rename from gitbutler-ui/src/routes/+error.svelte rename to app/src/routes/+error.svelte diff --git a/gitbutler-ui/src/routes/+layout.svelte b/app/src/routes/+layout.svelte similarity index 100% rename from gitbutler-ui/src/routes/+layout.svelte rename to app/src/routes/+layout.svelte diff --git a/gitbutler-ui/src/routes/+layout.ts b/app/src/routes/+layout.ts similarity index 100% rename from gitbutler-ui/src/routes/+layout.ts rename to app/src/routes/+layout.ts diff --git a/gitbutler-ui/src/routes/+page.svelte b/app/src/routes/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/+page.svelte rename to app/src/routes/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/+layout.svelte b/app/src/routes/[projectId]/+layout.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/+layout.svelte rename to app/src/routes/[projectId]/+layout.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/+layout.ts b/app/src/routes/[projectId]/+layout.ts similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/+layout.ts rename to app/src/routes/[projectId]/+layout.ts diff --git a/gitbutler-ui/src/routes/[projectId]/+page.svelte b/app/src/routes/[projectId]/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/+page.svelte rename to app/src/routes/[projectId]/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/base/+page.svelte b/app/src/routes/[projectId]/base/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/base/+page.svelte rename to app/src/routes/[projectId]/base/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/board/+page.svelte b/app/src/routes/[projectId]/board/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/board/+page.svelte rename to app/src/routes/[projectId]/board/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/pull/[number]/+page.svelte b/app/src/routes/[projectId]/pull/[number]/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/pull/[number]/+page.svelte rename to app/src/routes/[projectId]/pull/[number]/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/remote/[sha]/+page.svelte b/app/src/routes/[projectId]/remote/[sha]/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/remote/[sha]/+page.svelte rename to app/src/routes/[projectId]/remote/[sha]/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/settings/+page.svelte b/app/src/routes/[projectId]/settings/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/settings/+page.svelte rename to app/src/routes/[projectId]/settings/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/setup/+page.svelte b/app/src/routes/[projectId]/setup/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/setup/+page.svelte rename to app/src/routes/[projectId]/setup/+page.svelte diff --git a/gitbutler-ui/src/routes/[projectId]/stashed/[branchId]/+page.svelte b/app/src/routes/[projectId]/stashed/[branchId]/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/[projectId]/stashed/[branchId]/+page.svelte rename to app/src/routes/[projectId]/stashed/[branchId]/+page.svelte diff --git a/gitbutler-ui/src/routes/settings/+page.svelte b/app/src/routes/settings/+page.svelte similarity index 100% rename from gitbutler-ui/src/routes/settings/+page.svelte rename to app/src/routes/settings/+page.svelte diff --git a/gitbutler-ui/src/styles/card.css b/app/src/styles/card.css similarity index 100% rename from gitbutler-ui/src/styles/card.css rename to app/src/styles/card.css diff --git a/gitbutler-ui/src/styles/diff.postcss b/app/src/styles/diff.postcss similarity index 100% rename from gitbutler-ui/src/styles/diff.postcss rename to app/src/styles/diff.postcss diff --git a/gitbutler-ui/src/styles/fonts.css b/app/src/styles/fonts.css similarity index 100% rename from gitbutler-ui/src/styles/fonts.css rename to app/src/styles/fonts.css diff --git a/gitbutler-ui/src/styles/main.postcss b/app/src/styles/main.postcss similarity index 100% rename from gitbutler-ui/src/styles/main.postcss rename to app/src/styles/main.postcss diff --git a/gitbutler-ui/src/styles/markdown.css b/app/src/styles/markdown.css similarity index 100% rename from gitbutler-ui/src/styles/markdown.css rename to app/src/styles/markdown.css diff --git a/gitbutler-ui/src/styles/syntax-highlighting.css b/app/src/styles/syntax-highlighting.css similarity index 100% rename from gitbutler-ui/src/styles/syntax-highlighting.css rename to app/src/styles/syntax-highlighting.css diff --git a/gitbutler-ui/src/styles/text-classes.css b/app/src/styles/text-classes.css similarity index 100% rename from gitbutler-ui/src/styles/text-classes.css rename to app/src/styles/text-classes.css diff --git a/gitbutler-ui/src/styles/text-input.css b/app/src/styles/text-input.css similarity index 100% rename from gitbutler-ui/src/styles/text-input.css rename to app/src/styles/text-input.css diff --git a/gitbutler-ui/src/styles/themes.postcss b/app/src/styles/themes.postcss similarity index 100% rename from gitbutler-ui/src/styles/themes.postcss rename to app/src/styles/themes.postcss diff --git a/gitbutler-ui/src/styles/tokens.css b/app/src/styles/tokens.css similarity index 100% rename from gitbutler-ui/src/styles/tokens.css rename to app/src/styles/tokens.css diff --git a/gitbutler-ui/src/styles/tooltip.css b/app/src/styles/tooltip.css similarity index 100% rename from gitbutler-ui/src/styles/tooltip.css rename to app/src/styles/tooltip.css diff --git a/gitbutler-ui/static/fonts/PPEditorialNew-Regular.woff2 b/app/static/fonts/PPEditorialNew-Regular.woff2 similarity index 100% rename from gitbutler-ui/static/fonts/PPEditorialNew-Regular.woff2 rename to app/static/fonts/PPEditorialNew-Regular.woff2 diff --git a/gitbutler-ui/static/fonts/SplineSansMono-Medium.woff2 b/app/static/fonts/SplineSansMono-Medium.woff2 similarity index 100% rename from gitbutler-ui/static/fonts/SplineSansMono-Medium.woff2 rename to app/static/fonts/SplineSansMono-Medium.woff2 diff --git a/gitbutler-ui/static/fonts/SplineSansMono-Regular.woff2 b/app/static/fonts/SplineSansMono-Regular.woff2 similarity index 100% rename from gitbutler-ui/static/fonts/SplineSansMono-Regular.woff2 rename to app/static/fonts/SplineSansMono-Regular.woff2 diff --git a/gitbutler-ui/static/fonts/SplineSansMono-Semibold.woff2 b/app/static/fonts/SplineSansMono-Semibold.woff2 similarity index 100% rename from gitbutler-ui/static/fonts/SplineSansMono-Semibold.woff2 rename to app/static/fonts/SplineSansMono-Semibold.woff2 diff --git a/gitbutler-ui/static/images/banners/support.svg b/app/static/images/banners/support.svg similarity index 100% rename from gitbutler-ui/static/images/banners/support.svg rename to app/static/images/banners/support.svg diff --git a/gitbutler-ui/static/images/domain-icons/trunk.svg b/app/static/images/domain-icons/trunk.svg similarity index 100% rename from gitbutler-ui/static/images/domain-icons/trunk.svg rename to app/static/images/domain-icons/trunk.svg diff --git a/gitbutler-ui/static/images/domain-icons/working-branches.svg b/app/static/images/domain-icons/working-branches.svg similarity index 100% rename from gitbutler-ui/static/images/domain-icons/working-branches.svg rename to app/static/images/domain-icons/working-branches.svg diff --git a/gitbutler-ui/static/images/theme-previews/dark.svg b/app/static/images/theme-previews/dark.svg similarity index 100% rename from gitbutler-ui/static/images/theme-previews/dark.svg rename to app/static/images/theme-previews/dark.svg diff --git a/gitbutler-ui/static/images/theme-previews/light.svg b/app/static/images/theme-previews/light.svg similarity index 100% rename from gitbutler-ui/static/images/theme-previews/light.svg rename to app/static/images/theme-previews/light.svg diff --git a/gitbutler-ui/static/images/theme-previews/system.svg b/app/static/images/theme-previews/system.svg similarity index 100% rename from gitbutler-ui/static/images/theme-previews/system.svg rename to app/static/images/theme-previews/system.svg diff --git a/gitbutler-ui/svelte.config.js b/app/svelte.config.js similarity index 100% rename from gitbutler-ui/svelte.config.js rename to app/svelte.config.js diff --git a/gitbutler-ui/tailwind.config.cjs b/app/tailwind.config.cjs similarity index 100% rename from gitbutler-ui/tailwind.config.cjs rename to app/tailwind.config.cjs diff --git a/gitbutler-ui/tsconfig.json b/app/tsconfig.json similarity index 100% rename from gitbutler-ui/tsconfig.json rename to app/tsconfig.json diff --git a/gitbutler-ui/vite.config.ts b/app/vite.config.ts similarity index 100% rename from gitbutler-ui/vite.config.ts rename to app/vite.config.ts diff --git a/gitbutler-changeset/Cargo.toml b/crates/gitbutler-changeset/Cargo.toml similarity index 100% rename from gitbutler-changeset/Cargo.toml rename to crates/gitbutler-changeset/Cargo.toml diff --git a/gitbutler-changeset/fixture/code1.txt b/crates/gitbutler-changeset/fixture/code1.txt similarity index 100% rename from gitbutler-changeset/fixture/code1.txt rename to crates/gitbutler-changeset/fixture/code1.txt diff --git a/gitbutler-changeset/fixture/code2.txt b/crates/gitbutler-changeset/fixture/code2.txt similarity index 100% rename from gitbutler-changeset/fixture/code2.txt rename to crates/gitbutler-changeset/fixture/code2.txt diff --git a/gitbutler-changeset/fixture/code3.txt b/crates/gitbutler-changeset/fixture/code3.txt similarity index 100% rename from gitbutler-changeset/fixture/code3.txt rename to crates/gitbutler-changeset/fixture/code3.txt diff --git a/gitbutler-changeset/fixture/code4.txt b/crates/gitbutler-changeset/fixture/code4.txt similarity index 100% rename from gitbutler-changeset/fixture/code4.txt rename to crates/gitbutler-changeset/fixture/code4.txt diff --git a/gitbutler-changeset/fixture/large1.txt b/crates/gitbutler-changeset/fixture/large1.txt similarity index 100% rename from gitbutler-changeset/fixture/large1.txt rename to crates/gitbutler-changeset/fixture/large1.txt diff --git a/gitbutler-changeset/fixture/large2.txt b/crates/gitbutler-changeset/fixture/large2.txt similarity index 100% rename from gitbutler-changeset/fixture/large2.txt rename to crates/gitbutler-changeset/fixture/large2.txt diff --git a/gitbutler-changeset/fixture/text1.txt b/crates/gitbutler-changeset/fixture/text1.txt similarity index 100% rename from gitbutler-changeset/fixture/text1.txt rename to crates/gitbutler-changeset/fixture/text1.txt diff --git a/gitbutler-changeset/fixture/text2.txt b/crates/gitbutler-changeset/fixture/text2.txt similarity index 100% rename from gitbutler-changeset/fixture/text2.txt rename to crates/gitbutler-changeset/fixture/text2.txt diff --git a/gitbutler-changeset/fixture/text3.txt b/crates/gitbutler-changeset/fixture/text3.txt similarity index 100% rename from gitbutler-changeset/fixture/text3.txt rename to crates/gitbutler-changeset/fixture/text3.txt diff --git a/gitbutler-changeset/src/diff.rs b/crates/gitbutler-changeset/src/diff.rs similarity index 100% rename from gitbutler-changeset/src/diff.rs rename to crates/gitbutler-changeset/src/diff.rs diff --git a/gitbutler-changeset/src/diff/hunk.rs b/crates/gitbutler-changeset/src/diff/hunk.rs similarity index 100% rename from gitbutler-changeset/src/diff/hunk.rs rename to crates/gitbutler-changeset/src/diff/hunk.rs diff --git a/gitbutler-changeset/src/lib.rs b/crates/gitbutler-changeset/src/lib.rs similarity index 100% rename from gitbutler-changeset/src/lib.rs rename to crates/gitbutler-changeset/src/lib.rs diff --git a/gitbutler-changeset/src/signature.rs b/crates/gitbutler-changeset/src/signature.rs similarity index 100% rename from gitbutler-changeset/src/signature.rs rename to crates/gitbutler-changeset/src/signature.rs diff --git a/gitbutler-changeset/src/span.rs b/crates/gitbutler-changeset/src/span.rs similarity index 100% rename from gitbutler-changeset/src/span.rs rename to crates/gitbutler-changeset/src/span.rs diff --git a/gitbutler-git/Cargo.toml b/crates/gitbutler-git/Cargo.toml similarity index 100% rename from gitbutler-git/Cargo.toml rename to crates/gitbutler-git/Cargo.toml diff --git a/gitbutler-git/src/bin/askpass.rs b/crates/gitbutler-git/src/bin/askpass.rs similarity index 100% rename from gitbutler-git/src/bin/askpass.rs rename to crates/gitbutler-git/src/bin/askpass.rs diff --git a/gitbutler-git/src/bin/askpass/unix.rs b/crates/gitbutler-git/src/bin/askpass/unix.rs similarity index 100% rename from gitbutler-git/src/bin/askpass/unix.rs rename to crates/gitbutler-git/src/bin/askpass/unix.rs diff --git a/gitbutler-git/src/bin/askpass/windows.rs b/crates/gitbutler-git/src/bin/askpass/windows.rs similarity index 100% rename from gitbutler-git/src/bin/askpass/windows.rs rename to crates/gitbutler-git/src/bin/askpass/windows.rs diff --git a/gitbutler-git/src/bin/setsid.rs b/crates/gitbutler-git/src/bin/setsid.rs similarity index 100% rename from gitbutler-git/src/bin/setsid.rs rename to crates/gitbutler-git/src/bin/setsid.rs diff --git a/gitbutler-git/src/bin/setsid/unix.rs b/crates/gitbutler-git/src/bin/setsid/unix.rs similarity index 100% rename from gitbutler-git/src/bin/setsid/unix.rs rename to crates/gitbutler-git/src/bin/setsid/unix.rs diff --git a/gitbutler-git/src/bin/setsid/windows.rs b/crates/gitbutler-git/src/bin/setsid/windows.rs similarity index 100% rename from gitbutler-git/src/bin/setsid/windows.rs rename to crates/gitbutler-git/src/bin/setsid/windows.rs diff --git a/gitbutler-git/src/error.rs b/crates/gitbutler-git/src/error.rs similarity index 100% rename from gitbutler-git/src/error.rs rename to crates/gitbutler-git/src/error.rs diff --git a/gitbutler-git/src/executor.rs b/crates/gitbutler-git/src/executor.rs similarity index 100% rename from gitbutler-git/src/executor.rs rename to crates/gitbutler-git/src/executor.rs diff --git a/gitbutler-git/src/executor/tokio.rs b/crates/gitbutler-git/src/executor/tokio.rs similarity index 100% rename from gitbutler-git/src/executor/tokio.rs rename to crates/gitbutler-git/src/executor/tokio.rs diff --git a/gitbutler-git/src/executor/tokio/unix.rs b/crates/gitbutler-git/src/executor/tokio/unix.rs similarity index 100% rename from gitbutler-git/src/executor/tokio/unix.rs rename to crates/gitbutler-git/src/executor/tokio/unix.rs diff --git a/gitbutler-git/src/executor/tokio/windows.rs b/crates/gitbutler-git/src/executor/tokio/windows.rs similarity index 100% rename from gitbutler-git/src/executor/tokio/windows.rs rename to crates/gitbutler-git/src/executor/tokio/windows.rs diff --git a/gitbutler-git/src/lib.rs b/crates/gitbutler-git/src/lib.rs similarity index 100% rename from gitbutler-git/src/lib.rs rename to crates/gitbutler-git/src/lib.rs diff --git a/gitbutler-git/src/refspec.rs b/crates/gitbutler-git/src/refspec.rs similarity index 100% rename from gitbutler-git/src/refspec.rs rename to crates/gitbutler-git/src/refspec.rs diff --git a/gitbutler-git/src/repository.rs b/crates/gitbutler-git/src/repository.rs similarity index 100% rename from gitbutler-git/src/repository.rs rename to crates/gitbutler-git/src/repository.rs diff --git a/gitbutler-app/.gitignore b/crates/gitbutler-tauri/.gitignore similarity index 100% rename from gitbutler-app/.gitignore rename to crates/gitbutler-tauri/.gitignore diff --git a/gitbutler-app/Cargo.toml b/crates/gitbutler-tauri/Cargo.toml similarity index 100% rename from gitbutler-app/Cargo.toml rename to crates/gitbutler-tauri/Cargo.toml diff --git a/gitbutler-app/build.rs b/crates/gitbutler-tauri/build.rs similarity index 100% rename from gitbutler-app/build.rs rename to crates/gitbutler-tauri/build.rs diff --git a/gitbutler-app/icons/128x128.png b/crates/gitbutler-tauri/icons/128x128.png similarity index 100% rename from gitbutler-app/icons/128x128.png rename to crates/gitbutler-tauri/icons/128x128.png diff --git a/gitbutler-app/icons/128x128@2x.png b/crates/gitbutler-tauri/icons/128x128@2x.png similarity index 100% rename from gitbutler-app/icons/128x128@2x.png rename to crates/gitbutler-tauri/icons/128x128@2x.png diff --git a/gitbutler-app/icons/32x32.png b/crates/gitbutler-tauri/icons/32x32.png similarity index 100% rename from gitbutler-app/icons/32x32.png rename to crates/gitbutler-tauri/icons/32x32.png diff --git a/gitbutler-app/icons/Square107x107Logo.png b/crates/gitbutler-tauri/icons/Square107x107Logo.png similarity index 100% rename from gitbutler-app/icons/Square107x107Logo.png rename to crates/gitbutler-tauri/icons/Square107x107Logo.png diff --git a/gitbutler-app/icons/Square142x142Logo.png b/crates/gitbutler-tauri/icons/Square142x142Logo.png similarity index 100% rename from gitbutler-app/icons/Square142x142Logo.png rename to crates/gitbutler-tauri/icons/Square142x142Logo.png diff --git a/gitbutler-app/icons/Square150x150Logo.png b/crates/gitbutler-tauri/icons/Square150x150Logo.png similarity index 100% rename from gitbutler-app/icons/Square150x150Logo.png rename to crates/gitbutler-tauri/icons/Square150x150Logo.png diff --git a/gitbutler-app/icons/Square284x284Logo.png b/crates/gitbutler-tauri/icons/Square284x284Logo.png similarity index 100% rename from gitbutler-app/icons/Square284x284Logo.png rename to crates/gitbutler-tauri/icons/Square284x284Logo.png diff --git a/gitbutler-app/icons/Square30x30Logo.png b/crates/gitbutler-tauri/icons/Square30x30Logo.png similarity index 100% rename from gitbutler-app/icons/Square30x30Logo.png rename to crates/gitbutler-tauri/icons/Square30x30Logo.png diff --git a/gitbutler-app/icons/Square310x310Logo.png b/crates/gitbutler-tauri/icons/Square310x310Logo.png similarity index 100% rename from gitbutler-app/icons/Square310x310Logo.png rename to crates/gitbutler-tauri/icons/Square310x310Logo.png diff --git a/gitbutler-app/icons/Square44x44Logo.png b/crates/gitbutler-tauri/icons/Square44x44Logo.png similarity index 100% rename from gitbutler-app/icons/Square44x44Logo.png rename to crates/gitbutler-tauri/icons/Square44x44Logo.png diff --git a/gitbutler-app/icons/Square71x71Logo.png b/crates/gitbutler-tauri/icons/Square71x71Logo.png similarity index 100% rename from gitbutler-app/icons/Square71x71Logo.png rename to crates/gitbutler-tauri/icons/Square71x71Logo.png diff --git a/gitbutler-app/icons/Square89x89Logo.png b/crates/gitbutler-tauri/icons/Square89x89Logo.png similarity index 100% rename from gitbutler-app/icons/Square89x89Logo.png rename to crates/gitbutler-tauri/icons/Square89x89Logo.png diff --git a/gitbutler-app/icons/StoreLogo.png b/crates/gitbutler-tauri/icons/StoreLogo.png similarity index 100% rename from gitbutler-app/icons/StoreLogo.png rename to crates/gitbutler-tauri/icons/StoreLogo.png diff --git a/gitbutler-app/icons/dev/128x128.png b/crates/gitbutler-tauri/icons/dev/128x128.png similarity index 100% rename from gitbutler-app/icons/dev/128x128.png rename to crates/gitbutler-tauri/icons/dev/128x128.png diff --git a/gitbutler-app/icons/dev/128x128@2x.png b/crates/gitbutler-tauri/icons/dev/128x128@2x.png similarity index 100% rename from gitbutler-app/icons/dev/128x128@2x.png rename to crates/gitbutler-tauri/icons/dev/128x128@2x.png diff --git a/gitbutler-app/icons/dev/32x32.png b/crates/gitbutler-tauri/icons/dev/32x32.png similarity index 100% rename from gitbutler-app/icons/dev/32x32.png rename to crates/gitbutler-tauri/icons/dev/32x32.png diff --git a/gitbutler-app/icons/dev/icon.icns b/crates/gitbutler-tauri/icons/dev/icon.icns similarity index 100% rename from gitbutler-app/icons/dev/icon.icns rename to crates/gitbutler-tauri/icons/dev/icon.icns diff --git a/gitbutler-app/icons/dev/icon.ico b/crates/gitbutler-tauri/icons/dev/icon.ico similarity index 100% rename from gitbutler-app/icons/dev/icon.ico rename to crates/gitbutler-tauri/icons/dev/icon.ico diff --git a/gitbutler-app/icons/icon.icns b/crates/gitbutler-tauri/icons/icon.icns similarity index 100% rename from gitbutler-app/icons/icon.icns rename to crates/gitbutler-tauri/icons/icon.icns diff --git a/gitbutler-app/icons/icon.ico b/crates/gitbutler-tauri/icons/icon.ico similarity index 100% rename from gitbutler-app/icons/icon.ico rename to crates/gitbutler-tauri/icons/icon.ico diff --git a/gitbutler-app/icons/icon.png b/crates/gitbutler-tauri/icons/icon.png similarity index 100% rename from gitbutler-app/icons/icon.png rename to crates/gitbutler-tauri/icons/icon.png diff --git a/gitbutler-app/icons/tray.png b/crates/gitbutler-tauri/icons/tray.png similarity index 100% rename from gitbutler-app/icons/tray.png rename to crates/gitbutler-tauri/icons/tray.png diff --git a/gitbutler-app/inject-git-binaries.sh b/crates/gitbutler-tauri/inject-git-binaries.sh similarity index 100% rename from gitbutler-app/inject-git-binaries.sh rename to crates/gitbutler-tauri/inject-git-binaries.sh diff --git a/gitbutler-app/src/analytics.rs b/crates/gitbutler-tauri/src/analytics.rs similarity index 100% rename from gitbutler-app/src/analytics.rs rename to crates/gitbutler-tauri/src/analytics.rs diff --git a/gitbutler-app/src/analytics/posthog.rs b/crates/gitbutler-tauri/src/analytics/posthog.rs similarity index 100% rename from gitbutler-app/src/analytics/posthog.rs rename to crates/gitbutler-tauri/src/analytics/posthog.rs diff --git a/gitbutler-app/src/analytics/posthog/mock.rs b/crates/gitbutler-tauri/src/analytics/posthog/mock.rs similarity index 100% rename from gitbutler-app/src/analytics/posthog/mock.rs rename to crates/gitbutler-tauri/src/analytics/posthog/mock.rs diff --git a/gitbutler-app/src/analytics/posthog/real.rs b/crates/gitbutler-tauri/src/analytics/posthog/real.rs similarity index 100% rename from gitbutler-app/src/analytics/posthog/real.rs rename to crates/gitbutler-tauri/src/analytics/posthog/real.rs diff --git a/gitbutler-app/src/analytics/posthog/retry.rs b/crates/gitbutler-tauri/src/analytics/posthog/retry.rs similarity index 100% rename from gitbutler-app/src/analytics/posthog/retry.rs rename to crates/gitbutler-tauri/src/analytics/posthog/retry.rs diff --git a/gitbutler-app/src/app.rs b/crates/gitbutler-tauri/src/app.rs similarity index 100% rename from gitbutler-app/src/app.rs rename to crates/gitbutler-tauri/src/app.rs diff --git a/gitbutler-app/src/askpass.rs b/crates/gitbutler-tauri/src/askpass.rs similarity index 100% rename from gitbutler-app/src/askpass.rs rename to crates/gitbutler-tauri/src/askpass.rs diff --git a/gitbutler-app/src/commands.rs b/crates/gitbutler-tauri/src/commands.rs similarity index 100% rename from gitbutler-app/src/commands.rs rename to crates/gitbutler-tauri/src/commands.rs diff --git a/gitbutler-app/src/deltas.rs b/crates/gitbutler-tauri/src/deltas.rs similarity index 100% rename from gitbutler-app/src/deltas.rs rename to crates/gitbutler-tauri/src/deltas.rs diff --git a/gitbutler-app/src/error.rs b/crates/gitbutler-tauri/src/error.rs similarity index 100% rename from gitbutler-app/src/error.rs rename to crates/gitbutler-tauri/src/error.rs diff --git a/gitbutler-app/src/events.rs b/crates/gitbutler-tauri/src/events.rs similarity index 100% rename from gitbutler-app/src/events.rs rename to crates/gitbutler-tauri/src/events.rs diff --git a/gitbutler-app/src/github.rs b/crates/gitbutler-tauri/src/github.rs similarity index 100% rename from gitbutler-app/src/github.rs rename to crates/gitbutler-tauri/src/github.rs diff --git a/gitbutler-app/src/keys.rs b/crates/gitbutler-tauri/src/keys.rs similarity index 100% rename from gitbutler-app/src/keys.rs rename to crates/gitbutler-tauri/src/keys.rs diff --git a/gitbutler-app/src/lib.rs b/crates/gitbutler-tauri/src/lib.rs similarity index 100% rename from gitbutler-app/src/lib.rs rename to crates/gitbutler-tauri/src/lib.rs diff --git a/gitbutler-app/src/logs.rs b/crates/gitbutler-tauri/src/logs.rs similarity index 100% rename from gitbutler-app/src/logs.rs rename to crates/gitbutler-tauri/src/logs.rs diff --git a/gitbutler-app/src/main.rs b/crates/gitbutler-tauri/src/main.rs similarity index 100% rename from gitbutler-app/src/main.rs rename to crates/gitbutler-tauri/src/main.rs diff --git a/gitbutler-app/src/menu.rs b/crates/gitbutler-tauri/src/menu.rs similarity index 100% rename from gitbutler-app/src/menu.rs rename to crates/gitbutler-tauri/src/menu.rs diff --git a/gitbutler-app/src/projects.rs b/crates/gitbutler-tauri/src/projects.rs similarity index 100% rename from gitbutler-app/src/projects.rs rename to crates/gitbutler-tauri/src/projects.rs diff --git a/gitbutler-app/src/sentry.rs b/crates/gitbutler-tauri/src/sentry.rs similarity index 100% rename from gitbutler-app/src/sentry.rs rename to crates/gitbutler-tauri/src/sentry.rs diff --git a/gitbutler-app/src/sessions.rs b/crates/gitbutler-tauri/src/sessions.rs similarity index 100% rename from gitbutler-app/src/sessions.rs rename to crates/gitbutler-tauri/src/sessions.rs diff --git a/gitbutler-app/src/sessions/commands.rs b/crates/gitbutler-tauri/src/sessions/commands.rs similarity index 100% rename from gitbutler-app/src/sessions/commands.rs rename to crates/gitbutler-tauri/src/sessions/commands.rs diff --git a/gitbutler-app/src/users.rs b/crates/gitbutler-tauri/src/users.rs similarity index 100% rename from gitbutler-app/src/users.rs rename to crates/gitbutler-tauri/src/users.rs diff --git a/gitbutler-app/src/virtual_branches.rs b/crates/gitbutler-tauri/src/virtual_branches.rs similarity index 100% rename from gitbutler-app/src/virtual_branches.rs rename to crates/gitbutler-tauri/src/virtual_branches.rs diff --git a/gitbutler-app/src/watcher.rs b/crates/gitbutler-tauri/src/watcher.rs similarity index 100% rename from gitbutler-app/src/watcher.rs rename to crates/gitbutler-tauri/src/watcher.rs diff --git a/gitbutler-app/src/watcher/dispatchers.rs b/crates/gitbutler-tauri/src/watcher/dispatchers.rs similarity index 100% rename from gitbutler-app/src/watcher/dispatchers.rs rename to crates/gitbutler-tauri/src/watcher/dispatchers.rs diff --git a/gitbutler-app/src/watcher/dispatchers/file_change.rs b/crates/gitbutler-tauri/src/watcher/dispatchers/file_change.rs similarity index 100% rename from gitbutler-app/src/watcher/dispatchers/file_change.rs rename to crates/gitbutler-tauri/src/watcher/dispatchers/file_change.rs diff --git a/gitbutler-app/src/watcher/events.rs b/crates/gitbutler-tauri/src/watcher/events.rs similarity index 100% rename from gitbutler-app/src/watcher/events.rs rename to crates/gitbutler-tauri/src/watcher/events.rs diff --git a/gitbutler-app/src/watcher/handlers.rs b/crates/gitbutler-tauri/src/watcher/handlers.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers.rs rename to crates/gitbutler-tauri/src/watcher/handlers.rs diff --git a/gitbutler-app/src/watcher/handlers/analytics_handler.rs b/crates/gitbutler-tauri/src/watcher/handlers/analytics_handler.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/analytics_handler.rs rename to crates/gitbutler-tauri/src/watcher/handlers/analytics_handler.rs diff --git a/gitbutler-app/src/watcher/handlers/calculate_deltas_handler.rs b/crates/gitbutler-tauri/src/watcher/handlers/calculate_deltas_handler.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/calculate_deltas_handler.rs rename to crates/gitbutler-tauri/src/watcher/handlers/calculate_deltas_handler.rs diff --git a/gitbutler-app/src/watcher/handlers/caltulate_virtual_branches_handler.rs b/crates/gitbutler-tauri/src/watcher/handlers/caltulate_virtual_branches_handler.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/caltulate_virtual_branches_handler.rs rename to crates/gitbutler-tauri/src/watcher/handlers/caltulate_virtual_branches_handler.rs diff --git a/gitbutler-app/src/watcher/handlers/fetch_gitbutler_data.rs b/crates/gitbutler-tauri/src/watcher/handlers/fetch_gitbutler_data.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/fetch_gitbutler_data.rs rename to crates/gitbutler-tauri/src/watcher/handlers/fetch_gitbutler_data.rs diff --git a/gitbutler-app/src/watcher/handlers/filter_ignored_files.rs b/crates/gitbutler-tauri/src/watcher/handlers/filter_ignored_files.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/filter_ignored_files.rs rename to crates/gitbutler-tauri/src/watcher/handlers/filter_ignored_files.rs diff --git a/gitbutler-app/src/watcher/handlers/flush_session.rs b/crates/gitbutler-tauri/src/watcher/handlers/flush_session.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/flush_session.rs rename to crates/gitbutler-tauri/src/watcher/handlers/flush_session.rs diff --git a/gitbutler-app/src/watcher/handlers/git_file_change.rs b/crates/gitbutler-tauri/src/watcher/handlers/git_file_change.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/git_file_change.rs rename to crates/gitbutler-tauri/src/watcher/handlers/git_file_change.rs diff --git a/gitbutler-app/src/watcher/handlers/index_handler.rs b/crates/gitbutler-tauri/src/watcher/handlers/index_handler.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/index_handler.rs rename to crates/gitbutler-tauri/src/watcher/handlers/index_handler.rs diff --git a/gitbutler-app/src/watcher/handlers/push_gitbutler_data.rs b/crates/gitbutler-tauri/src/watcher/handlers/push_gitbutler_data.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/push_gitbutler_data.rs rename to crates/gitbutler-tauri/src/watcher/handlers/push_gitbutler_data.rs diff --git a/gitbutler-app/src/watcher/handlers/push_project_to_gitbutler.rs b/crates/gitbutler-tauri/src/watcher/handlers/push_project_to_gitbutler.rs similarity index 100% rename from gitbutler-app/src/watcher/handlers/push_project_to_gitbutler.rs rename to crates/gitbutler-tauri/src/watcher/handlers/push_project_to_gitbutler.rs diff --git a/gitbutler-app/src/zip.rs b/crates/gitbutler-tauri/src/zip.rs similarity index 100% rename from gitbutler-app/src/zip.rs rename to crates/gitbutler-tauri/src/zip.rs diff --git a/gitbutler-app/tauri.conf.json b/crates/gitbutler-tauri/tauri.conf.json similarity index 100% rename from gitbutler-app/tauri.conf.json rename to crates/gitbutler-tauri/tauri.conf.json diff --git a/gitbutler-app/tauri.conf.nightly.json b/crates/gitbutler-tauri/tauri.conf.nightly.json similarity index 100% rename from gitbutler-app/tauri.conf.nightly.json rename to crates/gitbutler-tauri/tauri.conf.nightly.json diff --git a/gitbutler-app/tauri.conf.release.json b/crates/gitbutler-tauri/tauri.conf.release.json similarity index 100% rename from gitbutler-app/tauri.conf.release.json rename to crates/gitbutler-tauri/tauri.conf.release.json diff --git a/gitbutler-app/tests/app.rs b/crates/gitbutler-tauri/tests/app.rs similarity index 100% rename from gitbutler-app/tests/app.rs rename to crates/gitbutler-tauri/tests/app.rs diff --git a/gitbutler-app/tests/watcher/handler/calculate_delta_handler.rs b/crates/gitbutler-tauri/tests/watcher/handler/calculate_delta_handler.rs similarity index 100% rename from gitbutler-app/tests/watcher/handler/calculate_delta_handler.rs rename to crates/gitbutler-tauri/tests/watcher/handler/calculate_delta_handler.rs diff --git a/gitbutler-app/tests/watcher/handler/fetch_gitbutler_data.rs b/crates/gitbutler-tauri/tests/watcher/handler/fetch_gitbutler_data.rs similarity index 100% rename from gitbutler-app/tests/watcher/handler/fetch_gitbutler_data.rs rename to crates/gitbutler-tauri/tests/watcher/handler/fetch_gitbutler_data.rs diff --git a/gitbutler-app/tests/watcher/handler/git_file_change.rs b/crates/gitbutler-tauri/tests/watcher/handler/git_file_change.rs similarity index 100% rename from gitbutler-app/tests/watcher/handler/git_file_change.rs rename to crates/gitbutler-tauri/tests/watcher/handler/git_file_change.rs diff --git a/gitbutler-app/tests/watcher/handler/mod.rs b/crates/gitbutler-tauri/tests/watcher/handler/mod.rs similarity index 100% rename from gitbutler-app/tests/watcher/handler/mod.rs rename to crates/gitbutler-tauri/tests/watcher/handler/mod.rs diff --git a/gitbutler-app/tests/watcher/handler/push_project_to_gitbutler.rs b/crates/gitbutler-tauri/tests/watcher/handler/push_project_to_gitbutler.rs similarity index 100% rename from gitbutler-app/tests/watcher/handler/push_project_to_gitbutler.rs rename to crates/gitbutler-tauri/tests/watcher/handler/push_project_to_gitbutler.rs diff --git a/gitbutler-app/tests/watcher/mod.rs b/crates/gitbutler-tauri/tests/watcher/mod.rs similarity index 100% rename from gitbutler-app/tests/watcher/mod.rs rename to crates/gitbutler-tauri/tests/watcher/mod.rs