@@ -1,7 +1,5 @@
 var Promise = require("nodegit-promise");
 var promisify = require("promisify-node");
-var path = require("path");
-var local = path.join.bind(path, __dirname);
 var rawApi;
 
 // Attempt to load the production release first, if it fails fall back to the
@@ -54,7 +52,7 @@ exports.__proto__ = rawApi;
 
 var importExtension = function(name) {
   try {
-    require(local(name));
+    require("./" + name);
   }
   catch (unhandledException) {
     if (unhandledException.code != "MODULE_NOT_FOUND") {
@@ -65,14 +63,14 @@ var importExtension = function(name) {
 
 // Load up utils
 rawApi.Utils = {};
-require(local("utils", "lookup_wrapper"));
-require(local("utils", "normalize_options"));
+require("./utils/lookup_wrapper");
+require("./utils/normalize_options");
 
 // Load up extra types;
-require(local("convenient_hunk"));
-require(local("convenient_patch"));
-require(local("status_file"));
-require(local("enums.js"));
+require("./convenient_hunk");
+require("./convenient_patch");
+require("./status_file");
+require("./enums.js");
 
 // Import extensions
 {% each %}
 
@@ -3,19 +3,17 @@ var promisify = require("promisify-node");
 var path = require("path");
 var fs = require("fs");
 
-var local = path.join.bind(path, __dirname);
-
-var checkPrepared = require(local("checkPrepared"));
+var checkPrepared = require("./checkPrepared");
 var whichNativeNodish = require("which-native-nodish");
-var prepareForBuild = require(local("prepareForBuild"));
+var prepareForBuild = require("./prepareForBuild");
 
 var exec = promisify(function(command, opts, callback) {
   return require("child_process").exec(command, opts, callback);
 });
 var nwVersion = null;
 var asVersion = null;
 
-return whichNativeNodish(local(".."))
+return whichNativeNodish("..")
   .then(function(results) {
     nwVersion = results.nwVersion;
     asVersion = results.asVersion;
@@ -29,7 +27,7 @@ return whichNativeNodish(local(".."))
       console.info("[nodegit] Must build for atom-shell");
       return checkAndBuild();
     }
-    if (fs.existsSync(local("../.didntcomefromthenpmregistry"))) {
+    if (fs.existsSync("../.didntcomefromthenpmregistry")) {
       return checkAndBuild();
     }
     if (process.env.BUILD_DEBUG) {
@@ -85,7 +83,7 @@ function build() {
   }
 
   var opts = {
-    cwd: local(".."),
+    cwd: ".",
     maxBuffer: Number.MAX_VALUE
   };
 
 
@@ -1,20 +1,19 @@
 var fork = require("child_process").fork;
 var path = require("path");
-var local = path.join.bind(path, __dirname);
 
 var args = [
   "cover",
   process.platform != "win32" ?
     "_mocha" :
-    local("../node_modules/mocha/bin/_mocha"),
+    "../node_modules/mocha/bin/_mocha",
   "--",
   "runner",
   "tests",
   "--report=lcov",
   "--expose-gc"
 ];
 
-fork(local("../node_modules/istanbul/lib/cli.js"), args, {
+fork("../node_modules/istanbul/lib/cli.js", args, {
   cwd: __dirname
 }).on("close", function(code) {
   process.exit(code);
 
@@ -3,12 +3,12 @@ var path = require("path");
 var local = path.join.bind(path, __dirname);
 
 describe("Attr", function() {
-  var NodeGit = require(local("../../"));
+  var NodeGit = require("../../");
   var Repository = NodeGit.Repository;
   var Attr = NodeGit.Attr;
   var Status = NodeGit.Status;
 
-  var reposPath = local("../repos/workdir/.git");
+  var reposPath = local("../repos/workdir");
 
   beforeEach(function() {
     var test = this;
 
@@ -3,13 +3,13 @@ var path = require("path");
 var local = path.join.bind(path, __dirname);
 
 describe("Blob", function() {
-  var NodeGit = require(local("../../"));
+  var NodeGit = require("../../");
 
   var Oid = NodeGit.Oid;
   var Repository = NodeGit.Repository;
   var FileMode = NodeGit.TreeEntry.FILEMODE;
 
-  var reposPath = local("../repos/workdir/.git");
+  var reposPath = local("../repos/workdir");
   var oid = "111dd657329797f6165f52f5085f61ac976dcf04";
 
   beforeEach(function() {
 
@@ -4,13 +4,13 @@ var Promise = require("nodegit-promise");
 var local = path.join.bind(path, __dirname);
 
 describe("Branch", function() {
-  var NodeGit = require(local("../../"));
+  var NodeGit = require("../../");
   var Repository = NodeGit.Repository;
   var Branch = NodeGit.Branch;
   var branchName = "test-branch";
   var fullBranchName = "refs/heads/" + branchName;
 
-  var reposPath = local("../repos/workdir/.git");
+  var reposPath = local("../repos/workdir");
 
   beforeEach(function() {
     var test = this;
 
@@ -3,12 +3,12 @@ var path = require("path");
 var local = path.join.bind(path, __dirname);
 
 describe("Checkout", function() {
-  var NodeGit = require(local("../../"));
+  var NodeGit = require("../../");
   var Repository = NodeGit.Repository;
   var Checkout = NodeGit.Checkout;
 
   var packageJsonOid = "0fa56e90e096a4c24c785206b826ab914ea3de1e";
-  var reposPath = local("../repos/workdir/.git");
+  var reposPath = local("../repos/workdir");
 
   beforeEach(function() {
     var test = this;
 
@@ -5,7 +5,7 @@ var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
 
 describe("Clone", function() {
-  var NodeGit = require(local("../../"));
+  var NodeGit = require("../../");
   var Repository = NodeGit.Repository;
   var Clone = NodeGit.Clone;
 
 
@@ -6,10 +6,10 @@ var fse = promisify(require("fs-extra"));
 var local = path.join.bind(path, __dirname);
 
 describe("Commit", function() {
-  var NodeGit = require(local("../../"));
+  var NodeGit = require("../../");
   var Repository = NodeGit.Repository;
 
-  var reposPath = local("../repos/workdir/.git");
+  var reposPath = local("../repos/workdir");
   var oid = "fce88902e66c72b5b93e75bdb5ae717038b221f6";
 
   function reinitialize(test) {
 
@@ -3,7 +3,7 @@ var path = require("path");
 var local = path.join.bind(path, __dirname);
 
 describe("Cred", function() {
-  var NodeGit = require(local("../../"));
+  var NodeGit = require("../../");
 
   var sshPublicKey = local("../id_rsa.pub");
   var sshPrivateKey = local("../id_rsa");