diff --git a/extensions/git/src/api/api.ts b/extensions/git/src/api/api.ts
index 3f7d7303b8c6534ef33d542c5b1c7d51ba65090a..df818fdcd11c6c7fb5c13b22d7783f5fd1955c99 100644
--- a/extensions/git/src/api/api.ts
+++ b/extensions/git/src/api/api.ts
@@ -6,17 +6,17 @@
 'use strict';
 
 import { Model } from '../model';
-import { GitExtension } from './git';
+import { API } from './git';
 import * as semver from 'semver';
 
 interface ApiCtor {
-	new(model: Model): GitExtension.API;
+	new(model: Model): API;
 }
 
 const versions: string[] = [];
 const apis = new Map<string, ApiCtor>();
 
-export function getAPI(model: Model, range: string): GitExtension.API {
+export function getAPI(model: Model, range: string): API {
 	if (!range) {
 		throw new Error(`Please provide a Git extension API version range. Available versions: [${versions.join(', ')}]`);
 	}
diff --git a/extensions/git/src/api/api1.ts b/extensions/git/src/api/api1.ts
index 6673e030350285604b6a8f959804e5eacd7f5c50..3ae1126df130f6ce1bf8197dc343f32a8000b216 100644
--- a/extensions/git/src/api/api1.ts
+++ b/extensions/git/src/api/api1.ts
@@ -6,57 +6,62 @@
 'use strict';
 
 import { Model } from '../model';
-import { GitExtension } from './git';
+import { Repository as BaseRepository } from '../repository';
+import { InputBox, ExecResult, SpawnOptions, Git, API, Repository } from './git';
 import { Api } from './api';
 import { Event, SourceControlInputBox, Uri } from 'vscode';
 import { mapEvent } from '../util';
-import { Repository } from '../repository';
 import * as cp from 'child_process';
 
-class ApiInputBox implements GitExtension.InputBox {
+class ApiInputBox implements InputBox {
 	set value(value: string) { this._inputBox.value = value; }
 	get value(): string { return this._inputBox.value; }
 	constructor(private _inputBox: SourceControlInputBox) { }
 }
 
-export class ApiRepository implements GitExtension.Repository {
+export class ApiRepository implements Repository {
 
 	readonly rootUri: Uri;
-	readonly inputBox: GitExtension.InputBox;
+	readonly inputBox: InputBox;
 
-	constructor(_repository: Repository) {
+	constructor(_repository: BaseRepository) {
 		this.rootUri = Uri.file(_repository.root);
 		this.inputBox = new ApiInputBox(_repository.inputBox);
 	}
 }
 
-@Api('1.0.0')
-export class ApiImpl implements GitExtension.API {
+export class ApiGit implements Git {
+
+	get path(): string { return this._model.git.path; }
+
+	constructor(private _model: Model) { }
+
+	exec(cwd: string, args: string[], options: SpawnOptions = {}): Promise<ExecResult<string>> {
+		return this._model.git.exec(cwd, args, options);
+	}
 
-	get gitPath(): string {
-		return this._model.git.path;
+	spawn(cwd: string, args: string[], options: SpawnOptions = {}): cp.ChildProcess {
+		options = { cwd, ...options };
+		return this._model.git.spawn(args, options);
 	}
+}
 
-	get onDidOpenRepository(): Event<GitExtension.Repository> {
+@Api('1.0.0')
+export class ApiImpl implements API {
+
+	readonly git = new ApiGit(this._model);
+
+	get onDidOpenRepository(): Event<Repository> {
 		return mapEvent(this._model.onDidOpenRepository, r => new ApiRepository(r));
 	}
 
-	get onDidCloseRepository(): Event<GitExtension.Repository> {
+	get onDidCloseRepository(): Event<Repository> {
 		return mapEvent(this._model.onDidCloseRepository, r => new ApiRepository(r));
 	}
 
-	get repositories(): GitExtension.Repository[] {
+	get repositories(): Repository[] {
 		return this._model.repositories.map(r => new ApiRepository(r));
 	}
 
 	constructor(private _model: Model) { }
-
-	exec(cwd: string, args: string[], options: GitExtension.SpawnOptions = {}): Promise<GitExtension.IExecResult<string>> {
-		return this._model.git.exec(cwd, args, options);
-	}
-
-	spawn(cwd: string, args: string[], options: GitExtension.SpawnOptions = {}): cp.ChildProcess {
-		options = { cwd, ...options };
-		return this._model.git.spawn(args, options);
-	}
 }
diff --git a/extensions/git/src/api/extension.ts b/extensions/git/src/api/extension.ts
index 7588ec4a2d98a63a8ecdd9c85b639a71c2794b6d..294ad01aa4af0effede05fbe54d426d9e7a587d6 100644
--- a/extensions/git/src/api/extension.ts
+++ b/extensions/git/src/api/extension.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { Model } from '../model';
-import { GitExtension } from './git';
+import { GitExtension, Repository, API } from './git';
 import { getAPI, deprecated } from './api';
 import { ApiRepository } from './api1';
 
@@ -18,11 +18,11 @@ class NoModelGitExtension implements GitExtension {
 	}
 
 	@deprecated
-	async getRepositories(): Promise<GitExtension.Repository[]> {
+	async getRepositories(): Promise<Repository[]> {
 		throw new Error('Git model not found');
 	}
 
-	getAPI(): GitExtension.API {
+	getAPI(): API {
 		throw new Error('Git model not found');
 	}
 }
@@ -37,11 +37,11 @@ class GitExtensionImpl implements GitExtension {
 	}
 
 	@deprecated
-	async getRepositories(): Promise<GitExtension.Repository[]> {
+	async getRepositories(): Promise<Repository[]> {
 		return this._model.repositories.map(repository => new ApiRepository(repository));
 	}
 
-	getAPI(range: string): GitExtension.API {
+	getAPI(range: string): API {
 		return getAPI(this._model, range);
 	}
 }
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
index 1d1ab8514ba0e0f42072fd54e42e6586d9ac1b63..58156482a0f98b5789f3bd4f26853e5217ff42d0 100644
--- a/extensions/git/src/api/git.d.ts
+++ b/extensions/git/src/api/git.d.ts
@@ -6,41 +6,43 @@
 import { Uri, SourceControlInputBox, Event, CancellationToken } from 'vscode';
 import * as cp from 'child_process';
 
-declare module GitExtension {
-
-	export interface IExecResult<T extends string | Buffer> {
-		readonly exitCode: number;
-		readonly stdout: T;
-		readonly stderr: string;
-	}
+export interface ExecResult<T extends string | Buffer> {
+	readonly exitCode: number;
+	readonly stdout: T;
+	readonly stderr: string;
+}
 
-	export interface SpawnOptions extends cp.SpawnOptions {
-		readonly input?: string;
-		readonly encoding?: string;
-		readonly log?: boolean;
-		readonly cancellationToken?: CancellationToken;
-	}
+export interface SpawnOptions extends cp.SpawnOptions {
+	readonly input?: string;
+	readonly encoding?: string;
+	readonly log?: boolean;
+	readonly cancellationToken?: CancellationToken;
+}
 
-	export interface API {
-		readonly gitPath: string;
-		readonly repositories: Repository[];
-		readonly onDidOpenRepository: Event<Repository>;
-		readonly onDidCloseRepository: Event<Repository>;
+export interface Git {
+	readonly path: string;
+	exec(cwd: string, args: string[], options?: SpawnOptions): Promise<ExecResult<string>>;
+	spawn(cwd: string, args: string[], options?: SpawnOptions): cp.ChildProcess;
+}
 
-		exec(cwd: string, args: string[], options?: SpawnOptions): Promise<IExecResult<string>>;
-		spawn(cwd: string, args: string[], options?: SpawnOptions): cp.ChildProcess;
-	}
+export interface API {
+	readonly git: Git;
+	readonly repositories: Repository[];
+	readonly onDidOpenRepository: Event<Repository>;
+	readonly onDidCloseRepository: Event<Repository>;
+}
 
-	export interface InputBox {
-		value: string;
-	}
+export interface InputBox {
+	value: string;
+}
 
-	export interface Repository {
-		readonly rootUri: Uri;
-		readonly inputBox: InputBox;
-	}
+export interface Repository {
+	readonly rootUri: Uri;
+	readonly inputBox: InputBox;
 }
 
+declare module GitExtension { }
+
 export interface GitExtension {
 
 	/**
@@ -50,14 +52,14 @@ export interface GitExtension {
 	 * @param range Semver version range for API compatibility.
 	 * @returns API instance
 	 */
-	getAPI(range: string): GitExtension.API;
+	getAPI(range: string): API;
 
 	/**
 	 * Returns the collection of active repositories.
 	 *
 	 * @deprecated Use `API.repositories` instead.
 	 */
-	getRepositories(): Promise<GitExtension.Repository[]>;
+	getRepositories(): Promise<Repository[]>;
 
 	/**
 	 * Returns the path to the current git executable.