diff --git a/src/commands/switchMode.ts b/src/commands/switchMode.ts
index 3ad068c..b366443 100644
--- a/src/commands/switchMode.ts
+++ b/src/commands/switchMode.ts
@@ -4,7 +4,7 @@ import { configuration } from '../configuration';
 import { Container } from '../container';
 import { ModesQuickPick } from '../quickpicks';
 import { command, Command, Commands } from './common';
-import { log } from '../system/decorators/log';
+import { log } from '../system';
 import { Logger } from '../logger';
 
 @command()
diff --git a/src/git/formatters/commitFormatter.ts b/src/git/formatters/commitFormatter.ts
index 138b6bb..4e10697 100644
--- a/src/git/formatters/commitFormatter.ts
+++ b/src/git/formatters/commitFormatter.ts
@@ -12,12 +12,11 @@ import { DateStyle, FileAnnotationType } from '../../configuration';
 import { GlyphChars } from '../../constants';
 import { Container } from '../../container';
 import { GitCommit, GitLogCommit, GitRemote, GitService, GitUri, Issue, PullRequest } from '../gitService';
-import { Strings } from '../../system';
+import { Promises, Strings } from '../../system';
 import { FormatOptions, Formatter } from './formatter';
 import { ContactPresence } from '../../vsls/vsls';
 import { getPresenceDataUri } from '../../avatars';
 import { emojify } from '../../emojis';
-import { Promises } from '../../system/promise';
 
 const emptyStr = '';
 
diff --git a/src/keyboard.ts b/src/keyboard.ts
index bdab5c3..74f1134 100644
--- a/src/keyboard.ts
+++ b/src/keyboard.ts
@@ -2,7 +2,7 @@
 import { commands, Disposable } from 'vscode';
 import { CommandContext, extensionId, setCommandContext } from './constants';
 import { Logger } from './logger';
-import { log } from './system/decorators/log';
+import { log } from './system';
 
 export declare interface KeyCommand {
 	onDidPressKey?(key: Keys): void | Promise<void>;