Removes more aggregate re-exporting files

src/annotations/annotations.ts

@@ -13,7 +13,7 @@ import {
 import { HeatmapLocations } from '../config';
 import { Config, configuration } from '../configuration';
 import { Colors, GlyphChars } from '../constants';
-import { CommitFormatOptions, CommitFormatter } from '../git/formatters';
+import { CommitFormatOptions, CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitCommit } from '../git/models/commit';
 import { getWidth, interpolate, pad } from '../system/string';
 import { toRgba } from '../webviews/apps/shared/colors';

src/annotations/gutterBlameAnnotationProvider.ts

@@ -2,7 +2,7 @@ import { DecorationOptions, Range, TextEditor, ThemableDecorationAttachmentRende
 import { configuration, FileAnnotationType, GravatarDefaultStyle } from '../configuration';
 import { GlyphChars } from '../constants';
 import type { Container } from '../container';
-import { CommitFormatOptions, CommitFormatter } from '../git/formatters';
+import { CommitFormatOptions, CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitBlame } from '../git/models/blame';
 import type { GitCommit } from '../git/models/commit';
 import { Logger } from '../logger';

src/annotations/lineAnnotationController.ts

@@ -13,7 +13,7 @@ import {
 import { configuration } from '../configuration';
 import { GlyphChars } from '../constants';
 import type { Container } from '../container';
-import { CommitFormatter } from '../git/formatters';
+import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitCommit } from '../git/models/commit';
 import type { PullRequest } from '../git/models/pullRequest';
 import { Authentication } from '../git/remotes/provider';

src/commands/base.ts

@@ -20,7 +20,7 @@ import type { GitReference } from '../git/models/reference';
 import { GitRemote } from '../git/models/remote';
 import { Repository } from '../git/models/repository';
 import { GitTag } from '../git/models/tag';
-import { ViewNode, ViewRefNode } from '../views/nodes';
+import { ViewNode, ViewRefNode } from '../views/nodes/viewNode';
 
 export function getCommandUri(uri?: Uri, editor?: TextEditor): Uri | undefined {
 	// Always use the editor.uri (if we have one), so we are correct for a split diff

src/commands/git/search.ts

@@ -8,7 +8,7 @@ import type { Repository } from '../../git/models/repository';
 import { searchOperators, SearchOperators, SearchPattern } from '../../git/search';
 import { ActionQuickPickItem, QuickPickItemOfT } from '../../quickpicks/items/common';
 import { pluralize } from '../../system/string';
-import { SearchResultsNode } from '../../views/nodes';
+import { SearchResultsNode } from '../../views/nodes/searchResultsNode';
 import type { ViewsWithRepositoryFolders } from '../../views/viewBase';
 import { GitActions } from '../gitCommands.actions';
 import { getSteps } from '../gitCommands.utils';

src/commands/openComparisonOnRemote.ts

@@ -4,7 +4,7 @@ import type { Container } from '../container';
 import { RemoteResourceType } from '../git/remotes/provider';
 import { Logger } from '../logger';
 import { command, executeCommand } from '../system/command';
-import { ResultsCommitsNode } from '../views/nodes';
+import { ResultsCommitsNode } from '../views/nodes/resultsCommitsNode';
 import { Command, CommandContext } from './base';
 import { OpenOnRemoteCommandArgs } from './openOnRemote';
 

src/commands/openDirectoryCompare.ts

@@ -7,7 +7,7 @@ import { Messages } from '../messages';
 import { ReferencePicker } from '../quickpicks/referencePicker';
 import { RepositoryPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/command';
-import { CompareResultsNode } from '../views/nodes';
+import { CompareResultsNode } from '../views/nodes/compareResultsNode';
 import { ActiveEditorCommand, CommandContext, getCommandUri, isCommandContextViewNodeHasRef } from './base';
 
 export interface OpenDirectoryCompareCommandArgs {

src/commands/openFileOnRemote.ts

@@ -11,7 +11,7 @@ import { Logger } from '../logger';
 import { ReferencePicker } from '../quickpicks/referencePicker';
 import { command, executeCommand } from '../system/command';
 import { pad, splitSingle } from '../system/string';
-import { StatusFileNode } from '../views/nodes';
+import { StatusFileNode } from '../views/nodes/statusFileNode';
 import {
 	ActiveEditorCommand,
 	CommandContext,

src/commands/openPullRequestOnRemote.ts

@@ -2,7 +2,7 @@ import { env, Uri } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { command } from '../system/command';
-import { PullRequestNode } from '../views/nodes';
+import { PullRequestNode } from '../views/nodes/pullRequestNode';
 import { Command, CommandContext } from './base';
 
 export interface OpenPullRequestOnRemoteCommandArgs {

src/commands/searchCommits.ts

@@ -4,7 +4,7 @@ import { Commands } from '../constants';
 import type { Container } from '../container';
 import { SearchPattern } from '../git/search';
 import { command } from '../system/command';
-import { SearchResultsNode } from '../views/nodes';
+import { SearchResultsNode } from '../views/nodes/searchResultsNode';
 import { Command, CommandContext, isCommandContextViewNodeHasRepository } from './base';
 
 export interface SearchCommitsCommandArgs {

src/env/node/git/git.ts

@@ -6,7 +6,10 @@ import { GitCommandOptions, GitErrorHandling } from '../../../git/commandOptions
 import type { GitDiffFilter } from '../../../git/models/diff';
 import { GitRevision } from '../../../git/models/reference';
 import type { GitUser } from '../../../git/models/user';
-import { GitBranchParser, GitLogParser, GitReflogParser, GitTagParser } from '../../../git/parsers';
+import { GitBranchParser } from '../../../git/parsers/branchParser';
+import { GitLogParser } from '../../../git/parsers/logParser';
+import { GitReflogParser } from '../../../git/parsers/reflogParser';
+import { GitTagParser } from '../../../git/parsers/tagParser';
 import { Logger } from '../../../logger';
 import { dirname, isAbsolute, isFolderGlob, joinPaths, normalizePath, splitPath } from '../../../system/path';
 import { getDurationMilliseconds } from '../../../system/string';

src/env/node/git/localGitProvider.ts

@@ -77,19 +77,16 @@ import { GitTag, TagSortOptions } from '../../../git/models/tag';
 import type { GitTreeEntry } from '../../../git/models/tree';
 import { GitUser, isUserMatch } from '../../../git/models/user';
 import type { GitWorktree } from '../../../git/models/worktree';
-import {
-	GitBlameParser,
-	GitBranchParser,
-	GitDiffParser,
-	GitLogParser,
-	GitReflogParser,
-	GitRemoteParser,
-	GitStatusParser,
-	GitTagParser,
-	GitTreeParser,
-	GitWorktreeParser,
-	LogType,
-} from '../../../git/parsers';
+import { GitBlameParser } from '../../../git/parsers/blameParser';
+import { GitBranchParser } from '../../../git/parsers/branchParser';
+import { GitDiffParser } from '../../../git/parsers/diffParser';
+import { GitLogParser, LogType } from '../../../git/parsers/logParser';
+import { GitReflogParser } from '../../../git/parsers/reflogParser';
+import { GitRemoteParser } from '../../../git/parsers/remoteParser';
+import { GitStatusParser } from '../../../git/parsers/statusParser';
+import { GitTagParser } from '../../../git/parsers/tagParser';
+import { GitTreeParser } from '../../../git/parsers/treeParser';
+import { GitWorktreeParser } from '../../../git/parsers/worktreeParser';
 import { RemoteProviderFactory, RemoteProviders } from '../../../git/remotes/factory';
 import { RemoteProvider, RemoteResourceType, RichRemoteProvider } from '../../../git/remotes/provider';
 import { SearchPattern } from '../../../git/search';

src/extension.ts

@@ -19,7 +19,7 @@ import { setDefaultDateLocales } from './system/date';
 import { once } from './system/event';
 import { Stopwatch } from './system/stopwatch';
 import { compare, satisfies } from './system/version';
-import { ViewNode } from './views/nodes';
+import { ViewNode } from './views/nodes/viewNode';
 
 export async function activate(context: ExtensionContext): Promise<GitLensApi | undefined> {
 	const gitlensVersion = context.extension.packageJSON.version;

src/git/formatters.ts

@@ -1,2 +0,0 @@
-export * from './formatters/commitFormatter';
-export * from './formatters/statusFormatter';

src/git/parsers.ts

@@ -1,10 +0,0 @@
-export * from './parsers/blameParser';
-export * from './parsers/branchParser';
-export * from './parsers/diffParser';
-export * from './parsers/logParser';
-export * from './parsers/reflogParser';
-export * from './parsers/remoteParser';
-export * from './parsers/statusParser';
-export * from './parsers/tagParser';
-export * from './parsers/treeParser';
-export * from './parsers/worktreeParser';

src/hovers/hovers.ts

@@ -4,7 +4,7 @@ import { DiffWithCommand, ShowQuickCommitCommand } from '../commands';
 import { configuration } from '../configuration';
 import { GlyphChars } from '../constants';
 import { Container } from '../container';
-import { CommitFormatter } from '../git/formatters';
+import { CommitFormatter } from '../git/formatters/commitFormatter';
 import { GitUri } from '../git/gitUri';
 import type { GitCommit } from '../git/models/commit';
 import type { GitDiffHunk, GitDiffHunkLine } from '../git/models/diff';

src/quickpicks/items/commits.ts

@@ -4,7 +4,7 @@ import type { OpenChangedFilesCommandArgs } from '../../commands/openChangedFile
 import { QuickCommandButtons } from '../../commands/quickCommand.buttons';
 import { Commands, GlyphChars } from '../../constants';
 import { Container } from '../../container';
-import { CommitFormatter } from '../../git/formatters';
+import { CommitFormatter } from '../../git/formatters/commitFormatter';
 import { GitCommit } from '../../git/models/commit';
 import { GitFile, GitFileChange } from '../../git/models/file';
 import type { GitStatusFile } from '../../git/models/status';

src/statusbar/statusBarController.ts

@@ -14,7 +14,7 @@ import type { ToggleFileChangesAnnotationCommandArgs } from '../commands/toggleF
 import { configuration, FileAnnotationType, StatusBarCommand } from '../configuration';
 import { Commands, GlyphChars } from '../constants';
 import type { Container } from '../container';
-import { CommitFormatter } from '../git/formatters';
+import { CommitFormatter } from '../git/formatters/commitFormatter';
 import type { GitCommit } from '../git/models/commit';
 import type { PullRequest } from '../git/models/pullRequest';
 import { Hovers } from '../hovers/hovers';

src/views/branchesView.ts

@@ -23,15 +23,11 @@ import { GitBranchReference, GitReference, GitRevisionReference } from '../git/m
 import { RepositoryChange, RepositoryChangeComparisonMode, RepositoryChangeEvent } from '../git/models/repository';
 import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
-import {
-	BranchesNode,
-	BranchNode,
-	BranchOrTagFolderNode,
-	RepositoriesSubscribeableNode,
-	RepositoryFolderNode,
-	RepositoryNode,
-	ViewNode,
-} from './nodes';
+import { BranchesNode } from './nodes/branchesNode';
+import { BranchNode } from './nodes/branchNode';
+import { BranchOrTagFolderNode } from './nodes/branchOrTagFolderNode';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { RepositoriesSubscribeableNode, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
 import { ViewBase } from './viewBase';
 
 export class BranchesRepositoryNode extends RepositoryFolderNode<BranchesView, BranchesNode> {

src/views/commitsView.ts

@@ -25,14 +25,10 @@ import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
 import { debug } from '../system/decorators/log';
 import { disposableInterval } from '../system/function';
-import {
-	BranchNode,
-	BranchTrackingStatusNode,
-	RepositoriesSubscribeableNode,
-	RepositoryFolderNode,
-	RepositoryNode,
-	ViewNode,
-} from './nodes';
+import { BranchNode } from './nodes/branchNode';
+import { BranchTrackingStatusNode } from './nodes/branchTrackingStatusNode';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { RepositoriesSubscribeableNode, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
 import { ViewBase } from './viewBase';
 
 export class CommitsRepositoryNode extends RepositoryFolderNode<CommitsView, BranchNode> {

src/views/contributorsView.ts

@@ -18,14 +18,10 @@ import { RepositoryChange, RepositoryChangeComparisonMode, RepositoryChangeEvent
 import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
 import { debug } from '../system/decorators/log';
-import {
-	ContributorNode,
-	ContributorsNode,
-	RepositoriesSubscribeableNode,
-	RepositoryFolderNode,
-	RepositoryNode,
-	ViewNode,
-} from './nodes';
+import { ContributorNode } from './nodes/contributorNode';
+import { ContributorsNode } from './nodes/contributorsNode';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { RepositoriesSubscribeableNode, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
 import { ViewBase } from './viewBase';
 
 export class ContributorsRepositoryNode extends RepositoryFolderNode<ContributorsView, ContributorsNode> {

src/views/fileHistoryView.ts

@@ -5,7 +5,8 @@ import { Container } from '../container';
 import { setContext } from '../context';
 import { GitUri } from '../git/gitUri';
 import { executeCommand } from '../system/command';
-import { FileHistoryTrackerNode, LineHistoryTrackerNode } from './nodes';
+import { FileHistoryTrackerNode } from './nodes/fileHistoryTrackerNode';
+import { LineHistoryTrackerNode } from './nodes/lineHistoryTrackerNode';
 import { ViewBase } from './viewBase';
 
 const pinnedSuffix = ' (pinned)';

src/views/lineHistoryView.ts

@@ -4,7 +4,7 @@ import { Commands, ContextKeys } from '../constants';
 import { Container } from '../container';
 import { setContext } from '../context';
 import { executeCommand } from '../system/command';
-import { LineHistoryTrackerNode } from './nodes';
+import { LineHistoryTrackerNode } from './nodes/lineHistoryTrackerNode';
 import { ViewBase } from './viewBase';
 
 const pinnedSuffix = ' (pinned)';

src/views/nodes.ts

@@ -1,46 +0,0 @@
-export * from './nodes/common';
-
-export * from './nodes/viewNode';
-export * from './nodes/branchesNode';
-export * from './nodes/branchNode';
-export * from './nodes/branchOrTagFolderNode';
-export * from './nodes/branchTrackingStatusFilesNode';
-export * from './nodes/branchTrackingStatusNode';
-export * from './nodes/commitFileNode';
-export * from './nodes/commitNode';
-export * from './nodes/compareBranchNode';
-export * from './nodes/comparePickerNode';
-export * from './nodes/compareResultsNode';
-export * from './nodes/contributorNode';
-export * from './nodes/contributorsNode';
-export * from './nodes/fileHistoryNode';
-export * from './nodes/fileHistoryTrackerNode';
-export * from './nodes/fileRevisionAsCommitNode';
-export * from './nodes/folderNode';
-export * from './nodes/lineHistoryNode';
-export * from './nodes/lineHistoryTrackerNode';
-export * from './nodes/mergeConflictFileNode';
-export * from './nodes/mergeConflictCurrentChangesNode';
-export * from './nodes/mergeConflictIncomingChangesNode';
-export * from './nodes/mergeStatusNode';
-export * from './nodes/pullRequestNode';
-export * from './nodes/rebaseStatusNode';
-export * from './nodes/reflogNode';
-export * from './nodes/reflogRecordNode';
-export * from './nodes/remoteNode';
-export * from './nodes/remotesNode';
-export * from './nodes/repositoriesNode';
-export * from './nodes/repositoryNode';
-export * from './nodes/resultsCommitsNode';
-export * from './nodes/resultsFileNode';
-export * from './nodes/resultsFilesNode';
-export * from './nodes/searchResultsNode';
-export * from './nodes/stashesNode';
-export * from './nodes/stashFileNode';
-export * from './nodes/stashNode';
-export * from './nodes/statusFileNode';
-export * from './nodes/statusFilesNode';
-export * from './nodes/tagsNode';
-export * from './nodes/tagNode';
-export * from './nodes/worktreeNode';
-export * from './nodes/worktreesNode';

src/views/nodes/UncommittedFileNode.ts

@@ -1,7 +1,7 @@
 import { Command, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import type { DiffWithPreviousCommandArgs } from '../../commands';
 import { Commands } from '../../constants';
-import { StatusFileFormatter } from '../../git/formatters';
+import { StatusFileFormatter } from '../../git/formatters/statusFormatter';
 import { GitUri } from '../../git/gitUri';
 import { GitFile } from '../../git/models/file';
 import { dirname, joinPaths } from '../../system/path';

src/views/nodes/commitFileNode.ts

@@ -1,7 +1,7 @@
 import { Command, MarkdownString, Selection, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import type { DiffWithPreviousCommandArgs } from '../../commands';
 import { Commands } from '../../constants';
-import { StatusFileFormatter } from '../../git/formatters';
+import { StatusFileFormatter } from '../../git/formatters/statusFormatter';
 import { GitUri } from '../../git/gitUri';
 import type { GitBranch } from '../../git/models/branch';
 import type { GitCommit } from '../../git/models/commit';

src/views/nodes/commitNode.ts

@@ -2,7 +2,7 @@ import { Command, MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemColla
 import type { DiffWithPreviousCommandArgs } from '../../commands';
 import { configuration, ViewFilesLayout } from '../../configuration';
 import { Colors, Commands } from '../../constants';
-import { CommitFormatter } from '../../git/formatters';
+import { CommitFormatter } from '../../git/formatters/commitFormatter';
 import type { GitBranch } from '../../git/models/branch';
 import type { GitCommit } from '../../git/models/commit';
 import type { PullRequest } from '../../git/models/pullRequest';

src/views/nodes/fileRevisionAsCommitNode.ts

@@ -11,7 +11,8 @@ import {
 import type { DiffWithPreviousCommandArgs } from '../../commands';
 import { configuration } from '../../configuration';
 import { Colors, Commands } from '../../constants';
-import { CommitFormatter, StatusFileFormatter } from '../../git/formatters';
+import { CommitFormatter } from '../../git/formatters/commitFormatter';
+import { StatusFileFormatter } from '../../git/formatters/statusFormatter';
 import { GitUri } from '../../git/gitUri';
 import type { GitBranch } from '../../git/models/branch';
 import type { GitCommit } from '../../git/models/commit';

src/views/nodes/mergeConflictCurrentChangesNode.ts

@@ -2,7 +2,7 @@ import { Command, MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState
 import type { DiffWithCommandArgs } from '../../commands';
 import { configuration } from '../../configuration';
 import { Commands, CoreCommands, GlyphChars } from '../../constants';
-import { CommitFormatter } from '../../git/formatters';
+import { CommitFormatter } from '../../git/formatters/commitFormatter';
 import { GitUri } from '../../git/gitUri';
 import type { GitFile } from '../../git/models/file';
 import type { GitMergeStatus } from '../../git/models/merge';

src/views/nodes/mergeConflictFileNode.ts

@@ -1,6 +1,6 @@
 import { Command, MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import { CoreCommands } from '../../constants';
-import { StatusFileFormatter } from '../../git/formatters';
+import { StatusFileFormatter } from '../../git/formatters/statusFormatter';
 import { GitUri } from '../../git/gitUri';
 import type { GitFile } from '../../git/models/file';
 import type { GitMergeStatus } from '../../git/models/merge';

src/views/nodes/mergeConflictIncomingChangesNode.ts

@@ -2,7 +2,7 @@ import { Command, MarkdownString, ThemeIcon, TreeItem, TreeItemCollapsibleState
 import type { DiffWithCommandArgs } from '../../commands';
 import { configuration } from '../../configuration';
 import { Commands, CoreCommands, GlyphChars } from '../../constants';
-import { CommitFormatter } from '../../git/formatters';
+import { CommitFormatter } from '../../git/formatters/commitFormatter';
 import { GitUri } from '../../git/gitUri';
 import type { GitFile } from '../../git/models/file';
 import type { GitMergeStatus } from '../../git/models/merge';

src/views/nodes/rebaseStatusNode.ts

@@ -2,7 +2,7 @@ import { Command, MarkdownString, ThemeColor, ThemeIcon, TreeItem, TreeItemColla
 import type { DiffWithPreviousCommandArgs } from '../../commands';
 import { configuration, ViewFilesLayout } from '../../configuration';
 import { Commands, CoreCommands } from '../../constants';
-import { CommitFormatter } from '../../git/formatters';
+import { CommitFormatter } from '../../git/formatters/commitFormatter';
 import { GitUri } from '../../git/gitUri';
 import type { GitBranch } from '../../git/models/branch';
 import type { GitCommit } from '../../git/models/commit';

src/views/nodes/resultsFileNode.ts

@@ -1,7 +1,7 @@
 import { Command, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import type { DiffWithCommandArgs } from '../../commands';
 import { Commands } from '../../constants';
-import { StatusFileFormatter } from '../../git/formatters';
+import { StatusFileFormatter } from '../../git/formatters/statusFormatter';
 import { GitUri } from '../../git/gitUri';
 import { GitFile } from '../../git/models/file';
 import { GitReference, GitRevisionReference } from '../../git/models/reference';

src/views/nodes/stashNode.ts

@@ -1,15 +1,18 @@
 import { TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { ViewFilesLayout } from '../../config';
 import { configuration } from '../../configuration';
-import { CommitFormatter } from '../../git/formatters';
+import { CommitFormatter } from '../../git/formatters/commitFormatter';
 import type { GitStashCommit } from '../../git/models/commit';
 import type { GitStashReference } from '../../git/models/reference';
 import { makeHierarchical } from '../../system/array';
 import { joinPaths, normalizePath } from '../../system/path';
 import { sortCompare } from '../../system/string';
-import { ContextValues, FileNode, FolderNode, RepositoryNode, StashFileNode, ViewNode, ViewRefNode } from '../nodes';
 import type { RepositoriesView } from '../repositoriesView';
 import type { StashesView } from '../stashesView';
+import { FileNode, FolderNode } from './folderNode';
+import { RepositoryNode } from './repositoryNode';
+import { StashFileNode } from './stashFileNode';
+import { ContextValues, ViewNode, ViewRefNode } from './viewNode';
 
 export class StashNode extends ViewRefNode<StashesView | RepositoriesView, GitStashReference> {
 	static key = ':stash';

src/views/remotesView.ts

@@ -19,16 +19,12 @@ import type { GitRemote } from '../git/models/remote';
 import { RepositoryChange, RepositoryChangeComparisonMode, RepositoryChangeEvent } from '../git/models/repository';
 import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
-import {
-	BranchNode,
-	BranchOrTagFolderNode,
-	RemoteNode,
-	RemotesNode,
-	RepositoriesSubscribeableNode,
-	RepositoryFolderNode,
-	RepositoryNode,
-	ViewNode,
-} from './nodes';
+import { BranchNode } from './nodes/branchNode';
+import { BranchOrTagFolderNode } from './nodes/branchOrTagFolderNode';
+import { RemoteNode } from './nodes/remoteNode';
+import { RemotesNode } from './nodes/remotesNode';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { RepositoriesSubscribeableNode, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
 import { ViewBase } from './viewBase';
 
 export class RemotesRepositoryNode extends RepositoryFolderNode<RemotesView, RemotesNode> {

src/views/repositoriesView.ts

@@ -33,25 +33,23 @@ import type { GitWorktree } from '../git/models/worktree';
 import { WorkspaceStorageKeys } from '../storage';
 import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
-import {
-	BranchesNode,
-	BranchNode,
-	BranchOrTagFolderNode,
-	BranchTrackingStatusNode,
-	CompareBranchNode,
-	ContributorNode,
-	ContributorsNode,
-	ReflogNode,
-	RemoteNode,
-	RemotesNode,
-	RepositoriesNode,
-	RepositoryNode,
-	StashesNode,
-	StashNode,
-	TagsNode,
-	WorktreeNode,
-	WorktreesNode,
-} from './nodes';
+import { BranchesNode } from './nodes/branchesNode';
+import { BranchNode } from './nodes/branchNode';
+import { BranchOrTagFolderNode } from './nodes/branchOrTagFolderNode';
+import { BranchTrackingStatusNode } from './nodes/branchTrackingStatusNode';
+import { CompareBranchNode } from './nodes/compareBranchNode';
+import { ContributorNode } from './nodes/contributorNode';
+import { ContributorsNode } from './nodes/contributorsNode';
+import { ReflogNode } from './nodes/reflogNode';
+import { RemoteNode } from './nodes/remoteNode';
+import { RemotesNode } from './nodes/remotesNode';
+import { RepositoriesNode } from './nodes/repositoriesNode';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { StashesNode } from './nodes/stashesNode';
+import { StashNode } from './nodes/stashNode';
+import { TagsNode } from './nodes/tagsNode';
+import { WorktreeNode } from './nodes/worktreeNode';
+import { WorktreesNode } from './nodes/worktreesNode';
 import { ViewBase } from './viewBase';
 
 export class RepositoriesView extends ViewBase<RepositoriesNode, RepositoriesViewConfig> {

src/views/searchAndCompareView.ts

@@ -15,16 +15,11 @@ import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
 import { debug, log } from '../system/decorators/log';
 import { isPromise } from '../system/promise';
-import {
-	CompareResultsNode,
-	ContextValues,
-	FilesQueryFilter,
-	RepositoryFolderNode,
-	ResultsFilesNode,
-	SearchResultsNode,
-	ViewNode,
-} from './nodes';
 import { ComparePickerNode } from './nodes/comparePickerNode';
+import { CompareResultsNode } from './nodes/compareResultsNode';
+import { FilesQueryFilter, ResultsFilesNode } from './nodes/resultsFilesNode';
+import { SearchResultsNode } from './nodes/searchResultsNode';
+import { ContextValues, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
 import { ViewBase } from './viewBase';
 
 interface DeprecatedPinnedComparison {

src/views/stashesView.ts

@@ -16,14 +16,10 @@ import { GitReference, GitStashReference } from '../git/models/reference';
 import { RepositoryChange, RepositoryChangeComparisonMode, RepositoryChangeEvent } from '../git/models/repository';
 import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
-import {
-	RepositoriesSubscribeableNode,
-	RepositoryFolderNode,
-	RepositoryNode,
-	StashesNode,
-	StashNode,
-	ViewNode,
-} from './nodes';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { StashesNode } from './nodes/stashesNode';
+import { StashNode } from './nodes/stashNode';
+import { RepositoriesSubscribeableNode, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
 import { ViewBase } from './viewBase';
 
 export class StashesRepositoryNode extends RepositoryFolderNode<StashesView, StashesNode> {

src/views/tagsView.ts

@@ -16,14 +16,10 @@ import { GitReference, GitTagReference } from '../git/models/reference';
 import { RepositoryChange, RepositoryChangeComparisonMode, RepositoryChangeEvent } from '../git/models/repository';
 import { executeCommand } from '../system/command';
 import { gate } from '../system/decorators/gate';
-import {
-	BranchOrTagFolderNode,
-	RepositoriesSubscribeableNode,
-	RepositoryFolderNode,
-	RepositoryNode,
-	TagsNode,
-	ViewNode,
-} from './nodes';
+import { BranchOrTagFolderNode } from './nodes/branchOrTagFolderNode';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { TagsNode } from './nodes/tagsNode';
+import { RepositoriesSubscribeableNode, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
 import { ViewBase } from './viewBase';
 
 export class TagsRepositoryNode extends RepositoryFolderNode<TagsView, TagsNode> {

src/views/viewBase.ts

@@ -43,7 +43,7 @@ import { CommitsView } from './commitsView';
 import { ContributorsView } from './contributorsView';
 import { FileHistoryView } from './fileHistoryView';
 import { LineHistoryView } from './lineHistoryView';
-import { PageableViewNode, ViewNode } from './nodes';
+import { PageableViewNode, ViewNode } from './nodes/viewNode';
 import { RemotesView } from './remotesView';
 import { RepositoriesView } from './repositoriesView';
 import { SearchAndCompareView } from './searchAndCompareView';

src/views/viewCommands.ts

@@ -23,43 +23,43 @@ import {
 import { debug } from '../system/decorators/log';
 import { OpenWorkspaceLocation } from '../system/utils';
 import { runGitCommandInTerminal } from '../terminal';
+import { BranchesNode } from './nodes/branchesNode';
+import { BranchNode } from './nodes/branchNode';
+import { BranchTrackingStatusNode } from './nodes/branchTrackingStatusNode';
+import { CommitFileNode } from './nodes/commitFileNode';
+import { CommitNode } from './nodes/commitNode';
+import { PagerNode } from './nodes/common';
+import { CompareBranchNode } from './nodes/compareBranchNode';
+import { ContributorNode } from './nodes/contributorNode';
+import { ContributorsNode } from './nodes/contributorsNode';
+import { FileHistoryNode } from './nodes/fileHistoryNode';
+import { FileRevisionAsCommitNode } from './nodes/fileRevisionAsCommitNode';
+import { FolderNode } from './nodes/folderNode';
+import { LineHistoryNode } from './nodes/lineHistoryNode';
+import { MergeConflictFileNode } from './nodes/mergeConflictFileNode';
+import { PullRequestNode } from './nodes/pullRequestNode';
+import { RemoteNode } from './nodes/remoteNode';
+import { RemotesNode } from './nodes/remotesNode';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { ResultsFileNode } from './nodes/resultsFileNode';
+import { ResultsFilesNode } from './nodes/resultsFilesNode';
+import { StashFileNode } from './nodes/stashFileNode';
+import { StashNode } from './nodes/stashNode';
+import { StatusFileNode } from './nodes/statusFileNode';
+import { TagNode } from './nodes/tagNode';
+import { TagsNode } from './nodes/tagsNode';
 import {
-	BranchesNode,
-	BranchNode,
-	BranchTrackingStatusNode,
 	canClearNode,
 	canEditNode,
 	canViewDismissNode,
-	CommitFileNode,
-	CommitNode,
-	CompareBranchNode,
-	ContributorNode,
-	ContributorsNode,
-	FileHistoryNode,
-	FileRevisionAsCommitNode,
-	FolderNode,
-	LineHistoryNode,
-	MergeConflictFileNode,
 	PageableViewNode,
-	PagerNode,
-	PullRequestNode,
-	RemoteNode,
-	RemotesNode,
 	RepositoryFolderNode,
-	RepositoryNode,
-	ResultsFileNode,
-	ResultsFilesNode,
-	StashFileNode,
-	StashNode,
-	StatusFileNode,
-	TagNode,
-	TagsNode,
 	ViewNode,
 	ViewRefFileNode,
 	ViewRefNode,
-	WorktreeNode,
-	WorktreesNode,
-} from './nodes';
+} from './nodes/viewNode';
+import { WorktreeNode } from './nodes/worktreeNode';
+import { WorktreesNode } from './nodes/worktreesNode';
 
 interface CompareSelectedInfo {
 	ref: string;

src/views/worktreesView.ts

@@ -20,14 +20,10 @@ import { ensurePlusFeaturesEnabled } from '../plus/subscription/utils';
 import { getSubscriptionTimeRemaining, SubscriptionState } from '../subscription';
 import { gate } from '../system/decorators/gate';
 import { pluralize } from '../system/string';
-import {
-	RepositoriesSubscribeableNode,
-	RepositoryFolderNode,
-	RepositoryNode,
-	ViewNode,
-	WorktreeNode,
-	WorktreesNode,
-} from './nodes';
+import { RepositoryNode } from './nodes/repositoryNode';
+import { RepositoriesSubscribeableNode, RepositoryFolderNode, ViewNode } from './nodes/viewNode';
+import { WorktreeNode } from './nodes/worktreeNode';
+import { WorktreesNode } from './nodes/worktreesNode';
 import { ViewBase } from './viewBase';
 
 export class WorktreesRepositoryNode extends RepositoryFolderNode<WorktreesView, WorktreesNode> {

src/webviews/webviewWithConfigBase.ts

@@ -2,7 +2,7 @@ import { ConfigurationChangeEvent, ConfigurationTarget, WebviewPanelOnDidChangeV
 import { configuration } from '../configuration';
 import { Commands } from '../constants';
 import type { Container } from '../container';
-import { CommitFormatter } from '../git/formatters';
+import { CommitFormatter } from '../git/formatters/commitFormatter';
 import { GitCommit, GitCommitIdentity } from '../git/models/commit';
 import { GitFileChange, GitFileIndexStatus } from '../git/models/file';
 import { PullRequest, PullRequestState } from '../git/models/pullRequest';