diff --git a/lib/source-map/array-set.js b/lib/array-set.js
similarity index 100%
rename from lib/source-map/array-set.js
rename to lib/array-set.js
diff --git a/lib/source-map/base64-vlq.js b/lib/base64-vlq.js
similarity index 100%
rename from lib/source-map/base64-vlq.js
rename to lib/base64-vlq.js
diff --git a/lib/source-map/base64.js b/lib/base64.js
similarity index 100%
rename from lib/source-map/base64.js
rename to lib/base64.js
diff --git a/lib/source-map/binary-search.js b/lib/binary-search.js
similarity index 100%
rename from lib/source-map/binary-search.js
rename to lib/binary-search.js
diff --git a/lib/source-map/mapping-list.js b/lib/mapping-list.js
similarity index 100%
rename from lib/source-map/mapping-list.js
rename to lib/mapping-list.js
diff --git a/lib/source-map/quick-sort.js b/lib/quick-sort.js
similarity index 100%
rename from lib/source-map/quick-sort.js
rename to lib/quick-sort.js
diff --git a/lib/source-map/source-map-consumer.js b/lib/source-map-consumer.js
similarity index 100%
rename from lib/source-map/source-map-consumer.js
rename to lib/source-map-consumer.js
diff --git a/lib/source-map/source-map-generator.js b/lib/source-map-generator.js
similarity index 100%
rename from lib/source-map/source-map-generator.js
rename to lib/source-map-generator.js
diff --git a/lib/source-map.js b/lib/source-map.js
deleted file mode 100644
index 121ad241..00000000
--- a/lib/source-map.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-exports.SourceMapGenerator = require('./source-map/source-map-generator').SourceMapGenerator;
-exports.SourceMapConsumer = require('./source-map/source-map-consumer').SourceMapConsumer;
-exports.SourceNode = require('./source-map/source-node').SourceNode;
diff --git a/lib/source-map/source-node.js b/lib/source-node.js
similarity index 100%
rename from lib/source-map/source-node.js
rename to lib/source-node.js
diff --git a/lib/source-map/util.js b/lib/util.js
similarity index 100%
rename from lib/source-map/util.js
rename to lib/util.js
diff --git a/package.json b/package.json
index c56909ba..5d5b11b2 100644
--- a/package.json
+++ b/package.json
@@ -43,13 +43,10 @@
     "type": "git",
     "url": "http://github.com/mozilla/source-map.git"
   },
-  "directories": {
-    "lib": "./lib"
-  },
-  "main": "./lib/source-map.js",
+  "main": "./source-map.js",
   "files": [
-    "lib/",
-    "build/"
+    "source-map.js",
+    "lib/"
   ],
   "engines": {
     "node": ">=0.10.0"
diff --git a/source-map.js b/source-map.js
new file mode 100644
index 00000000..bc88fe82
--- /dev/null
+++ b/source-map.js
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+exports.SourceMapGenerator = require('./lib/source-map-generator').SourceMapGenerator;
+exports.SourceMapConsumer = require('./lib/source-map-consumer').SourceMapConsumer;
+exports.SourceNode = require('./lib/source-node').SourceNode;
diff --git a/test/run-tests.js b/test/run-tests.js
index 23b92464..fcdaec88 100755
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -43,13 +43,13 @@ function isTestFile(f) {
     : /^test\-.*?\.js/.test(f);
 }
 
-function toModule(f) {
-  return './source-map/' + f.replace(/\.js$/, '');
+function toRelativeModule(f) {
+  return './' + f.replace(/\.js$/, '');
 }
 
-var requires = fs.readdirSync(path.join(__dirname, 'source-map'))
+var requires = fs.readdirSync(__dirname)
   .filter(isTestFile)
-  .map(toModule);
+  .map(toRelativeModule);
 
 var code = run(requires.map(require).map(function (mod, i) {
   return {
diff --git a/test/source-map/test-api.js b/test/test-api.js
similarity index 90%
rename from test/source-map/test-api.js
rename to test/test-api.js
index 4ff76e9b..4c7c160c 100644
--- a/test/source-map/test-api.js
+++ b/test/test-api.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var sourceMap = require('../../lib/source-map');
+  var sourceMap = require('../source-map');
 
   exports['test that the api is properly exposed in the top level'] = function (assert) {
     assert.equal(typeof sourceMap.SourceMapGenerator, "function");
diff --git a/test/source-map/test-array-set.js b/test/test-array-set.js
similarity index 98%
rename from test/source-map/test-array-set.js
rename to test/test-array-set.js
index b28ef707..f5ca3339 100644
--- a/test/source-map/test-array-set.js
+++ b/test/test-array-set.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var ArraySet = require('../../lib/source-map/array-set').ArraySet;
+  var ArraySet = require('../lib/array-set').ArraySet;
 
   function makeTestSet() {
     var set = new ArraySet();
diff --git a/test/source-map/test-base64-vlq.js b/test/test-base64-vlq.js
similarity index 89%
rename from test/source-map/test-base64-vlq.js
rename to test/test-base64-vlq.js
index 1163f62e..5e174018 100644
--- a/test/source-map/test-base64-vlq.js
+++ b/test/test-base64-vlq.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var base64VLQ = require('../../lib/source-map/base64-vlq');
+  var base64VLQ = require('../lib/base64-vlq');
 
   exports['test normal encoding and decoding'] = function (assert) {
     var result = {};
diff --git a/test/source-map/test-base64.js b/test/test-base64.js
similarity index 92%
rename from test/source-map/test-base64.js
rename to test/test-base64.js
index 0d7de98c..054e74eb 100644
--- a/test/source-map/test-base64.js
+++ b/test/test-base64.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var base64 = require('../../lib/source-map/base64');
+  var base64 = require('../lib/base64');
 
   exports['test out of range encoding'] = function (assert) {
     assert.throws(function () {
diff --git a/test/source-map/test-binary-search.js b/test/test-binary-search.js
similarity index 97%
rename from test/source-map/test-binary-search.js
rename to test/test-binary-search.js
index 921669f1..6b88bf98 100644
--- a/test/source-map/test-binary-search.js
+++ b/test/test-binary-search.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var binarySearch = require('../../lib/source-map/binary-search');
+  var binarySearch = require('../lib/binary-search');
 
   function numberCompare(a, b) {
     return a - b;
diff --git a/test/source-map/test-dog-fooding.js b/test/test-dog-fooding.js
similarity index 96%
rename from test/source-map/test-dog-fooding.js
rename to test/test-dog-fooding.js
index 17f82bbd..840e0a00 100644
--- a/test/source-map/test-dog-fooding.js
+++ b/test/test-dog-fooding.js
@@ -6,8 +6,8 @@
  */
 {
   var util = require("./util");
-  var SourceMapConsumer = require('../../lib/source-map/source-map-consumer').SourceMapConsumer;
-  var SourceMapGenerator = require('../../lib/source-map/source-map-generator').SourceMapGenerator;
+  var SourceMapConsumer = require('../lib/source-map-consumer').SourceMapConsumer;
+  var SourceMapGenerator = require('../lib/source-map-generator').SourceMapGenerator;
 
   exports['test eating our own dog food'] = function (assert) {
     var smg = new SourceMapGenerator({
diff --git a/test/source-map/test-quick-sort.js b/test/test-quick-sort.js
similarity index 94%
rename from test/source-map/test-quick-sort.js
rename to test/test-quick-sort.js
index 79aaa037..4db5e3d4 100644
--- a/test/source-map/test-quick-sort.js
+++ b/test/test-quick-sort.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var quickSort = require('../../lib/source-map/quick-sort').quickSort;
+  var quickSort = require('../lib/quick-sort').quickSort;
 
   function numberCompare(a, b) {
     return a - b;
diff --git a/test/source-map/test-source-map-consumer.js b/test/test-source-map-consumer.js
similarity index 98%
rename from test/source-map/test-source-map-consumer.js
rename to test/test-source-map-consumer.js
index f196b92c..dd99cb9c 100644
--- a/test/source-map/test-source-map-consumer.js
+++ b/test/test-source-map-consumer.js
@@ -6,10 +6,10 @@
  */
 {
   var util = require("./util");
-  var SourceMapConsumer = require('../../lib/source-map/source-map-consumer').SourceMapConsumer;
-  var IndexedSourceMapConsumer = require('../../lib/source-map/source-map-consumer').IndexedSourceMapConsumer;
-  var BasicSourceMapConsumer = require('../../lib/source-map/source-map-consumer').BasicSourceMapConsumer;
-  var SourceMapGenerator = require('../../lib/source-map/source-map-generator').SourceMapGenerator;
+  var SourceMapConsumer = require('../lib/source-map-consumer').SourceMapConsumer;
+  var IndexedSourceMapConsumer = require('../lib/source-map-consumer').IndexedSourceMapConsumer;
+  var BasicSourceMapConsumer = require('../lib/source-map-consumer').BasicSourceMapConsumer;
+  var SourceMapGenerator = require('../lib/source-map-generator').SourceMapGenerator;
 
   exports['test that we can instantiate with a string or an object'] = function (assert) {
     assert.doesNotThrow(function () {
diff --git a/test/source-map/test-source-map-generator.js b/test/test-source-map-generator.js
similarity index 98%
rename from test/source-map/test-source-map-generator.js
rename to test/test-source-map-generator.js
index 0fbdcf37..9345ebc0 100644
--- a/test/source-map/test-source-map-generator.js
+++ b/test/test-source-map-generator.js
@@ -5,9 +5,9 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var SourceMapGenerator = require('../../lib/source-map/source-map-generator').SourceMapGenerator;
-  var SourceMapConsumer = require('../../lib/source-map/source-map-consumer').SourceMapConsumer;
-  var SourceNode = require('../../lib/source-map/source-node').SourceNode;
+  var SourceMapGenerator = require('../lib/source-map-generator').SourceMapGenerator;
+  var SourceMapConsumer = require('../lib/source-map-consumer').SourceMapConsumer;
+  var SourceNode = require('../lib/source-node').SourceNode;
   var util = require('./util');
 
   exports['test some simple stuff'] = function (assert) {
diff --git a/test/source-map/test-source-node.js b/test/test-source-node.js
similarity index 98%
rename from test/source-map/test-source-node.js
rename to test/test-source-node.js
index 70b98f96..7d210363 100644
--- a/test/source-map/test-source-node.js
+++ b/test/test-source-node.js
@@ -6,9 +6,9 @@
  */
 {
   var util = require("./util");
-  var SourceMapGenerator = require('../../lib/source-map/source-map-generator').SourceMapGenerator;
-  var SourceMapConsumer = require('../../lib/source-map/source-map-consumer').SourceMapConsumer;
-  var SourceNode = require('../../lib/source-map/source-node').SourceNode;
+  var SourceMapGenerator = require('../lib/source-map-generator').SourceMapGenerator;
+  var SourceMapConsumer = require('../lib/source-map-consumer').SourceMapConsumer;
+  var SourceNode = require('../lib/source-node').SourceNode;
 
   function forEachNewline(fn) {
     return function (assert) {
diff --git a/test/source-map/test-util.js b/test/test-util.js
similarity index 99%
rename from test/source-map/test-util.js
rename to test/test-util.js
index c1b465f6..0549f7ba 100644
--- a/test/source-map/test-util.js
+++ b/test/test-util.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var libUtil = require('../../lib/source-map/util');
+  var libUtil = require('../lib/util');
 
   exports['test urls'] = function (assert) {
     var assertUrl = function (url) {
diff --git a/test/source-map/util.js b/test/util.js
similarity index 99%
rename from test/source-map/util.js
rename to test/util.js
index 4c47555b..70e0ddb3 100644
--- a/test/source-map/util.js
+++ b/test/util.js
@@ -5,7 +5,7 @@
  * http://opensource.org/licenses/BSD-3-Clause
  */
 {
-  var util = require('../../lib/source-map/util');
+  var util = require('../lib/util');
 
   // This is a test mapping which maps functions from two different files
   // (one.js and two.js) to a minified generated source.
diff --git a/webpack.config.js b/webpack.config.js
index f66da805..46aa48db 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -9,7 +9,7 @@ var distDir = path.join(__dirname, "dist");
 module.exports = [
   // Plain build.
   {
-    entry: "./lib/source-map.js",
+    entry: "./source-map.js",
     output: {
       path: distDir,
       filename: "source-map.js",
@@ -20,7 +20,7 @@ module.exports = [
 
   // Debug build.
   {
-    entry: "./lib/source-map.js",
+    entry: "./source-map.js",
     output: {
       path: distDir,
       filename: "source-map.debug.js",
@@ -32,7 +32,7 @@ module.exports = [
 
   // Minified build.
   {
-    entry: "./lib/source-map.js",
+    entry: "./source-map.js",
     output: {
       path: distDir,
       filename: "source-map.min.js",
@@ -56,7 +56,7 @@ function isTestFile(file) {
   return testFileRegex.test(file);
 }
 
-var testsDir = path.join(__dirname, "test", "source-map");
+var testsDir = path.join(__dirname, "test");
 var testFiles = fs.readdirSync(testsDir).filter(isTestFile);
 
 // The xpcshell test harness expects a run_test function. Define this function