diff --git a/benchmark/benchmark-helper.coffee b/benchmark/benchmark-helper.coffee
index bfe5ba06e..16272283b 100644
--- a/benchmark/benchmark-helper.coffee
+++ b/benchmark/benchmark-helper.coffee
@@ -1,6 +1,6 @@
 nakedLoad 'jasmine-jquery'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 Keymap = require 'keymap'
 Point = require 'point'
 Config = require 'config'
diff --git a/benchmark/benchmark-suite.coffee b/benchmark/benchmark-suite.coffee
index b2ff4bdfc..8f549b061 100644
--- a/benchmark/benchmark-suite.coffee
+++ b/benchmark/benchmark-suite.coffee
@@ -1,7 +1,7 @@
 require 'benchmark-helper'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TokenizedBuffer = require 'tokenized-buffer'
 
 describe "editor.", ->
diff --git a/benchmark/fixtures/medium.coffee b/benchmark/fixtures/medium.coffee
index 403353b76..2bdb8c6f7 100644
--- a/benchmark/fixtures/medium.coffee
+++ b/benchmark/fixtures/medium.coffee
@@ -145,7 +145,7 @@ generate_html = (source, sections) ->
 
 # Require our external dependencies, including **Showdown.js**
 # (the JavaScript implementation of Markdown).
-fs       = require 'fs'
+fs       = require 'fs-utils'
 path     = require 'path'
 showdown = require('./../vendor/showdown').Showdown
 {spawn, exec} = require 'child_process'
diff --git a/native/atom_window_controller.mm b/native/atom_window_controller.mm
index 6bde507e3..b4f0fb2a3 100644
--- a/native/atom_window_controller.mm
+++ b/native/atom_window_controller.mm
@@ -56,8 +56,11 @@
 
   NSArray *paths = [NSArray arrayWithObjects:@"spec", @"benchmark",
                     @"src/stdlib", @"src/app", @"src/packages", @"src",
-                    @"vendor/packages", @"vendor", @"static", @"themes", nil];
+                    @"vendor/packages", @"vendor", @"static", @"themes",
+                    @"node_modules", nil];
   NSMutableArray *resourcePaths = [[NSMutableArray alloc] init];
+  NSString *userPackagesDirectory = [@"~/.atom/packages" stringByStandardizingPath];
+  [resourcePaths addObject:userPackagesDirectory];
   for (int i = 0; i < paths.count; i++) {
     NSString *fullPath = [NSString stringWithFormat:@"%@/%@", _resourcePath, [paths objectAtIndex:i]];
     [resourcePaths addObject:fullPath];
diff --git a/spec/app/atom-package-spec.coffee b/spec/app/atom-package-spec.coffee
index 7b75b8ede..9bbf6095f 100644
--- a/spec/app/atom-package-spec.coffee
+++ b/spec/app/atom-package-spec.coffee
@@ -1,6 +1,6 @@
 RootView = require 'root-view'
 AtomPackage = require 'atom-package'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "AtomPackage", ->
   describe ".load()", ->
diff --git a/spec/app/config-spec.coffee b/spec/app/config-spec.coffee
index 65c212c24..7602d1118 100644
--- a/spec/app/config-spec.coffee
+++ b/spec/app/config-spec.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "Config", ->
   describe ".get(keyPath) and .set(keyPath, value)", ->
@@ -49,7 +49,7 @@ describe "Config", ->
         config.save()
 
         expect(fs.write.argsForCall[0][0]).toBe(fs.join(config.configDirPath, "config.cson"))
-        CoffeeScript = nodeRequire 'coffee-script'
+        CoffeeScript = require 'coffee-script'
         writtenConfig = CoffeeScript.eval(fs.write.argsForCall[0][1], bare: true)
         expect(writtenConfig).toEqual config.settings
 
diff --git a/spec/app/directory-spec.coffee b/spec/app/directory-spec.coffee
index d33341623..3acdca5f9 100644
--- a/spec/app/directory-spec.coffee
+++ b/spec/app/directory-spec.coffee
@@ -1,5 +1,5 @@
 Directory = require 'directory'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "Directory", ->
   directory = null
diff --git a/spec/app/display-buffer-spec.coffee b/spec/app/display-buffer-spec.coffee
index 11b177235..a46f2f63d 100644
--- a/spec/app/display-buffer-spec.coffee
+++ b/spec/app/display-buffer-spec.coffee
@@ -1,6 +1,6 @@
 DisplayBuffer = require 'display-buffer'
-Buffer = require 'buffer'
-_ = nodeRequire 'underscore'
+Buffer = require 'text-buffer'
+_ = require 'underscore'
 
 describe "DisplayBuffer", ->
   [editSession, displayBuffer, buffer, changeHandler, tabLength] = []
diff --git a/spec/app/edit-session-spec.coffee b/spec/app/edit-session-spec.coffee
index d9f7be7f6..990c8e7c7 100644
--- a/spec/app/edit-session-spec.coffee
+++ b/spec/app/edit-session-spec.coffee
@@ -1,5 +1,5 @@
 Project = require 'project'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 
 describe "EditSession", ->
diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index da885955e..43d50065b 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -1,12 +1,12 @@
 EditSession = require 'edit-session'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 Range = require 'range'
 Project = require 'project'
 $ = require 'jquery'
 {$$} = require 'space-pen'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 describe "Editor", ->
   [buffer, editor, editSession, cachedLineHeight, cachedCharWidth] = []
diff --git a/spec/app/event-emitter-spec.coffee b/spec/app/event-emitter-spec.coffee
index a8ff230f7..5256220ee 100644
--- a/spec/app/event-emitter-spec.coffee
+++ b/spec/app/event-emitter-spec.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
 
 describe "EventEmitter mixin", ->
diff --git a/spec/app/file-spec.coffee b/spec/app/file-spec.coffee
index d99bd4380..91220218e 100644
--- a/spec/app/file-spec.coffee
+++ b/spec/app/file-spec.coffee
@@ -1,5 +1,5 @@
 File = require 'file'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe 'File', ->
   [path, file] = []
diff --git a/spec/app/git-spec.coffee b/spec/app/git-spec.coffee
index fcdb120d8..e37c18192 100644
--- a/spec/app/git-spec.coffee
+++ b/spec/app/git-spec.coffee
@@ -1,5 +1,5 @@
 Git = require 'git'
-fs = require 'fs'
+fs = require 'fs-utils'
 Task = require 'task'
 
 describe "Git", ->
diff --git a/spec/app/grammar-view-spec.coffee b/spec/app/grammar-view-spec.coffee
index 548a30d22..45157aab0 100644
--- a/spec/app/grammar-view-spec.coffee
+++ b/spec/app/grammar-view-spec.coffee
@@ -1,6 +1,6 @@
 RootView = require 'root-view'
 GrammarView = require 'grammar-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "GrammarView", ->
   [editor, textGrammar, jsGrammar] =  []
diff --git a/spec/app/language-mode-spec.coffee b/spec/app/language-mode-spec.coffee
index 5b2704947..715296e6b 100644
--- a/spec/app/language-mode-spec.coffee
+++ b/spec/app/language-mode-spec.coffee
@@ -1,5 +1,5 @@
 Project = require 'project'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 
 describe "LanguageMode", ->
diff --git a/spec/app/pane-container-spec.coffee b/spec/app/pane-container-spec.coffee
index 05b76f09b..56ea53336 100644
--- a/spec/app/pane-container-spec.coffee
+++ b/spec/app/pane-container-spec.coffee
@@ -1,7 +1,7 @@
 PaneContainer = require 'pane-container'
 Pane = require 'pane'
 {View, $$} = require 'space-pen'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
 
 describe "PaneContainer", ->
diff --git a/spec/app/project-spec.coffee b/spec/app/project-spec.coffee
index 278c00f5f..3b277f778 100644
--- a/spec/app/project-spec.coffee
+++ b/spec/app/project-spec.coffee
@@ -1,6 +1,6 @@
 Project = require 'project'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 BufferedProcess = require 'buffered-process'
 
 describe "Project", ->
diff --git a/spec/app/root-view-spec.coffee b/spec/app/root-view-spec.coffee
index 89c8ef8c1..7a48b84ae 100644
--- a/spec/app/root-view-spec.coffee
+++ b/spec/app/root-view-spec.coffee
@@ -1,8 +1,8 @@
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 Project = require 'project'
 RootView = require 'root-view'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 Pane = require 'pane'
 {View, $$} = require 'space-pen'
diff --git a/spec/app/selection-spec.coffee b/spec/app/selection-spec.coffee
index 9a56e6118..a10068466 100644
--- a/spec/app/selection-spec.coffee
+++ b/spec/app/selection-spec.coffee
@@ -1,4 +1,4 @@
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 Range = require 'range'
 
diff --git a/spec/app/syntax-spec.coffee b/spec/app/syntax-spec.coffee
index 5cf79f7e3..017f3f85b 100644
--- a/spec/app/syntax-spec.coffee
+++ b/spec/app/syntax-spec.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "the `syntax` global", ->
   describe ".grammarForFilePath(filePath)", ->
diff --git a/spec/app/buffer-spec.coffee b/spec/app/tex-buffer-spec.coffee
similarity index 99%
rename from spec/app/buffer-spec.coffee
rename to spec/app/tex-buffer-spec.coffee
index 77253422f..d4ecbe1bf 100644
--- a/spec/app/buffer-spec.coffee
+++ b/spec/app/tex-buffer-spec.coffee
@@ -1,7 +1,7 @@
 Project = require 'project'
-Buffer = require 'buffer'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+Buffer = require 'text-buffer'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 describe 'Buffer', ->
   [filePath, fileContents, buffer] = []
diff --git a/spec/app/text-mate-grammar-spec.coffee b/spec/app/text-mate-grammar-spec.coffee
index e727f0382..09d236487 100644
--- a/spec/app/text-mate-grammar-spec.coffee
+++ b/spec/app/text-mate-grammar-spec.coffee
@@ -1,8 +1,8 @@
 TextMateGrammar = require 'text-mate-grammar'
 TextMatePackage = require 'text-mate-package'
 plist = require 'plist'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 describe "TextMateGrammar", ->
   grammar = null
diff --git a/spec/app/text-mate-theme-spec.coffee b/spec/app/text-mate-theme-spec.coffee
index b2f6e54fe..ff6c5cb16 100644
--- a/spec/app/text-mate-theme-spec.coffee
+++ b/spec/app/text-mate-theme-spec.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 plist = require 'plist'
 TextMateTheme = require 'text-mate-theme'
 Theme = require 'theme'
diff --git a/spec/app/theme-spec.coffee b/spec/app/theme-spec.coffee
index 518482292..c5b588f0b 100644
--- a/spec/app/theme-spec.coffee
+++ b/spec/app/theme-spec.coffee
@@ -1,5 +1,5 @@
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 Theme = require 'theme'
 
 describe "@load(name)", ->
diff --git a/spec/app/tokenized-buffer-spec.coffee b/spec/app/tokenized-buffer-spec.coffee
index 3fb102d75..378534b37 100644
--- a/spec/app/tokenized-buffer-spec.coffee
+++ b/spec/app/tokenized-buffer-spec.coffee
@@ -1,8 +1,8 @@
 TokenizedBuffer = require 'tokenized-buffer'
 LanguageMode = require 'language-mode'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "TokenizedBuffer", ->
   [editSession, tokenizedBuffer, buffer, changeHandler] = []
diff --git a/spec/app/undo-manager-spec.coffee b/spec/app/undo-manager-spec.coffee
index 6134a4da2..e213751d4 100644
--- a/spec/app/undo-manager-spec.coffee
+++ b/spec/app/undo-manager-spec.coffee
@@ -1,5 +1,5 @@
 UndoManager = require 'undo-manager'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Range = require 'range'
 
 describe "UndoManager", ->
diff --git a/spec/app/window-spec.coffee b/spec/app/window-spec.coffee
index 12f79248f..1f6e77d91 100644
--- a/spec/app/window-spec.coffee
+++ b/spec/app/window-spec.coffee
@@ -1,5 +1,5 @@
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "Window", ->
   projectPath = null
diff --git a/spec/atom-reporter.coffee b/spec/atom-reporter.coffee
index f8b7714c5..c02035cc8 100644
--- a/spec/atom-reporter.coffee
+++ b/spec/atom-reporter.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
 {View, $$} = require 'space-pen'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class AtomReporter extends View
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 5f19f9264..9a48e0276 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -3,7 +3,7 @@ window.setUpEnvironment()
 
 nakedLoad 'jasmine-jquery'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 Keymap = require 'keymap'
 Config = require 'config'
 Point = require 'point'
@@ -12,11 +12,11 @@ Directory = require 'directory'
 File = require 'file'
 Editor = require 'editor'
 TokenizedBuffer = require 'tokenized-buffer'
-fs = require 'fs'
+fs = require 'fs-utils'
 RootView = require 'root-view'
 Git = require 'git'
 requireStylesheet "jasmine.css"
-fixturePackagesPath = require.resolve('fixtures/packages')
+fixturePackagesPath = fs.resolveOnLoadPath('fixtures/packages')
 require.paths.unshift(fixturePackagesPath)
 keymap.loadBundledKeymaps()
 [bindingSetsToRestore, bindingSetsByFirstKeystrokeToRestore] = []
diff --git a/spec/spec-suite.coffee b/spec/spec-suite.coffee
index 67da12ee2..e35c622e3 100644
--- a/spec/spec-suite.coffee
+++ b/spec/spec-suite.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 require 'spec-helper'
 
 
diff --git a/spec/stdlib/cson-spec.coffee b/spec/stdlib/cson-spec.coffee
index a8ca1746b..0171cebfb 100644
--- a/spec/stdlib/cson-spec.coffee
+++ b/spec/stdlib/cson-spec.coffee
@@ -85,6 +85,6 @@ describe "CSON", ->
           singleTrailingNewline: true
 
       cson = CSON.stringify(object)
-      CoffeeScript = nodeRequire 'coffee-script'
+      CoffeeScript = require 'coffee-script'
       evaledObject = CoffeeScript.eval(cson, bare: true)
       expect(evaledObject).toEqual object
diff --git a/spec/stdlib/fs-spec.coffee b/spec/stdlib/fs-utils-spec.coffee
similarity index 99%
rename from spec/stdlib/fs-spec.coffee
rename to spec/stdlib/fs-utils-spec.coffee
index 3c74f0b33..85a52a903 100644
--- a/spec/stdlib/fs-spec.coffee
+++ b/spec/stdlib/fs-utils-spec.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "fs", ->
   describe ".read(path)", ->
diff --git a/spec/stdlib/onig-reg-exp-spec.coffee b/spec/stdlib/onig-reg-exp-spec.coffee
index b2d591b0f..5f0b9c87d 100644
--- a/spec/stdlib/onig-reg-exp-spec.coffee
+++ b/spec/stdlib/onig-reg-exp-spec.coffee
@@ -1,4 +1,4 @@
-{OnigRegExp} = nodeRequire 'oniguruma'
+{OnigRegExp} = require 'oniguruma'
 
 describe "OnigRegExp", ->
   describe ".search(string, index)", ->
diff --git a/spec/stdlib/underscore-extensions-spec.coffee b/spec/stdlib/underscore-extensions-spec.coffee
index eed055ced..5ae310cde 100644
--- a/spec/stdlib/underscore-extensions-spec.coffee
+++ b/spec/stdlib/underscore-extensions-spec.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "underscore extensions", ->
   describe "_.adviseBefore", ->
diff --git a/spec/time-reporter.coffee b/spec/time-reporter.coffee
index 1862103e5..7004072ef 100644
--- a/spec/time-reporter.coffee
+++ b/spec/time-reporter.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class TimeReporter  extends jasmine.Reporter
diff --git a/src/app/atom-package.coffee b/src/app/atom-package.coffee
index eb4cbfdfc..b88d7d0a0 100644
--- a/src/app/atom-package.coffee
+++ b/src/app/atom-package.coffee
@@ -1,6 +1,6 @@
 Package = require 'package'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 $ = require 'jquery'
 CSON = require 'cson'
 
diff --git a/src/app/atom-theme.coffee b/src/app/atom-theme.coffee
index 697e44697..9c524eac7 100644
--- a/src/app/atom-theme.coffee
+++ b/src/app/atom-theme.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 Theme = require 'theme'
 CSON = require 'cson'
 
diff --git a/src/app/atom.coffee b/src/app/atom.coffee
index eb00a399a..4eaec8f73 100644
--- a/src/app/atom.coffee
+++ b/src/app/atom.coffee
@@ -1,5 +1,5 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 Package = require 'package'
 TextMatePackage = require 'text-mate-package'
 Theme = require 'theme'
diff --git a/src/app/binding-set.coffee b/src/app/binding-set.coffee
index 318e91c36..5621ef9cb 100644
--- a/src/app/binding-set.coffee
+++ b/src/app/binding-set.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 Specificity = require 'specificity'
 PEG = require 'pegjs'
diff --git a/src/app/buffer-change-operation.coffee b/src/app/buffer-change-operation.coffee
index c70180914..cbbf68b0a 100644
--- a/src/app/buffer-change-operation.coffee
+++ b/src/app/buffer-change-operation.coffee
@@ -1,5 +1,5 @@
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class BufferChangeOperation
diff --git a/src/app/buffer-marker.coffee b/src/app/buffer-marker.coffee
index d315120c1..199171595 100644
--- a/src/app/buffer-marker.coffee
+++ b/src/app/buffer-marker.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 Point = require 'point'
 Range = require 'range'
 EventEmitter = require 'event-emitter'
diff --git a/src/app/config.coffee b/src/app/config.coffee
index 126202609..ec54870c0 100644
--- a/src/app/config.coffee
+++ b/src/app/config.coffee
@@ -1,5 +1,5 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
 CSON = require 'cson'
 
@@ -11,8 +11,6 @@ vendoredThemesDirPath = fs.join(resourcePath, "vendor/themes")
 userThemesDirPath = fs.join(configDirPath, "themes")
 userPackagesDirPath = fs.join(configDirPath, "packages")
 
-require.paths.unshift userPackagesDirPath
-
 module.exports =
 class Config
   configDirPath: configDirPath
diff --git a/src/app/cursor-view.coffee b/src/app/cursor-view.coffee
index 755229a0a..03fae93de 100644
--- a/src/app/cursor-view.coffee
+++ b/src/app/cursor-view.coffee
@@ -1,7 +1,7 @@
 {View} = require 'space-pen'
 Point = require 'point'
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CursorView extends View
diff --git a/src/app/cursor.coffee b/src/app/cursor.coffee
index 22d492f01..5708d4bf7 100644
--- a/src/app/cursor.coffee
+++ b/src/app/cursor.coffee
@@ -1,7 +1,7 @@
 Point = require 'point'
 Range = require 'range'
 EventEmitter = require 'event-emitter'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Cursor
diff --git a/src/app/directory.coffee b/src/app/directory.coffee
index f2daa21f3..211ec42aa 100644
--- a/src/app/directory.coffee
+++ b/src/app/directory.coffee
@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 File = require 'file'
 EventEmitter = require 'event-emitter'
 
diff --git a/src/app/display-buffer-marker.coffee b/src/app/display-buffer-marker.coffee
index c8cf38c16..c8ed1648a 100644
--- a/src/app/display-buffer-marker.coffee
+++ b/src/app/display-buffer-marker.coffee
@@ -1,5 +1,5 @@
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
 
 module.exports =
diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index 9b9d307f7..0f24a235d 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TokenizedBuffer = require 'tokenized-buffer'
 LineMap = require 'line-map'
 Point = require 'point'
diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 1a158dad7..255eb3571 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -1,5 +1,5 @@
 Point = require 'point'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 LanguageMode = require 'language-mode'
 DisplayBuffer = require 'display-buffer'
 Cursor = require 'cursor'
@@ -7,8 +7,8 @@ Selection = require 'selection'
 EventEmitter = require 'event-emitter'
 Subscriber = require 'subscriber'
 Range = require 'range'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 module.exports =
 class EditSession
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index a8c2992f5..c82b7fb79 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -1,14 +1,14 @@
 {View, $$} = require 'space-pen'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Gutter = require 'gutter'
 Point = require 'point'
 Range = require 'range'
 EditSession = require 'edit-session'
 CursorView = require 'cursor-view'
 SelectionView = require 'selection-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Editor extends View
diff --git a/src/app/event-emitter.coffee b/src/app/event-emitter.coffee
index bdcce5529..3abcb74ac 100644
--- a/src/app/event-emitter.coffee
+++ b/src/app/event-emitter.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
   on: (eventName, handler) ->
diff --git a/src/app/file.coffee b/src/app/file.coffee
index 7f203af71..8ecc33e68 100644
--- a/src/app/file.coffee
+++ b/src/app/file.coffee
@@ -1,7 +1,7 @@
 EventEmitter = require 'event-emitter'
 
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 module.exports =
 class File
diff --git a/src/app/git.coffee b/src/app/git.coffee
index 502b30203..c295f1c6d 100644
--- a/src/app/git.coffee
+++ b/src/app/git.coffee
@@ -1,9 +1,9 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 Subscriber = require 'subscriber'
 EventEmitter = require 'event-emitter'
 RepositoryStatusTask = require 'repository-status-task'
-GitUtils = nodeRequire 'git-utils'
+GitUtils = require 'git-utils'
 
 module.exports =
 class Git
diff --git a/src/app/keymap.coffee b/src/app/keymap.coffee
index 9846fd58f..f83181d50 100644
--- a/src/app/keymap.coffee
+++ b/src/app/keymap.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 CSON = require 'cson'
 
 BindingSet = require 'binding-set'
@@ -31,7 +31,7 @@ class Keymap
     $(document).command 'open-dev', => atom.openDev()
 
   loadBundledKeymaps: ->
-    @loadDirectory(require.resolve('keymaps'))
+    @loadDirectory(fs.resolveOnLoadPath('keymaps'))
 
   loadUserKeymaps: ->
     @loadDirectory(fs.join(config.configDirPath, 'keymaps'))
diff --git a/src/app/language-mode.coffee b/src/app/language-mode.coffee
index d88f78bd7..af461e30d 100644
--- a/src/app/language-mode.coffee
+++ b/src/app/language-mode.coffee
@@ -1,7 +1,7 @@
 Range = require 'range'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 require 'underscore-extensions'
-{OnigRegExp} = nodeRequire 'oniguruma'
+{OnigRegExp} = require 'oniguruma'
 
 module.exports =
 class LanguageMode
diff --git a/src/app/package.coffee b/src/app/package.coffee
index 5a7897347..57c4dc8f5 100644
--- a/src/app/package.coffee
+++ b/src/app/package.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class Package
diff --git a/src/app/pane-column.coffee b/src/app/pane-column.coffee
index d603837e8..43ba40cbb 100644
--- a/src/app/pane-column.coffee
+++ b/src/app/pane-column.coffee
@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 PaneAxis = require 'pane-axis'
 
 module.exports =
diff --git a/src/app/pane-row.coffee b/src/app/pane-row.coffee
index 76b49a7d6..ce7a09f82 100644
--- a/src/app/pane-row.coffee
+++ b/src/app/pane-row.coffee
@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 PaneAxis = require 'pane-axis'
 
 module.exports =
diff --git a/src/app/pane.coffee b/src/app/pane.coffee
index 414507b2b..ef29ce72f 100644
--- a/src/app/pane.coffee
+++ b/src/app/pane.coffee
@@ -1,6 +1,6 @@
 {View} = require 'space-pen'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 PaneRow = require 'pane-row'
 PaneColumn = require 'pane-column'
 
diff --git a/src/app/pasteboard.coffee b/src/app/pasteboard.coffee
index 4d635ceee..404b48216 100644
--- a/src/app/pasteboard.coffee
+++ b/src/app/pasteboard.coffee
@@ -1,4 +1,4 @@
-crypto = nodeRequire 'crypto'
+crypto = require 'crypto'
 
 module.exports =
 class Pasteboard
diff --git a/src/app/project.coffee b/src/app/project.coffee
index 766f25952..a0bee7fb2 100644
--- a/src/app/project.coffee
+++ b/src/app/project.coffee
@@ -1,8 +1,8 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 $ = require 'jquery'
 Range = require 'range'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 EventEmitter = require 'event-emitter'
 Directory = require 'directory'
diff --git a/src/app/range.coffee b/src/app/range.coffee
index e5a2bf39a..a3870ea66 100644
--- a/src/app/range.coffee
+++ b/src/app/range.coffee
@@ -1,5 +1,5 @@
 Point = require 'point'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Range
diff --git a/src/app/repository-status-handler.coffee b/src/app/repository-status-handler.coffee
index d35a47055..a6699942a 100644
--- a/src/app/repository-status-handler.coffee
+++ b/src/app/repository-status-handler.coffee
@@ -1,5 +1,5 @@
-Git = nodeRequire 'git-utils'
-fs = require 'fs'
+Git = require 'git-utils'
+fs = require 'fs-utils'
 
 module.exports =
   loadStatuses: (path) ->
diff --git a/src/app/repository-status-task.coffee b/src/app/repository-status-task.coffee
index 020654d0d..0e5f746a5 100644
--- a/src/app/repository-status-task.coffee
+++ b/src/app/repository-status-task.coffee
@@ -1,5 +1,5 @@
 Task = require 'task'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class RepositoryStatusTask extends Task
diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee
index 0ab323fae..f25e156ad 100644
--- a/src/app/root-view.coffee
+++ b/src/app/root-view.coffee
@@ -1,10 +1,10 @@
 $ = require 'jquery'
 {$$} = require 'space-pen'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 {View} = require 'space-pen'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 Project = require 'project'
 Pane = require 'pane'
diff --git a/src/app/screen-line.coffee b/src/app/screen-line.coffee
index 5574542c3..739d23eff 100644
--- a/src/app/screen-line.coffee
+++ b/src/app/screen-line.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class ScreenLine
diff --git a/src/app/selection.coffee b/src/app/selection.coffee
index e5e3a115a..9377498a2 100644
--- a/src/app/selection.coffee
+++ b/src/app/selection.coffee
@@ -1,6 +1,6 @@
 Range = require 'range'
 EventEmitter = require 'event-emitter'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Selection
diff --git a/src/app/syntax.coffee b/src/app/syntax.coffee
index f6ef7ccca..7f89a63fe 100644
--- a/src/app/syntax.coffee
+++ b/src/app/syntax.coffee
@@ -1,8 +1,8 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 jQuery = require 'jquery'
 Specificity = require 'specificity'
 {$$} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 EventEmitter = require 'event-emitter'
 
 module.exports =
diff --git a/src/app/buffer.coffee b/src/app/text-buffer.coffee
similarity index 99%
rename from src/app/buffer.coffee
rename to src/app/text-buffer.coffee
index 9c16f3eb8..2c5c623e3 100644
--- a/src/app/buffer.coffee
+++ b/src/app/text-buffer.coffee
@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 File = require 'file'
 Point = require 'point'
 Range = require 'range'
diff --git a/src/app/text-mate-grammar.coffee b/src/app/text-mate-grammar.coffee
index 2ceb59bfb..a8ef8065c 100644
--- a/src/app/text-mate-grammar.coffee
+++ b/src/app/text-mate-grammar.coffee
@@ -1,9 +1,9 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 plist = require 'plist'
 Token = require 'token'
 CSON = require 'cson'
-{OnigRegExp, OnigScanner} = nodeRequire 'oniguruma'
+{OnigRegExp, OnigScanner} = require 'oniguruma'
 
 module.exports =
 class TextMateGrammar
diff --git a/src/app/text-mate-package.coffee b/src/app/text-mate-package.coffee
index 1e727860b..988aa1ebf 100644
--- a/src/app/text-mate-package.coffee
+++ b/src/app/text-mate-package.coffee
@@ -1,7 +1,7 @@
 Package = require 'package'
-fs = require 'fs'
+fs = require 'fs-utils'
 plist = require 'plist'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TextMateGrammar = require 'text-mate-grammar'
 CSON = require 'cson'
 
diff --git a/src/app/text-mate-theme.coffee b/src/app/text-mate-theme.coffee
index 0d56b6e93..956bcbdf1 100644
--- a/src/app/text-mate-theme.coffee
+++ b/src/app/text-mate-theme.coffee
@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 plist = require 'plist'
 Theme = require 'theme'
 
diff --git a/src/app/theme.coffee b/src/app/theme.coffee
index b16a7ef1c..7b20df793 100644
--- a/src/app/theme.coffee
+++ b/src/app/theme.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class Theme
diff --git a/src/app/token.coffee b/src/app/token.coffee
index 20d1b5efa..9c3d50ed8 100644
--- a/src/app/token.coffee
+++ b/src/app/token.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Token
diff --git a/src/app/tokenized-buffer.coffee b/src/app/tokenized-buffer.coffee
index 0ef4ea2c0..70e982e28 100644
--- a/src/app/tokenized-buffer.coffee
+++ b/src/app/tokenized-buffer.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 ScreenLine = require 'screen-line'
 EventEmitter = require 'event-emitter'
 Token = require 'token'
diff --git a/src/app/undo-manager.coffee b/src/app/undo-manager.coffee
index 3f4025740..fc5b73e00 100644
--- a/src/app/undo-manager.coffee
+++ b/src/app/undo-manager.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 
diff --git a/src/app/window.coffee b/src/app/window.coffee
index 10e7fbf8f..e1748daf8 100644
--- a/src/app/window.coffee
+++ b/src/app/window.coffee
@@ -1,6 +1,6 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-ChildProcess = nodeRequire 'child_process'
+ChildProcess = require 'child_process'
 require 'jquery-extensions'
 require 'underscore-extensions'
 require 'space-pen-extensions'
diff --git a/src/packages/autocomplete/spec/autocomplete-spec.coffee b/src/packages/autocomplete/spec/autocomplete-spec.coffee
index 9bfa9af7f..c210b2173 100644
--- a/src/packages/autocomplete/spec/autocomplete-spec.coffee
+++ b/src/packages/autocomplete/spec/autocomplete-spec.coffee
@@ -1,7 +1,7 @@
 $ = require 'jquery'
 AutocompleteView = require 'autocomplete/lib/autocomplete-view'
 Autocomplete = require 'autocomplete/lib/autocomplete'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
 RootView = require 'root-view'
 
diff --git a/src/packages/bracket-matcher/lib/bracket-matcher.coffee b/src/packages/bracket-matcher/lib/bracket-matcher.coffee
index 44dc1998b..52ad5aa50 100644
--- a/src/packages/bracket-matcher/lib/bracket-matcher.coffee
+++ b/src/packages/bracket-matcher/lib/bracket-matcher.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 {$$} = require 'space-pen'
 Range = require 'range'
 
diff --git a/src/packages/command-logger/lib/command-logger-view.coffee b/src/packages/command-logger/lib/command-logger-view.coffee
index 1743857c8..e4dd5838d 100644
--- a/src/packages/command-logger/lib/command-logger-view.coffee
+++ b/src/packages/command-logger/lib/command-logger-view.coffee
@@ -1,6 +1,6 @@
 {$$$} = require 'space-pen'
 ScrollView = require 'scroll-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CommandLoggerView extends ScrollView
@@ -96,7 +96,7 @@ class CommandLoggerView extends ScrollView
     w = @treeMap.width()
     h = @treeMap.height()
 
-    d3 = nodeRequire 'd3'
+    d3 = require 'd3'
 
     x = d3.scale.linear().range([0, w])
     y = d3.scale.linear().range([0, h])
diff --git a/src/packages/command-palette/lib/command-palette-view.coffee b/src/packages/command-palette/lib/command-palette-view.coffee
index 717118041..2acb80753 100644
--- a/src/packages/command-palette/lib/command-palette-view.coffee
+++ b/src/packages/command-palette/lib/command-palette-view.coffee
@@ -1,7 +1,7 @@
 {$$} = require 'space-pen'
 SelectList = require 'select-list'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CommandPaletteView extends SelectList
diff --git a/src/packages/command-palette/spec/command-palette-spec.coffee b/src/packages/command-palette/spec/command-palette-spec.coffee
index 780ad33b3..414c53996 100644
--- a/src/packages/command-palette/spec/command-palette-spec.coffee
+++ b/src/packages/command-palette/spec/command-palette-spec.coffee
@@ -1,7 +1,7 @@
 RootView = require 'root-view'
 CommandPalette = require 'command-palette/lib/command-palette-view'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "CommandPalette", ->
   [palette] = []
diff --git a/src/packages/command-panel/lib/command-interpreter.coffee b/src/packages/command-panel/lib/command-interpreter.coffee
index c2328ceed..8caa07b20 100644
--- a/src/packages/command-panel/lib/command-interpreter.coffee
+++ b/src/packages/command-panel/lib/command-interpreter.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 PEG = require 'pegjs'
 
 module.exports =
diff --git a/src/packages/command-panel/lib/command-panel-view.coffee b/src/packages/command-panel/lib/command-panel-view.coffee
index 72c2b95e6..2430c7ae0 100644
--- a/src/packages/command-panel/lib/command-panel-view.coffee
+++ b/src/packages/command-panel/lib/command-panel-view.coffee
@@ -5,7 +5,7 @@ CompositeCommand = require './commands/composite-command'
 PreviewList = require './preview-list'
 Editor = require 'editor'
 {SyntaxError} = require('pegjs').parser
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class CommandPanelView extends View
diff --git a/src/packages/command-panel/lib/commands/composite-command.coffee b/src/packages/command-panel/lib/commands/composite-command.coffee
index 7c6648bce..cc5485b4a 100644
--- a/src/packages/command-panel/lib/commands/composite-command.coffee
+++ b/src/packages/command-panel/lib/commands/composite-command.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
 
 module.exports =
diff --git a/src/packages/command-panel/lib/path-view.coffee b/src/packages/command-panel/lib/path-view.coffee
index dbd93751d..21042bfb9 100644
--- a/src/packages/command-panel/lib/path-view.coffee
+++ b/src/packages/command-panel/lib/path-view.coffee
@@ -1,5 +1,5 @@
 {View} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 OperationView = require './operation-view'
 $ = require 'jquery'
 
diff --git a/src/packages/command-panel/lib/preview-list.coffee b/src/packages/command-panel/lib/preview-list.coffee
index 6d7629128..06abb868e 100644
--- a/src/packages/command-panel/lib/preview-list.coffee
+++ b/src/packages/command-panel/lib/preview-list.coffee
@@ -1,7 +1,7 @@
 $ = require 'jquery'
 ScrollView = require 'scroll-view'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 PathView = require './path-view'
 OperationView = require './operation-view'
 
diff --git a/src/packages/command-panel/spec/command-interpreter-spec.coffee b/src/packages/command-panel/spec/command-interpreter-spec.coffee
index 9d6b0c1c1..ed1c4a702 100644
--- a/src/packages/command-panel/spec/command-interpreter-spec.coffee
+++ b/src/packages/command-panel/spec/command-interpreter-spec.coffee
@@ -1,9 +1,9 @@
 CommandInterpreter = require 'command-panel/lib/command-interpreter'
 Project = require 'project'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 EditSession = require 'edit-session'
 
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "CommandInterpreter", ->
   [interpreter, editSession, buffer] = []
diff --git a/src/packages/command-panel/spec/command-panel-spec.coffee b/src/packages/command-panel/spec/command-panel-spec.coffee
index d5f087c1a..213d14191 100644
--- a/src/packages/command-panel/spec/command-panel-spec.coffee
+++ b/src/packages/command-panel/spec/command-panel-spec.coffee
@@ -1,6 +1,6 @@
 RootView = require 'root-view'
 CommandPanelView = require 'command-panel/lib/command-panel-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "CommandPanel", ->
   [editSession, buffer, commandPanel] = []
diff --git a/src/packages/editor-stats/lib/editor-stats-view.coffee b/src/packages/editor-stats/lib/editor-stats-view.coffee
index 7f0d7314e..d1a554449 100644
--- a/src/packages/editor-stats/lib/editor-stats-view.coffee
+++ b/src/packages/editor-stats/lib/editor-stats-view.coffee
@@ -1,6 +1,6 @@
 ScrollView = require 'scroll-view'
-d3 = nodeRequire 'd3'
-_ = nodeRequire 'underscore'
+d3 = require 'd3'
+_ = require 'underscore'
 $ = require 'jquery'
 
 module.exports =
diff --git a/src/packages/editor-stats/spec/editor-stats-spec.coffee b/src/packages/editor-stats/spec/editor-stats-spec.coffee
index d8f372365..5d8708e42 100644
--- a/src/packages/editor-stats/spec/editor-stats-spec.coffee
+++ b/src/packages/editor-stats/spec/editor-stats-spec.coffee
@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 RootView = require 'root-view'
 EditorStats = require 'editor-stats/lib/editor-stats-view'
 
diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
index 013d4b344..3161115d8 100644
--- a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
+++ b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee
@@ -1,8 +1,8 @@
 {View, $$} = require 'space-pen'
 SelectList = require 'select-list'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
-fs = require 'fs'
+fs = require 'fs-utils'
 LoadPathsTask = require './load-paths-task'
 
 module.exports =
diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee
index e3fcf839c..c6fbe92aa 100644
--- a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee
+++ b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
   projectPaths: null
diff --git a/src/packages/fuzzy-finder/lib/load-paths-handler.coffee b/src/packages/fuzzy-finder/lib/load-paths-handler.coffee
index 783b93d35..12ac60605 100644
--- a/src/packages/fuzzy-finder/lib/load-paths-handler.coffee
+++ b/src/packages/fuzzy-finder/lib/load-paths-handler.coffee
@@ -1,5 +1,5 @@
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 
 module.exports =
   loadPaths: (rootPath, ignoredNames, excludeGitIgnoredPaths) ->
diff --git a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
index 0f9b04e64..d512d0b0e 100644
--- a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
+++ b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee
@@ -1,10 +1,10 @@
 RootView = require 'root-view'
 FuzzyFinder = require 'fuzzy-finder/lib/fuzzy-finder-view'
 LoadPathsTask = require 'fuzzy-finder/lib/load-paths-task'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 $ = require 'jquery'
 {$$} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe 'FuzzyFinder', ->
   [finderView] = []
diff --git a/src/packages/markdown-preview/lib/markdown-preview-view.coffee b/src/packages/markdown-preview/lib/markdown-preview-view.coffee
index b78827a83..580704007 100644
--- a/src/packages/markdown-preview/lib/markdown-preview-view.coffee
+++ b/src/packages/markdown-preview/lib/markdown-preview-view.coffee
@@ -1,5 +1,5 @@
 ScrollView = require 'scroll-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 {$$$} = require 'space-pen'
 
diff --git a/src/packages/markdown-preview/spec/markdown-preview-spec.coffee b/src/packages/markdown-preview/spec/markdown-preview-spec.coffee
index 4941e36d6..7704768ee 100644
--- a/src/packages/markdown-preview/spec/markdown-preview-spec.coffee
+++ b/src/packages/markdown-preview/spec/markdown-preview-spec.coffee
@@ -1,7 +1,7 @@
 $ = require 'jquery'
 RootView = require 'root-view'
 MarkdownPreview = require 'markdown-preview/lib/markdown-preview-view'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 describe "MarkdownPreview", ->
   beforeEach ->
diff --git a/src/packages/package-generator/lib/package-generator-view.coffee b/src/packages/package-generator/lib/package-generator-view.coffee
index 95d17b2e6..b8f123ecd 100644
--- a/src/packages/package-generator/lib/package-generator-view.coffee
+++ b/src/packages/package-generator/lib/package-generator-view.coffee
@@ -1,8 +1,8 @@
 {View} = require 'space-pen'
 Editor = require 'editor'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 module.exports =
 class PackageGeneratorView extends View
diff --git a/src/packages/package-generator/spec/package-generator-spec.coffee b/src/packages/package-generator/spec/package-generator-spec.coffee
index cae5d5d54..c1b57b255 100644
--- a/src/packages/package-generator/spec/package-generator-spec.coffee
+++ b/src/packages/package-generator/spec/package-generator-spec.coffee
@@ -1,5 +1,5 @@
 RootView = require 'root-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe 'Package Generator', ->
   [packageGenerator] = []
diff --git a/src/packages/snippets/lib/load-snippets-handler.coffee b/src/packages/snippets/lib/load-snippets-handler.coffee
index 331013adb..6d65a46c4 100644
--- a/src/packages/snippets/lib/load-snippets-handler.coffee
+++ b/src/packages/snippets/lib/load-snippets-handler.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 TextMatePackage = require 'text-mate-package'
 SnippetBodyParser = require './snippet-body-parser'
 CSON = require 'cson'
diff --git a/src/packages/snippets/lib/snippet-body-parser.coffee b/src/packages/snippets/lib/snippet-body-parser.coffee
index 0239fee3f..f4c3f99f7 100644
--- a/src/packages/snippets/lib/snippet-body-parser.coffee
+++ b/src/packages/snippets/lib/snippet-body-parser.coffee
@@ -1,4 +1,4 @@
 PEG = require 'pegjs'
-fs = require 'fs'
+fs = require 'fs-utils'
 grammarSrc = fs.read(require.resolve('./snippet-body.pegjs'))
 module.exports = PEG.buildParser(grammarSrc, trackLineAndColumn: true)
diff --git a/src/packages/snippets/lib/snippet-expansion.coffee b/src/packages/snippets/lib/snippet-expansion.coffee
index 825cd92f7..68f9935af 100644
--- a/src/packages/snippets/lib/snippet-expansion.coffee
+++ b/src/packages/snippets/lib/snippet-expansion.coffee
@@ -1,5 +1,5 @@
 Subscriber = require 'subscriber'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class SnippetExpansion
diff --git a/src/packages/snippets/lib/snippet.coffee b/src/packages/snippets/lib/snippet.coffee
index 6d484fef6..6e0069862 100644
--- a/src/packages/snippets/lib/snippet.coffee
+++ b/src/packages/snippets/lib/snippet.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 Range = require 'range'
 
 module.exports =
diff --git a/src/packages/snippets/lib/snippets.coffee b/src/packages/snippets/lib/snippets.coffee
index ee89f587b..a76497497 100644
--- a/src/packages/snippets/lib/snippets.coffee
+++ b/src/packages/snippets/lib/snippets.coffee
@@ -1,6 +1,6 @@
 AtomPackage = require 'atom-package'
-fs = require 'fs'
-_ = nodeRequire 'underscore'
+fs = require 'fs-utils'
+_ = require 'underscore'
 SnippetExpansion = require './snippet-expansion'
 Snippet = require './snippet'
 LoadSnippetsTask = require './load-snippets-task'
diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee
index b7150791c..9c6c323ac 100644
--- a/src/packages/snippets/spec/snippets-spec.coffee
+++ b/src/packages/snippets/spec/snippets-spec.coffee
@@ -1,10 +1,10 @@
 Snippet = require 'snippets/lib/snippet'
 LoadSnippetsTask = require 'snippets/lib/load-snippets-task'
 RootView = require 'root-view'
-Buffer = require 'buffer'
+Buffer = require 'text-buffer'
 Editor = require 'editor'
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 Package = require 'package'
 
 describe "Snippets extension", ->
diff --git a/src/packages/spell-check/lib/spell-check-view.coffee b/src/packages/spell-check/lib/spell-check-view.coffee
index 37ad954ec..323d0e873 100644
--- a/src/packages/spell-check/lib/spell-check-view.coffee
+++ b/src/packages/spell-check/lib/spell-check-view.coffee
@@ -1,5 +1,5 @@
 {View} = require 'space-pen'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 SpellCheckTask = require './spell-check-task'
 MisspellingView = require './misspelling-view'
 
diff --git a/src/packages/status-bar/lib/status-bar-view.coffee b/src/packages/status-bar/lib/status-bar-view.coffee
index a3d6723c0..f58d4dba0 100644
--- a/src/packages/status-bar/lib/status-bar-view.coffee
+++ b/src/packages/status-bar/lib/status-bar-view.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 {View, $$} = require 'space-pen'
 $ = require 'jquery'
 
diff --git a/src/packages/status-bar/spec/status-bar-spec.coffee b/src/packages/status-bar/spec/status-bar-spec.coffee
index 5d45a5097..92ee548ee 100644
--- a/src/packages/status-bar/spec/status-bar-spec.coffee
+++ b/src/packages/status-bar/spec/status-bar-spec.coffee
@@ -1,8 +1,8 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 RootView = require 'root-view'
 StatusBar = require 'status-bar/lib/status-bar-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "StatusBar", ->
   [editor, statusBar, buffer] = []
diff --git a/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee b/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee
index 17277b059..9a405ddd2 100644
--- a/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee
+++ b/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee
@@ -1,5 +1,5 @@
 RootView = require 'root-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "StripTrailingWhitespace", ->
   [editor, path] = []
diff --git a/src/packages/symbols-view/lib/load-tags-handler.coffee b/src/packages/symbols-view/lib/load-tags-handler.coffee
index a002ee263..860d037f5 100644
--- a/src/packages/symbols-view/lib/load-tags-handler.coffee
+++ b/src/packages/symbols-view/lib/load-tags-handler.coffee
@@ -1,5 +1,5 @@
-ctags = nodeRequire 'ctags'
-fs = require 'fs'
+ctags = require 'ctags'
+fs = require 'fs-utils'
 
 module.exports =
   getTagsFile: (path) ->
diff --git a/src/packages/symbols-view/lib/symbols-view.coffee b/src/packages/symbols-view/lib/symbols-view.coffee
index 4d5bbb5df..816be9739 100644
--- a/src/packages/symbols-view/lib/symbols-view.coffee
+++ b/src/packages/symbols-view/lib/symbols-view.coffee
@@ -3,7 +3,7 @@ SelectList = require 'select-list'
 TagGenerator = require './tag-generator'
 TagReader = require './tag-reader'
 Point = require 'point'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 
 module.exports =
diff --git a/src/packages/symbols-view/lib/tag-reader.coffee b/src/packages/symbols-view/lib/tag-reader.coffee
index f03c3e332..91ce1787c 100644
--- a/src/packages/symbols-view/lib/tag-reader.coffee
+++ b/src/packages/symbols-view/lib/tag-reader.coffee
@@ -1,7 +1,7 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 LoadTagsTask = require './load-tags-task'
-ctags = nodeRequire 'ctags'
+ctags = require 'ctags'
 
 module.exports =
 
diff --git a/src/packages/symbols-view/spec/symbols-view-spec.coffee b/src/packages/symbols-view/spec/symbols-view-spec.coffee
index b988d61c8..db8876855 100644
--- a/src/packages/symbols-view/spec/symbols-view-spec.coffee
+++ b/src/packages/symbols-view/spec/symbols-view-spec.coffee
@@ -1,7 +1,7 @@
 RootView = require 'root-view'
 SymbolsView = require 'symbols-view/lib/symbols-view'
 TagGenerator = require 'symbols-view/lib/tag-generator'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "SymbolsView", ->
   [symbolsView, setArraySpy] = []
diff --git a/src/packages/tabs/lib/tab-bar-view.coffee b/src/packages/tabs/lib/tab-bar-view.coffee
index 37e830071..fbbab1330 100644
--- a/src/packages/tabs/lib/tab-bar-view.coffee
+++ b/src/packages/tabs/lib/tab-bar-view.coffee
@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 SortableList = require 'sortable-list'
 TabView = require './tab-view'
 
diff --git a/src/packages/tabs/lib/tab-view.coffee b/src/packages/tabs/lib/tab-view.coffee
index 9bfee397e..9e9594ef1 100644
--- a/src/packages/tabs/lib/tab-view.coffee
+++ b/src/packages/tabs/lib/tab-view.coffee
@@ -1,6 +1,6 @@
 $ = require 'jquery'
 {View} = require 'space-pen'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class TabView extends View
diff --git a/src/packages/tabs/spec/tabs-spec.coffee b/src/packages/tabs/spec/tabs-spec.coffee
index 41c012c2e..014e0352d 100644
--- a/src/packages/tabs/spec/tabs-spec.coffee
+++ b/src/packages/tabs/spec/tabs-spec.coffee
@@ -1,10 +1,10 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 RootView = require 'root-view'
 Pane = require 'pane'
 PaneContainer = require 'pane-container'
 TabBarView = require 'tabs/lib/tab-bar-view'
-fs = require 'fs'
+fs = require 'fs-utils'
 {View} = require 'space-pen'
 
 describe "Tabs package main", ->
diff --git a/src/packages/tree-view/lib/dialog.coffee b/src/packages/tree-view/lib/dialog.coffee
index ddb71181a..858db818a 100644
--- a/src/packages/tree-view/lib/dialog.coffee
+++ b/src/packages/tree-view/lib/dialog.coffee
@@ -1,6 +1,6 @@
 {View} = require 'space-pen'
 Editor = require 'editor'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
 
 module.exports =
diff --git a/src/packages/tree-view/lib/file-view.coffee b/src/packages/tree-view/lib/file-view.coffee
index f8d7f5115..956e902f8 100644
--- a/src/packages/tree-view/lib/file-view.coffee
+++ b/src/packages/tree-view/lib/file-view.coffee
@@ -1,7 +1,7 @@
 {View} = require 'space-pen'
 $ = require 'jquery'
 Git = require 'git'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 module.exports =
 class FileView extends View
diff --git a/src/packages/tree-view/lib/tree-view.coffee b/src/packages/tree-view/lib/tree-view.coffee
index ae125b04c..6b531aa4e 100644
--- a/src/packages/tree-view/lib/tree-view.coffee
+++ b/src/packages/tree-view/lib/tree-view.coffee
@@ -4,9 +4,9 @@ Directory = require 'directory'
 DirectoryView = require './directory-view'
 FileView = require './file-view'
 Dialog = require './dialog'
-fs = require 'fs'
+fs = require 'fs-utils'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class TreeView extends ScrollView
diff --git a/src/packages/tree-view/spec/tree-view-spec.coffee b/src/packages/tree-view/spec/tree-view-spec.coffee
index 75b0ab070..7ea695d23 100644
--- a/src/packages/tree-view/spec/tree-view-spec.coffee
+++ b/src/packages/tree-view/spec/tree-view-spec.coffee
@@ -1,9 +1,9 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 TreeView = require 'tree-view/lib/tree-view'
 RootView = require 'root-view'
 Directory = require 'directory'
-fs = require 'fs'
+fs = require 'fs-utils'
 
 describe "TreeView", ->
   [treeView, sampleJs, sampleTxt] = []
diff --git a/src/packages/wrap-guide/lib/wrap-guide-view.coffee b/src/packages/wrap-guide/lib/wrap-guide-view.coffee
index f3f79e978..491e19705 100644
--- a/src/packages/wrap-guide/lib/wrap-guide-view.coffee
+++ b/src/packages/wrap-guide/lib/wrap-guide-view.coffee
@@ -1,6 +1,6 @@
 {View} = require 'space-pen'
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class WrapGuideView extends View
diff --git a/src/stdlib/buffered-process.coffee b/src/stdlib/buffered-process.coffee
index 1781662f0..04fcf3ce9 100644
--- a/src/stdlib/buffered-process.coffee
+++ b/src/stdlib/buffered-process.coffee
@@ -1,4 +1,4 @@
-ChildProcess = nodeRequire 'child_process'
+ChildProcess = require 'child_process'
 
 module.exports =
 class BufferedProcess
diff --git a/src/stdlib/cson.coffee b/src/stdlib/cson.coffee
index c723a558b..f6ba3258d 100644
--- a/src/stdlib/cson.coffee
+++ b/src/stdlib/cson.coffee
@@ -1,5 +1,5 @@
-_ = nodeRequire 'underscore'
-fs = require 'fs'
+_ = require 'underscore'
+fs = require 'fs-utils'
 
 module.exports =
   isObjectPath: (path) ->
@@ -9,7 +9,7 @@ module.exports =
   readObject: (path) ->
     contents = fs.read(path)
     if fs.extension(path) is '.cson'
-      CoffeeScript = nodeRequire 'coffee-script'
+      CoffeeScript = require 'coffee-script'
       CoffeeScript.eval(contents, bare: true)
     else
       JSON.parse(contents)
diff --git a/src/stdlib/event.coffee b/src/stdlib/event.coffee
index 902eba4e9..adf761d97 100644
--- a/src/stdlib/event.coffee
+++ b/src/stdlib/event.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
 class Event
diff --git a/src/stdlib/fs.coffee b/src/stdlib/fs-utils.coffee
similarity index 87%
rename from src/stdlib/fs.coffee
rename to src/stdlib/fs-utils.coffee
index bebe835fe..10661b2b1 100644
--- a/src/stdlib/fs.coffee
+++ b/src/stdlib/fs-utils.coffee
@@ -1,9 +1,10 @@
 # commonjs fs module
 # http://ringojs.org/api/v0.8/fs/
 
-_ = nodeRequire 'underscore'
-nodeFs = nodeRequire 'fs'
-mkdirp = nodeRequire 'mkdirp'
+_ = require 'underscore'
+fs = require 'fs'
+mkdirp = require 'mkdirp'
+Module = require 'module'
 
 module.exports =
   # Make the given path absolute by resolving it against the
@@ -28,7 +29,7 @@ module.exports =
 
   # Returns true if the file specified by path exists
   exists: (path) ->
-    path? and nodeFs.existsSync(path)
+    path? and fs.existsSync(path)
 
   # Returns the extension of a file. The extension of a file is the
   # last dot (excluding any number of initial dots) followed by one or
@@ -50,12 +51,12 @@ module.exports =
   # Returns true if the file specified by path exists and is a
   # directory.
   isDirectory: (path) ->
-    @exists(path) and nodeFs.statSync(path).isDirectory()
+    @exists(path) and fs.statSync(path).isDirectory()
 
   # Returns true if the file specified by path exists and is a
   # regular file.
   isFile: (path) ->
-    @exists(path) and nodeFs.statSync(path).isFile()
+    @exists(path) and fs.statSync(path).isFile()
 
   # Returns an array with all the names of files contained
   # in the directory path.
@@ -81,28 +82,28 @@ module.exports =
     paths
 
   move: (source, target) ->
-    nodeFs.renameSync(source, target)
+    fs.renameSync(source, target)
 
   # Remove a file at the given path. Throws an error if path is not a
   # file or a symbolic link to a file.
   remove: (path) ->
     if @isFile(path)
-      nodeFs.unlinkSync(path)
+      fs.unlinkSync(path)
     else if @isDirectory(path)
       removeDirectory = (path) =>
-        for entry in nodeFs.readdirSync(path)
+        for entry in fs.readdirSync(path)
           entryPath = @join(path, entry)
-          stats = nodeFs.statSync(entryPath)
+          stats = fs.statSync(entryPath)
           if stats.isDirectory()
             removeDirectory(entryPath)
           else if stats.isFile()
-            nodeFs.unlinkSync(entryPath)
-        nodeFs.rmdirSync(path)
+            fs.unlinkSync(entryPath)
+        fs.rmdirSync(path)
       removeDirectory(path)
 
   # Open, read, and close a file, returning the file's contents.
   read: (path) ->
-    String nodeFs.readFileSync(path)
+    String fs.readFileSync(path)
 
   # Returns an array of path components. If the path is absolute, the first
   # component will be an indicator of the root of the file system; for file
@@ -116,10 +117,10 @@ module.exports =
   # Open, write, flush, and close a file, writing the given content.
   write: (path, content) ->
     mkdirp.sync(@directory(path))
-    nodeFs.writeFileSync(path, content)
+    fs.writeFileSync(path, content)
 
   makeDirectory: (path) ->
-    nodeFs.mkdirSync(path)
+    fs.mkdirSync(path)
 
   # Creates the directory specified by "path" including any missing parent
   # directories.
@@ -134,10 +135,10 @@ module.exports =
 
     traverse = (rootPath, prefix, onFile, onDirectory) =>
       prefix  = "#{prefix}/" if prefix
-      for file in nodeFs.readdirSync(rootPath)
+      for file in fs.readdirSync(rootPath)
         relativePath = "#{prefix}#{file}"
         absolutePath = @join(rootPath, file)
-        stats = nodeFs.statSync(absolutePath)
+        stats = fs.statSync(absolutePath)
         if stats.isDirectory()
           traverse(absolutePath, relativePath, onFile, onDirectory) if onDirectory(relativePath)
         else if stats.isFile()
@@ -146,8 +147,8 @@ module.exports =
     traverse(rootPath, '', onFile, onDirectory)
 
   md5ForPath: (path) ->
-    contents = nodeFs.readFileSync(path)
-    nodeRequire('crypto').createHash('md5').update(contents).digest('hex')
+    contents = fs.readFileSync(path)
+    require('crypto').createHash('md5').update(contents).digest('hex')
 
   resolve: (args...) ->
     extensions = args.pop() if _.isArray(_.last(args))
@@ -163,6 +164,10 @@ module.exports =
         return candidatePath if @exists(candidatePath)
     undefined
 
+  resolveOnLoadPath: (args...) ->
+    loadPaths = Module.globalPaths.concat(module.paths)
+    @resolve(loadPaths..., args...)
+
   resolveExtension: (path, extensions) ->
     for extension in extensions
       if extension == ""
diff --git a/src/stdlib/jquery-extensions.coffee b/src/stdlib/jquery-extensions.coffee
index 592d01b03..089363577 100644
--- a/src/stdlib/jquery-extensions.coffee
+++ b/src/stdlib/jquery-extensions.coffee
@@ -1,5 +1,5 @@
 $ = require 'jquery'
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 $.fn.scrollBottom = (newValue) ->
   if newValue?
diff --git a/src/stdlib/path.coffee b/src/stdlib/path.coffee
index 2d1d5c41d..337b60d6b 100644
--- a/src/stdlib/path.coffee
+++ b/src/stdlib/path.coffee
@@ -1,7 +1,7 @@
 # node.js path module
 # http://nodejs.org/docs/v0.6.0/api/path.html
 
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 module.exports =
   # Return the last portion of a path. Similar to the Unix basename command.
diff --git a/src/stdlib/require.coffee b/src/stdlib/require.coffee
index b4fa85ea1..4d7f67690 100644
--- a/src/stdlib/require.coffee
+++ b/src/stdlib/require.coffee
@@ -1,4 +1,4 @@
-fs = nodeRequire 'fs'
+fs = require 'fs-utils'
 
 paths = [
   "#{window.resourcePath}/spec"
@@ -61,7 +61,7 @@ exts =
       compiled = __read(cacheFilePath)
       writeToCache = false
     else
-      CoffeeScript = nodeRequire 'coffee-script'
+      CoffeeScript = require 'coffee-script'
       compiled = CoffeeScript.compile(__read(file), filename: file)
       writeToCache = true
 
@@ -76,7 +76,7 @@ getPath = (path) ->
 
   cacheFilePath = getCacheFilePath(path)
   unless __exists(cacheFilePath)
-    CoffeeScript = nodeRequire 'coffee-script'
+    CoffeeScript = require 'coffee-script'
     compiled = CoffeeScript.compile(__read(path), filename: path)
     createCacheDirectory()
     fs.writeFileSync(cacheFilePath, compiled)
diff --git a/src/stdlib/settings.coffee b/src/stdlib/settings.coffee
index f067b44dc..e3eadea85 100644
--- a/src/stdlib/settings.coffee
+++ b/src/stdlib/settings.coffee
@@ -1,4 +1,4 @@
-fs = require 'fs'
+fs = require 'fs-utils'
 CoffeeScript = require 'coffee-script'
 
 # Settings file looks like:
diff --git a/src/stdlib/space-pen-extensions.coffee b/src/stdlib/space-pen-extensions.coffee
index 819b4f15e..37443ab03 100644
--- a/src/stdlib/space-pen-extensions.coffee
+++ b/src/stdlib/space-pen-extensions.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 {View} = require 'space-pen'
 jQuery = require 'jquery'
 ConfigObserver = require 'config-observer'
diff --git a/src/stdlib/task-shell.coffee b/src/stdlib/task-shell.coffee
index 5274f9c88..51966cec6 100644
--- a/src/stdlib/task-shell.coffee
+++ b/src/stdlib/task-shell.coffee
@@ -13,9 +13,6 @@ console =
   error: -> callTaskMethod 'error', arguments...
 self.__defineGetter__ 'console', -> console
 
-self.nodeRequire = self.require
-self.require = undefined
-
 window.document =
   createElement: ->
     setAttribute: ->
@@ -36,12 +33,11 @@ self.callTaskMethod = (method, args...) ->
 
 # The worker's initial handler replaces itself when `start` is invoked
 self.handler =
-  start: ({resourcePath, globals, requirePath, handlerPath}) ->
+  start: ({globals, handlerPath}) ->
     for key, value of globals
       self[key] = value
       window[key] = value
-    importScripts(requirePath)
-    require 'config'
+    require 'coffee-script'
     self.handler = require(handlerPath)
     callTaskMethod 'started'
 
diff --git a/src/stdlib/task.coffee b/src/stdlib/task.coffee
index 4e2873a0d..b46e2c7f8 100644
--- a/src/stdlib/task.coffee
+++ b/src/stdlib/task.coffee
@@ -1,5 +1,6 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 EventEmitter = require 'event-emitter'
+fs = require 'fs-utils'
 
 module.exports =
 class Task
@@ -10,7 +11,13 @@ class Task
   start: ->
     throw new Error("Task already started") if @worker?
 
-    @worker = new Worker(require.getPath('task-shell'))
+    taskShellPath = fs.resolveOnLoadPath('task-shell', ['js', 'coffee'])
+    contents = fs.read(taskShellPath)
+    if fs.extension(taskShellPath) is '.coffee'
+      CoffeeScript = require 'coffee-script'
+      contents = CoffeeScript.compile(contents, filename: taskShellPath)
+    blob = new Blob([contents], type: 'text/javascript')
+    @worker = new Worker(URL.createObjectURL(blob))
     @worker.onmessage = ({data}) =>
       if @aborted
         @done()
@@ -29,10 +36,8 @@ class Task
   startWorker: ->
     @callWorkerMethod 'start',
       globals:
-        resourcePath: window.resourcePath
         navigator:
           userAgent: navigator.userAgent
-      requirePath: require.getPath('require')
       handlerPath: @path
 
   started: ->
diff --git a/src/stdlib/underscore-extensions.coffee b/src/stdlib/underscore-extensions.coffee
index cc23b3fe8..0a47fdfc1 100644
--- a/src/stdlib/underscore-extensions.coffee
+++ b/src/stdlib/underscore-extensions.coffee
@@ -1,4 +1,4 @@
-_ = nodeRequire 'underscore'
+_ = require 'underscore'
 
 _.mixin
   remove: (array, element) ->
diff --git a/static/index.html b/static/index.html
index 960344d24..eb0b9cf59 100644
--- a/static/index.html
+++ b/static/index.html
@@ -16,6 +16,7 @@
 
     window.onload = function() {
       try {
+        require('coffee-script');
         if (bootstrapScript) require(bootstrapScript);
       }
       catch (error) {
@@ -23,12 +24,7 @@
         console.error(error.stack || error);
       }
     }
-
-    window.nodeRequire = window.require;
-    window.require = undefined;
   </script>
-
-  <script src='../src/stdlib/require.js'></script>
 </head>
 <body>
 </body>