diff --git a/extensions/git/src/askpass-empty.sh b/extensions/git/src/askpass/askpass-empty.sh
similarity index 100%
rename from extensions/git/src/askpass-empty.sh
rename to extensions/git/src/askpass/askpass-empty.sh
diff --git a/extensions/git/src/askpass-main.ts b/extensions/git/src/askpass/askpass-main.ts
similarity index 96%
rename from extensions/git/src/askpass-main.ts
rename to extensions/git/src/askpass/askpass-main.ts
index 685fc08ef86..c2674d28705 100644
--- a/extensions/git/src/askpass-main.ts
+++ b/extensions/git/src/askpass/askpass-main.ts
@@ -5,7 +5,7 @@
 
 import * as fs from 'fs';
 import * as nls from 'vscode-nls';
-import { IPCClient } from './ipc/ipcClient';
+import { IPCClient } from '../ipc/ipcClient';
 
 const localize = nls.loadMessageBundle();
 
diff --git a/extensions/git/src/askpass.sh b/extensions/git/src/askpass/askpass.sh
similarity index 100%
rename from extensions/git/src/askpass.sh
rename to extensions/git/src/askpass/askpass.sh
diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass/askpass.ts
similarity index 93%
rename from extensions/git/src/askpass.ts
rename to extensions/git/src/askpass/askpass.ts
index dd7e84c2e03..994a32514e5 100644
--- a/extensions/git/src/askpass.ts
+++ b/extensions/git/src/askpass/askpass.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { window, InputBoxOptions } from 'vscode';
-import { IDisposable } from './util';
+import { IDisposable } from '../util';
 import * as path from 'path';
-import { IIPCHandler, IIPCServer } from './ipc/ipcServer';
+import { IIPCHandler, IIPCServer } from '../ipc/ipcServer';
 
 export interface AskpassEnvironment {
 	GIT_ASKPASS: string;
diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts
index 80435de391a..37cb8e5377c 100644
--- a/extensions/git/src/main.ts
+++ b/extensions/git/src/main.ts
@@ -13,7 +13,7 @@ import { CommandCenter } from './commands';
 import { GitContentProvider } from './contentProvider';
 import { GitFileSystemProvider } from './fileSystemProvider';
 import { GitDecorations } from './decorationProvider';
-import { Askpass } from './askpass';
+import { Askpass } from './askpass/askpass';
 import { toDisposable, filterEvent, eventToPromise } from './util';
 import TelemetryReporter from 'vscode-extension-telemetry';
 import { GitExtension } from './api/git';