diff --git a/src/renderer/src/components/editor/CombinedDiffViewer.tsx b/src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx
similarity index 100%
rename from src/renderer/src/components/editor/CombinedDiffViewer.tsx
rename to src/renderer/src/components/editor/combined-diff/CombinedDiffViewer.tsx
diff --git a/src/renderer/src/components/editor/combined-diff-file-tree-row.tsx b/src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-row.tsx
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-file-tree-row.tsx
rename to src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree-row.tsx
diff --git a/src/renderer/src/components/editor/CombinedDiffFileTree.test.ts b/src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/CombinedDiffFileTree.test.ts
rename to src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree.test.ts
diff --git a/src/renderer/src/components/editor/CombinedDiffFileTree.tsx b/src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree.tsx
similarity index 100%
rename from src/renderer/src/components/editor/CombinedDiffFileTree.tsx
rename to src/renderer/src/components/editor/combined-diff/browse-files/combined-diff-file-tree.tsx
diff --git a/src/renderer/src/components/editor/use-combined-diff-file-tree-resize.test.tsx b/src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-file-tree-resize.test.tsx
similarity index 100%
rename from src/renderer/src/components/editor/use-combined-diff-file-tree-resize.test.tsx
rename to src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-file-tree-resize.test.tsx
diff --git a/src/renderer/src/components/editor/use-combined-diff-file-tree-resize.ts b/src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-file-tree-resize.ts
similarity index 100%
rename from src/renderer/src/components/editor/use-combined-diff-file-tree-resize.ts
rename to src/renderer/src/components/editor/combined-diff/browse-files/use-combined-diff-file-tree-resize.ts
diff --git a/src/renderer/src/components/editor/combined-diff-initial-section-load.test.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-initial-section-load.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-initial-section-load.test.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-initial-section-load.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-initial-section-load.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-initial-section-load.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-initial-section-load.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-initial-section-load.ts
diff --git a/src/renderer/src/components/editor/combined-diff-load-scheduler.test.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-load-scheduler.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-load-scheduler.test.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-load-scheduler.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-load-scheduler.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-load-scheduler.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-load-scheduler.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-load-scheduler.ts
diff --git a/src/renderer/src/components/editor/combined-diff-section-connection.test.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-section-connection.test.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-section-connection.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-section-connection.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-connection.ts
diff --git a/src/renderer/src/components/editor/combined-diff-section-load-state.test.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-load-state.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-section-load-state.test.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-load-state.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-section-load-state.ts b/src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-load-state.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-section-load-state.ts
rename to src/renderer/src/components/editor/combined-diff/load-sections/combined-diff-section-load-state.ts
diff --git a/src/renderer/src/components/editor/combined-diff-entries.test.ts b/src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-entries.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-entries.test.ts
rename to src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-entries.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-entries.ts b/src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-entries.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-entries.ts
rename to src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-entries.ts
diff --git a/src/renderer/src/components/editor/combined-diff-section-cache-match.test.ts b/src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-section-cache-match.test.ts
rename to src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-section-cache-match.ts b/src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-section-cache-match.ts
rename to src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-cache-match.ts
diff --git a/src/renderer/src/components/editor/combined-diff-file-tree-model.ts b/src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-identity.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-file-tree-model.ts
rename to src/renderer/src/components/editor/combined-diff/resolve-changes/combined-diff-section-identity.ts
diff --git a/src/renderer/src/components/editor/combined-diff-commit-message.test.ts b/src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-commit-message.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-commit-message.test.ts
rename to src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-commit-message.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-commit-message.ts b/src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-commit-message.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-commit-message.ts
rename to src/renderer/src/components/editor/combined-diff/review-controls/combined-diff-commit-message.ts
diff --git a/src/renderer/src/components/editor/combined-diff-scrollbar-drag.test.ts b/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-scrollbar-drag.test.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-scrollbar-drag.test.ts
rename to src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-scrollbar-drag.test.ts
diff --git a/src/renderer/src/components/editor/combined-diff-scrollbar-drag.ts b/src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-scrollbar-drag.ts
similarity index 100%
rename from src/renderer/src/components/editor/combined-diff-scrollbar-drag.ts
rename to src/renderer/src/components/editor/combined-diff/scroll-viewport/combined-diff-scrollbar-drag.ts