From e50b7ef686e865cc8b6bb7caa5e05292de4148a6 Mon Sep 17 00:00:00 2001
From: Patrick Mueller <pmuellr@apache.org>
Date: Thu, 22 Mar 2012 16:28:17 -0400
Subject: [PATCH] [CB-280] Improve layout of cordova-js scripts

https://issues.apache.org/jira/browse/CB-280

This was basically a refactoring of the lib subdirectories,
without changing any of the code IN the lib subdirectories.

Other changes:

- build/packager.js

modified to build based on the new lib subdirectories

- Jakefile

modified to call a new method in build/packager

- README.md

updated file/directory locations

- test/runner.js

changed the runner to run off a new 'test' platform,
instead of using an on-the-fly platform it pieced
together when the tests run.

also changed the static() URL bits for the
browser-based test - it was pulling in more
than it needed

- test/suite.html

changed the urls of the jasmine files, based
on the updates to the static() URL bits in the
runner.js
-
- lib/common/exec.js
- lib/common/platform.js

stub files that will be replaced with platform-specific
ones
---
 Jakefile                                      |  13 +-
 README.md                                     |  72 +++--
 build/packager.js                             | 279 ++++++++++--------
 lib/{exec/android.js => android/exec.js}      |   0
 .../android.js => android/platform.js}        |   0
 lib/{ => android}/plugin/android/app.js       |   0
 lib/{ => android}/plugin/android/callback.js  |   0
 lib/{ => android}/plugin/android/device.js    |   0
 lib/{ => android}/plugin/android/polling.js   |   0
 lib/{ => android}/plugin/android/storage.js   |   0
 .../blackberry.js => blackberry/exec.js}      |   0
 .../blackberry.js => blackberry/platform.js}  |   0
 .../plugin/blackberry/Contact.js              |   0
 .../plugin/blackberry/ContactUtils.js         |   0
 .../plugin/blackberry/DirectoryEntry.js       |   0
 .../plugin/blackberry/Entry.js                |   0
 lib/{ => blackberry}/plugin/blackberry/app.js |   0
 .../plugin/blackberry/contacts.js             |   0
 .../plugin/blackberry/device.js               |   0
 .../plugin/blackberry/manager.js              |   0
 .../plugin/blackberry/notification.js         |   0
 lib/{ => common}/builder.js                   |   0
 lib/{ => common}/channel.js                   |   0
 lib/{platform => common}/common.js            |   0
 lib/common/exec.js                            |   1 +
 lib/common/platform.js                        |   1 +
 lib/{ => common}/plugin/Acceleration.js       |   0
 lib/{ => common}/plugin/Camera.js             |   0
 lib/{ => common}/plugin/CameraConstants.js    |   0
 .../plugin/CaptureAudioOptions.js             |   0
 lib/{ => common}/plugin/CaptureError.js       |   0
 .../plugin/CaptureImageOptions.js             |   0
 .../plugin/CaptureVideoOptions.js             |   0
 lib/{ => common}/plugin/CompassError.js       |   0
 lib/{ => common}/plugin/CompassHeading.js     |   0
 lib/{ => common}/plugin/ConfigurationData.js  |   0
 lib/{ => common}/plugin/Connection.js         |   0
 lib/{ => common}/plugin/Contact.js            |   0
 lib/{ => common}/plugin/ContactAddress.js     |   0
 lib/{ => common}/plugin/ContactError.js       |   0
 lib/{ => common}/plugin/ContactField.js       |   0
 lib/{ => common}/plugin/ContactFindOptions.js |   0
 lib/{ => common}/plugin/ContactName.js        |   0
 .../plugin/ContactOrganization.js             |   0
 lib/{ => common}/plugin/Coordinates.js        |   0
 lib/{ => common}/plugin/DirectoryEntry.js     |   0
 lib/{ => common}/plugin/DirectoryReader.js    |   0
 lib/{ => common}/plugin/Entry.js              |   0
 lib/{ => common}/plugin/File.js               |   0
 lib/{ => common}/plugin/FileEntry.js          |   0
 lib/{ => common}/plugin/FileError.js          |   0
 lib/{ => common}/plugin/FileReader.js         |   0
 lib/{ => common}/plugin/FileSystem.js         |   0
 lib/{ => common}/plugin/FileTransfer.js       |   0
 lib/{ => common}/plugin/FileTransferError.js  |   0
 lib/{ => common}/plugin/FileUploadOptions.js  |   0
 lib/{ => common}/plugin/FileUploadResult.js   |   0
 lib/{ => common}/plugin/FileWriter.js         |   0
 lib/{ => common}/plugin/Flags.js              |   0
 lib/{ => common}/plugin/LocalFileSystem.js    |   0
 lib/{ => common}/plugin/Media.js              |   0
 lib/{ => common}/plugin/MediaError.js         |   0
 lib/{ => common}/plugin/MediaFile.js          |   0
 lib/{ => common}/plugin/MediaFileData.js      |   0
 lib/{ => common}/plugin/Metadata.js           |   0
 lib/{ => common}/plugin/Position.js           |   0
 lib/{ => common}/plugin/PositionError.js      |   0
 lib/{ => common}/plugin/ProgressEvent.js      |   0
 lib/{ => common}/plugin/accelerometer.js      |   0
 lib/{ => common}/plugin/battery.js            |   0
 lib/{ => common}/plugin/capture.js            |   0
 lib/{ => common}/plugin/compass.js            |   0
 lib/{ => common}/plugin/contacts.js           |   0
 lib/{ => common}/plugin/geolocation.js        |   0
 lib/{ => common}/plugin/network.js            |   0
 lib/{ => common}/plugin/notification.js       |   0
 lib/{ => common}/plugin/requestFileSystem.js  |   0
 .../plugin/resolveLocalFileSystemURI.js       |   0
 lib/{ => common}/utils.js                     |   0
 lib/{exec/errgen.js => errgen/exec.js}        |   0
 .../errgen.js => errgen/platform.js}          |   0
 lib/{ => errgen}/plugin/errgen/device.js      |   0
 lib/{exec/ios.js => ios/exec.js}              |   0
 lib/{platform/ios.js => ios/platform.js}      |   0
 lib/{ => ios}/plugin/ios/Entry.js             |   0
 lib/{ => ios}/plugin/ios/FileReader.js        |   0
 lib/{ => ios}/plugin/ios/console.js           |   0
 lib/{ => ios}/plugin/ios/device.js            |   0
 lib/{ => ios}/plugin/ios/nativecomm.js        |   0
 lib/{ => ios}/plugin/ios/notification.js      |   0
 lib/{exec/playbook.js => playbook/exec.js}    |   0
 .../playbook.js => playbook/platform.js}      |   0
 lib/{ => playbook}/plugin/playbook/device.js  |   0
 lib/{ => playbook}/plugin/playbook/manager.js |   0
 .../errgen.js => scripts/bootstrap-errgen.js} |   0
 .../bootstrap-playbook.js}                    |   0
 lib/{ => scripts}/bootstrap.js                |   0
 lib/{ => scripts}/require.js                  |   0
 lib/{exec/test.js => test/exec.js}            |   0
 lib/{ => webworks}/plugin/webworks/manager.js |   0
 lib/{exec/wp7.js => wp7/exec.js}              |   0
 lib/{platform/wp7.js => wp7/platform.js}      |   0
 lib/{ => wp7}/plugin/wp7/device.js            |   0
 test/runner.js                                |  25 +-
 test/suite.html                               |   8 +-
 105 files changed, 236 insertions(+), 163 deletions(-)
 rename lib/{exec/android.js => android/exec.js} (100%)
 rename lib/{platform/android.js => android/platform.js} (100%)
 rename lib/{ => android}/plugin/android/app.js (100%)
 rename lib/{ => android}/plugin/android/callback.js (100%)
 rename lib/{ => android}/plugin/android/device.js (100%)
 rename lib/{ => android}/plugin/android/polling.js (100%)
 rename lib/{ => android}/plugin/android/storage.js (100%)
 rename lib/{exec/blackberry.js => blackberry/exec.js} (100%)
 rename lib/{platform/blackberry.js => blackberry/platform.js} (100%)
 rename lib/{ => blackberry}/plugin/blackberry/Contact.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/ContactUtils.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/DirectoryEntry.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/Entry.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/app.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/contacts.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/device.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/manager.js (100%)
 rename lib/{ => blackberry}/plugin/blackberry/notification.js (100%)
 rename lib/{ => common}/builder.js (100%)
 rename lib/{ => common}/channel.js (100%)
 rename lib/{platform => common}/common.js (100%)
 create mode 100644 lib/common/exec.js
 create mode 100644 lib/common/platform.js
 rename lib/{ => common}/plugin/Acceleration.js (100%)
 rename lib/{ => common}/plugin/Camera.js (100%)
 rename lib/{ => common}/plugin/CameraConstants.js (100%)
 rename lib/{ => common}/plugin/CaptureAudioOptions.js (100%)
 rename lib/{ => common}/plugin/CaptureError.js (100%)
 rename lib/{ => common}/plugin/CaptureImageOptions.js (100%)
 rename lib/{ => common}/plugin/CaptureVideoOptions.js (100%)
 rename lib/{ => common}/plugin/CompassError.js (100%)
 rename lib/{ => common}/plugin/CompassHeading.js (100%)
 rename lib/{ => common}/plugin/ConfigurationData.js (100%)
 rename lib/{ => common}/plugin/Connection.js (100%)
 rename lib/{ => common}/plugin/Contact.js (100%)
 rename lib/{ => common}/plugin/ContactAddress.js (100%)
 rename lib/{ => common}/plugin/ContactError.js (100%)
 rename lib/{ => common}/plugin/ContactField.js (100%)
 rename lib/{ => common}/plugin/ContactFindOptions.js (100%)
 rename lib/{ => common}/plugin/ContactName.js (100%)
 rename lib/{ => common}/plugin/ContactOrganization.js (100%)
 rename lib/{ => common}/plugin/Coordinates.js (100%)
 rename lib/{ => common}/plugin/DirectoryEntry.js (100%)
 rename lib/{ => common}/plugin/DirectoryReader.js (100%)
 rename lib/{ => common}/plugin/Entry.js (100%)
 rename lib/{ => common}/plugin/File.js (100%)
 rename lib/{ => common}/plugin/FileEntry.js (100%)
 rename lib/{ => common}/plugin/FileError.js (100%)
 rename lib/{ => common}/plugin/FileReader.js (100%)
 rename lib/{ => common}/plugin/FileSystem.js (100%)
 rename lib/{ => common}/plugin/FileTransfer.js (100%)
 rename lib/{ => common}/plugin/FileTransferError.js (100%)
 rename lib/{ => common}/plugin/FileUploadOptions.js (100%)
 rename lib/{ => common}/plugin/FileUploadResult.js (100%)
 rename lib/{ => common}/plugin/FileWriter.js (100%)
 rename lib/{ => common}/plugin/Flags.js (100%)
 rename lib/{ => common}/plugin/LocalFileSystem.js (100%)
 rename lib/{ => common}/plugin/Media.js (100%)
 rename lib/{ => common}/plugin/MediaError.js (100%)
 rename lib/{ => common}/plugin/MediaFile.js (100%)
 rename lib/{ => common}/plugin/MediaFileData.js (100%)
 rename lib/{ => common}/plugin/Metadata.js (100%)
 rename lib/{ => common}/plugin/Position.js (100%)
 rename lib/{ => common}/plugin/PositionError.js (100%)
 rename lib/{ => common}/plugin/ProgressEvent.js (100%)
 rename lib/{ => common}/plugin/accelerometer.js (100%)
 rename lib/{ => common}/plugin/battery.js (100%)
 rename lib/{ => common}/plugin/capture.js (100%)
 rename lib/{ => common}/plugin/compass.js (100%)
 rename lib/{ => common}/plugin/contacts.js (100%)
 rename lib/{ => common}/plugin/geolocation.js (100%)
 rename lib/{ => common}/plugin/network.js (100%)
 rename lib/{ => common}/plugin/notification.js (100%)
 rename lib/{ => common}/plugin/requestFileSystem.js (100%)
 rename lib/{ => common}/plugin/resolveLocalFileSystemURI.js (100%)
 rename lib/{ => common}/utils.js (100%)
 rename lib/{exec/errgen.js => errgen/exec.js} (100%)
 rename lib/{platform/errgen.js => errgen/platform.js} (100%)
 rename lib/{ => errgen}/plugin/errgen/device.js (100%)
 rename lib/{exec/ios.js => ios/exec.js} (100%)
 rename lib/{platform/ios.js => ios/platform.js} (100%)
 rename lib/{ => ios}/plugin/ios/Entry.js (100%)
 rename lib/{ => ios}/plugin/ios/FileReader.js (100%)
 rename lib/{ => ios}/plugin/ios/console.js (100%)
 rename lib/{ => ios}/plugin/ios/device.js (100%)
 rename lib/{ => ios}/plugin/ios/nativecomm.js (100%)
 rename lib/{ => ios}/plugin/ios/notification.js (100%)
 rename lib/{exec/playbook.js => playbook/exec.js} (100%)
 rename lib/{platform/playbook.js => playbook/platform.js} (100%)
 rename lib/{ => playbook}/plugin/playbook/device.js (100%)
 rename lib/{ => playbook}/plugin/playbook/manager.js (100%)
 rename lib/{bootstrap/errgen.js => scripts/bootstrap-errgen.js} (100%)
 rename lib/{bootstrap/playbook.js => scripts/bootstrap-playbook.js} (100%)
 rename lib/{ => scripts}/bootstrap.js (100%)
 rename lib/{ => scripts}/require.js (100%)
 rename lib/{exec/test.js => test/exec.js} (100%)
 rename lib/{ => webworks}/plugin/webworks/manager.js (100%)
 rename lib/{exec/wp7.js => wp7/exec.js} (100%)
 rename lib/{platform/wp7.js => wp7/platform.js} (100%)
 rename lib/{ => wp7}/plugin/wp7/device.js (100%)

diff --git a/Jakefile b/Jakefile
index af05af69..f8cd07aa 100644
--- a/Jakefile
+++ b/Jakefile
@@ -22,12 +22,13 @@ task('build', ['clean'], function () {
 
     var packager = require("./build/packager");
 
-    packager.write("blackberry");
-    packager.write("playbook");
-    packager.write("ios");
-    packager.write("wp7");
-    packager.write("android");
-    packager.write("errgen");
+    packager.generate("blackberry");
+    packager.generate("playbook");
+    packager.generate("ios");
+    packager.generate("wp7");
+    packager.generate("android");
+    packager.generate("errgen");
+    packager.generate("test");
 
 });
 
diff --git a/README.md b/README.md
index 5dd4e92a..b8ca0dcb 100644
--- a/README.md
+++ b/README.md
@@ -5,45 +5,57 @@ A unified JavaScript layer for [Apache Cordova](http://incubator.apache.org/proj
     cordova-js
       |
       |-build/
-      | Will contain any build modules (currently nothing here as it is all hacked
-      | into the JakeFile)
+      | Will contain any build modules (currently nothing here as it is all
+      | hacked into the JakeFile)
       |
       |-lib
-      |  |-bootstrap.js
-      |  | Code to bootstrap the Cordova platform, inject APIs and fire events
-      |  |
-      |  |-builder.js
-      |  | Injects in our classes onto window and navigator (or wherever else is needed)
-      |  |
-      |  |-channel.js
-      |  | A pub/sub implementation to handle custom framework events 
-      |  |
       |  |-cordova.js
       |  | Common Cordova stuff such as callback handling and
       |  | window/document add/removeEventListener hijacking 
       |  | 
-      |  |-require.js
-      |  | Our own module definition and require implementation. 
+      |  |-common/
+      |  | Contains the common-across-platforms base modules
+      |  |
+      |  |-common/builder.js
+      |  | Injects in our classes onto window and navigator (or wherever else 
+      |  | is needed)
+      |  |
+      |  |-common/channel.js
+      |  | A pub/sub implementation to handle custom framework events 
       |  |
-      |  |-utils.js
+      |  |-common/common.js
+      |  | Common locations to add Cordova objects to browser globals.
+      |  |
+      |  |-common/exec.js
+      |  | Stub for platform's specific version of exec.js
+      |  |
+      |  |-common/platform.js
+      |  | Stub for platform's specific version of platform.js
+      |  |
+      |  |-common/utils.js
       |  | General purpose JS utility stuff: closures, uuids, object
       |  | cloning, extending prototypes
       |  |
-      |  |-exec/
-      |  | Contains the platform specific definitions of the exec method
+      |  |-common/plugin
+      |  | Contains the common-across-platforms plugin modules
       |  |
-      |  |-platform/
-      |  | Definitions of each platform that help us describe where
-      |  | and what to put on the window object, and what to run to
-      |  | initialize the platform. A common set of globals are also
-      |  | defined (common.js)
+      |  |-scripts/
+      |  | Contains non-module JavaScript source that gets added to the
+      |  | resulting cordova.<platform>.js files closures, uuids, object
+      |  |
+      |  |-scripts/bootstrap.js
+      |  | Code to bootstrap the Cordova platform, inject APIs and fire events
       |  |
-      |  |-plugin/
-      |  |  | All API definitions as plugins, ones common to all
-      |  |  | platforms reside at the top level...
-      |  |  `-<platform>
-      |  |    ... and platform-specific ones reside in their respective
-      |  |    folders
+      |  |-scripts/require.js
+      |  | Our own module definition and require implementation. 
+      |  |
+      |  |-<platform>/
+      |  | Contains the platform-specific base modules.
+      |  |
+      |  |-<platform>/plugin
+      |  | Contains the platform-specific plugin modules.
+
+The way the resulting `cordova.<platform>.js` files will be built is by combining the scripts in the `lib/scripts` directory with modules from the `lib/common` and `lib/<platform>` directories.  For cases where there is the same named module in `lib/common` and `lib/<platform>`, the `lib/<platform>` version wins.  For instance, every `lib/<platform>` includes an `exec.js`, and there is also a version in `lib/common`, so the `lib/<platform>` version will always be used.  In fact, the `lib/common` one will throw errors, so if you build a new platform and forget `exec.js`, the resulting `cordova.<platform>.js` file will also throw errors.
 
 # Building
 
@@ -77,13 +89,13 @@ This will run the `build` and `test` tasks by default. All of the available task
 
 The `build/packager.js` tool is a node.js script that concatenates all of the core Cordova plugins in this repository into a `cordova.<platform>.js` file under the `pkg/` folder. It also wraps the plugins with a RequireJS-compatible module syntax that works in both browser and node environments. We end up with a cordova.js file that wraps each Cordova plugin into its own module.
 
-Cordova defines a `channel` module under `lib/channel.js`, which is a publish/subscribe implementation that the project uses for event management.
+Cordova defines a `channel` module under `lib/common/channel.js`, which is a publish/subscribe implementation that the project uses for event management.
 
-The Cordova native-to-webview bridge is initialized in `lib/bootstrap.js`. This file attaches the `boot` function to the `channel.onNativeReady` event - fired by native with a call to:
+The Cordova native-to-webview bridge is initialized in `lib/scripts/bootstrap.js`. This file attaches the `boot` function to the `channel.onNativeReady` event - fired by native with a call to:
 
     cordova.require('cordova/channel).onNativeReady.fire()
 
-The `boot` method does all the work.  First, it grabs the common platform definition (under `lib/platform/common.js`) and injects all of the objects defined there onto `window` and other global namespaces. Next, it grabs all of the platform-specific object definitions (as defined under `lib/platform/<platform>.js`) and overrides those onto `window`. Finally, it calls the platform-specific `initialize` function (located in the platform definition). At this point, Cordova is fully initialized and ready to roll. Last thing we do is wait for the `DOMContentLoaded` event to fire to make sure the page has loaded properly. Once that is done, Cordova fires the `deviceready` event where you can safely attach functions that consume the Cordova APIs.
+The `boot` method does all the work.  First, it grabs the common platform definition (under `lib/common/common.js`) and injects all of the objects defined there onto `window` and other global namespaces. Next, it grabs all of the platform-specific object definitions (as defined under `lib/<platform>/platform.js`) and overrides those onto `window`. Finally, it calls the platform-specific `initialize` function (located in the platform definition). At this point, Cordova is fully initialized and ready to roll. Last thing we do is wait for the `DOMContentLoaded` event to fire to make sure the page has loaded properly. Once that is done, Cordova fires the `deviceready` event where you can safely attach functions that consume the Cordova APIs.
 
 # Testing
 
diff --git a/build/packager.js b/build/packager.js
index 39a9704a..65690208 100644
--- a/build/packager.js
+++ b/build/packager.js
@@ -1,135 +1,184 @@
-var util = require('util'),
-    debug = false,
-    fs = require('fs');
-
-// (Recursively) list contents of a directory
-function walk(dir, doRecursive) {
-    var results = [];
-    try {
-        var list = fs.readdirSync(dir);
-        for (var i = 0, l = list.length; i < l; i++) {
-            var file = list[i];
-            file = dir + '/' + file;
-            var stat = fs.statSync(file);
-            if (stat && doRecursive && stat.isDirectory()) {
-                results = results.concat(walk(file,doRecursive));
-            } else {
-                if (list[i] != ".DS_Store") {
-                    results.push(file);
-                }
-            }
-        }
-    } catch (e) {
-        //do nothing
-    }
-    return results;
-}
-
-// Simply inline includes the specified file(s) with an optional transform function.
-function include(files, transform) {
-    files = files.map ? files : [files];
-    return files.map(function (file) {
-        try {
-            var str = fs.readFileSync(file, "utf-8") + "\n";
-            str = transform ? transform(str, file) : str;
-            str = debug ? "try {" + str + "} catch (e) { alert('" + file + ":' + e);}" : str;
-            return str;
-        } catch (e) {
-            //do nothing
-        }
-    }).join('\n');
+var fs    = require('fs')
+var util  = require('util')
+var path  = require('path')
+
+var packager = module.exports
+
+//------------------------------------------------------------------------------
+packager.generate = function(platform) {
+    var time = new Date().valueOf()
+    
+    var libraryRelease = packager.bundle(platform, false)
+    var libraryDebug   = packager.bundle(platform, true)
+    
+    time = new Date().valueOf() - time
+    
+    var outFile
+    
+    outFile = path.join('pkg', 'cordova.' + platform + '.js')
+    fs.writeFileSync(outFile, libraryRelease, 'utf8')
+    
+    outFile = path.join('pkg', 'cordova.' + platform + '-debug.js')
+    fs.writeFileSync(outFile, libraryDebug, 'utf8')
+    
+    console.log('generated platform: ' + platform + ' in ' + time + 'ms')
 }
 
-// Includes the specified file(s) with optional overriding id
-// Wraps the specified file(s) in a define statement which implicitly
-// creates a closure as well.
-function drop(files, id) {
-    return include(files, function(file, path) {
-        var define_id = (typeof id != 'undefined' && id.length > 0 ? id : path.replace(/lib\//, "cordova/").replace(/\.js$/, ''));
-        return "define('" + define_id + "', function(require, exports, module) {\n" + file + "});\n";
-    });
-}
-
-module.exports = {
-    modules: function (platform) {
-        var baseFiles = [
-                "lib/utils.js",
-                "lib/builder.js"
-            ],
-            platformFiles = walk('lib/plugin/' + platform, true),
-            output = "";
-
-        //HACK: ummm .... we really need to figure out this webworks common file stuff
-        if (platform === "blackberry" || platform === "playbook") {
-            platformFiles = platformFiles.concat(walk('lib/plugin/webworks', true));
-        }
-
-        //include all common platform files that are under lib/plugin
-        baseFiles = baseFiles.concat(walk('lib/plugin'));
-
-        //include require
-        output += include("lib/require.js");
-
-        //include channel
-        output += drop('lib/channel.js', 'cordova/channel');
+//------------------------------------------------------------------------------
+packager.bundle = function(platform, debug) {
+    var modules = collectFiles('lib/common')
+    var scripts = collectFiles('lib/scripts')
+    
+    modules[''] = 'lib/cordova.js'
+    
+    if (['playbook', 'blackberry'].indexOf(platform) > -1) {
+        copyProps(modules, collectFiles(path.join('lib', 'webworks')))
+    }
+    
+    copyProps(modules, collectFiles(path.join('lib', platform)))
+
+    var output = []
+
+    // write header     
+    output.push('/*\n' + getContents('LICENSE-for-js-file.txt') + '\n*/')
+    output.push('\n;(function() {\n')
+    
+    // write initial scripts
+    if (!scripts['require']) {
+        throw new Error("didn't find a script for 'require'")
+    }
+    
+    writeScript(output, scripts['require'], debug)
+
+    // write modules
+    var moduleIds = Object.keys(modules)
+    moduleIds.sort()
+    
+    for (var i=0; i<moduleIds.length; i++) {
+        var moduleId = moduleIds[i]
+        
+        writeModule(output, modules[moduleId], moduleId, debug)
+    }
 
-        //include cordova
-        output += drop('lib/cordova.js', 'cordova');
+    output.push("\nwindow.cordova = require('cordova');\n")
 
-        //include exec
-        output += drop('lib/exec/' + platform + '.js', 'cordova/exec');
+    // write final scripts
+    if (!scripts['bootstrap']) {
+        throw new Error("didn't find a script for 'bootstrap'")
+    }
+    
+    writeScript(output, scripts['bootstrap'], debug)
+    
+    var bootstrapPlatform = 'bootstrap-' + platform
+    if (scripts[bootstrapPlatform]) {
+        writeScript(output, scripts[bootstrapPlatform], debug)
+    }
 
-        //include common platform defn 
-        output += drop('lib/platform/common.js', 'cordova/common');
+    // write trailer
+    output.push('\n})();')
 
-        //include platform defn
-        output += drop('lib/platform/' + platform + '.js', 'cordova/platform');
+    return output.join('\n')
+}
 
-        //include common modules
-        output += drop(baseFiles);
+//------------------------------------------------------------------------------
+var CollectedFiles = {}
 
-        //include platform specific modules
-        output += drop(platformFiles);
+function collectFiles(dir, id) {
+    if (!id) id = ''
+    
+    if (CollectedFiles[dir]) {
+        return copyProps({}, CollectedFiles[dir])
+    }
 
-        return output;
-    },
+    var result = {}    
+    
+    var entries = fs.readdirSync(dir)
+    
+    entries = entries.filter(function(entry) {
+        if (entry.match(/\.js$/)) return true
+        
+        var stat = fs.statSync(path.join(dir, entry))
+        if (stat.isDirectory())  return true
+    })
 
-    bundle: function (platform) {
-        console.log("building platform: " + platform);
+    entries.forEach(function(entry) {
+        var moduleId = path.join(id,  entry)
+        var fileName = path.join(dir, entry)
         
-        var output = "";
+        var stat = fs.statSync(fileName)
+        if (stat.isDirectory()) {
+            copyProps(result, collectFiles(fileName, moduleId))
+        }
+        else {
+            moduleId         = getModuleId(moduleId)
+            result[moduleId] = fileName
+        }
+    })
+    
+    CollectedFiles[dir] = result
+    
+    return copyProps({}, result)
+}
 
-        //include LICENSE
-        output += include("LICENSE-for-js-file.txt", function (file) {
-            return "/*\n" + file + "*/\n";
-        });
+//------------------------------------------------------------------------------
+function writeScript(oFile, fileName, debug) {
+    var contents = getContents(fileName, 'utf8')
+    
+    writeContents(oFile, fileName, contents, debug)    
+}
 
-        // wrap the entire thing in one more closure
-        // closure closure closure
-        output += "(function() {\n";
+//------------------------------------------------------------------------------
+function writeModule(oFile, fileName, moduleId, debug) {
+    var contents = '\n' + getContents(fileName, 'utf8') + '\n'
+    
+    moduleId = path.join('cordova', moduleId)
+    
+    var signature = 'function(require, exports, module)'
+    
+    contents = 'define("' + moduleId + '", ' + signature + ' {' + contents + '})\n'
+
+    writeContents(oFile, fileName, contents, debug)    
+}
 
-        //include modules
-        output += this.modules(platform);
+//------------------------------------------------------------------------------
+var FileContents = {}
 
-        // HACK: this gets done in bootstrap.js anyways, once native side is ready + domcontentloaded is fired.
-        // TODO: Do we need it?
-        output += "window.cordova = require('cordova');\n"; 
+function getContents(file) {
+    if (!FileContents.hasOwnProperty(file)) {
+        FileContents[file] = fs.readFileSync(file, 'utf8')
+    }
+    
+    return FileContents[file]
+}
 
-        //include bootstrap
-        output += include('lib/bootstrap.js');
+//------------------------------------------------------------------------------
+function writeContents(oFile, fileName, contents, debug) {
+    
+    if (debug) {
+        contents += '\n//@ sourceURL=' + fileName
+        
+        contents = 'eval(' + JSON.stringify(contents) + ')'
+    }
+    
+    else {
+        contents = '// file: ' + fileName + '\n' + contents    
+    }
 
-        // TODO/HACK: we don't need platform-specific bootstrap.
-        // those can go into the init function inside the platform/*.js
-        // files
-        output += include('lib/bootstrap/' + platform + '.js');
+    oFile.push(contents)
+}
 
-        // closing the closure har har
-        output += "})();";
+//------------------------------------------------------------------------------
+function getModuleId(fileName) {
+    return fileName.match(/(.*)\.js$/)[1]
+}
 
-        return output;
-    },
-    write: function (platform) {
-        var output = this.bundle(platform);
-        fs.writeFileSync(__dirname + "/../pkg/cordova." + platform + ".js", output);
+//------------------------------------------------------------------------------
+function copyProps(target, source) {
+    for (var key in source) {
+        if (!source.hasOwnProperty(key)) continue
+        
+        target[key] = source[key]
     }
-};
+    
+    return target
+}
diff --git a/lib/exec/android.js b/lib/android/exec.js
similarity index 100%
rename from lib/exec/android.js
rename to lib/android/exec.js
diff --git a/lib/platform/android.js b/lib/android/platform.js
similarity index 100%
rename from lib/platform/android.js
rename to lib/android/platform.js
diff --git a/lib/plugin/android/app.js b/lib/android/plugin/android/app.js
similarity index 100%
rename from lib/plugin/android/app.js
rename to lib/android/plugin/android/app.js
diff --git a/lib/plugin/android/callback.js b/lib/android/plugin/android/callback.js
similarity index 100%
rename from lib/plugin/android/callback.js
rename to lib/android/plugin/android/callback.js
diff --git a/lib/plugin/android/device.js b/lib/android/plugin/android/device.js
similarity index 100%
rename from lib/plugin/android/device.js
rename to lib/android/plugin/android/device.js
diff --git a/lib/plugin/android/polling.js b/lib/android/plugin/android/polling.js
similarity index 100%
rename from lib/plugin/android/polling.js
rename to lib/android/plugin/android/polling.js
diff --git a/lib/plugin/android/storage.js b/lib/android/plugin/android/storage.js
similarity index 100%
rename from lib/plugin/android/storage.js
rename to lib/android/plugin/android/storage.js
diff --git a/lib/exec/blackberry.js b/lib/blackberry/exec.js
similarity index 100%
rename from lib/exec/blackberry.js
rename to lib/blackberry/exec.js
diff --git a/lib/platform/blackberry.js b/lib/blackberry/platform.js
similarity index 100%
rename from lib/platform/blackberry.js
rename to lib/blackberry/platform.js
diff --git a/lib/plugin/blackberry/Contact.js b/lib/blackberry/plugin/blackberry/Contact.js
similarity index 100%
rename from lib/plugin/blackberry/Contact.js
rename to lib/blackberry/plugin/blackberry/Contact.js
diff --git a/lib/plugin/blackberry/ContactUtils.js b/lib/blackberry/plugin/blackberry/ContactUtils.js
similarity index 100%
rename from lib/plugin/blackberry/ContactUtils.js
rename to lib/blackberry/plugin/blackberry/ContactUtils.js
diff --git a/lib/plugin/blackberry/DirectoryEntry.js b/lib/blackberry/plugin/blackberry/DirectoryEntry.js
similarity index 100%
rename from lib/plugin/blackberry/DirectoryEntry.js
rename to lib/blackberry/plugin/blackberry/DirectoryEntry.js
diff --git a/lib/plugin/blackberry/Entry.js b/lib/blackberry/plugin/blackberry/Entry.js
similarity index 100%
rename from lib/plugin/blackberry/Entry.js
rename to lib/blackberry/plugin/blackberry/Entry.js
diff --git a/lib/plugin/blackberry/app.js b/lib/blackberry/plugin/blackberry/app.js
similarity index 100%
rename from lib/plugin/blackberry/app.js
rename to lib/blackberry/plugin/blackberry/app.js
diff --git a/lib/plugin/blackberry/contacts.js b/lib/blackberry/plugin/blackberry/contacts.js
similarity index 100%
rename from lib/plugin/blackberry/contacts.js
rename to lib/blackberry/plugin/blackberry/contacts.js
diff --git a/lib/plugin/blackberry/device.js b/lib/blackberry/plugin/blackberry/device.js
similarity index 100%
rename from lib/plugin/blackberry/device.js
rename to lib/blackberry/plugin/blackberry/device.js
diff --git a/lib/plugin/blackberry/manager.js b/lib/blackberry/plugin/blackberry/manager.js
similarity index 100%
rename from lib/plugin/blackberry/manager.js
rename to lib/blackberry/plugin/blackberry/manager.js
diff --git a/lib/plugin/blackberry/notification.js b/lib/blackberry/plugin/blackberry/notification.js
similarity index 100%
rename from lib/plugin/blackberry/notification.js
rename to lib/blackberry/plugin/blackberry/notification.js
diff --git a/lib/builder.js b/lib/common/builder.js
similarity index 100%
rename from lib/builder.js
rename to lib/common/builder.js
diff --git a/lib/channel.js b/lib/common/channel.js
similarity index 100%
rename from lib/channel.js
rename to lib/common/channel.js
diff --git a/lib/platform/common.js b/lib/common/common.js
similarity index 100%
rename from lib/platform/common.js
rename to lib/common/common.js
diff --git a/lib/common/exec.js b/lib/common/exec.js
new file mode 100644
index 00000000..b236903d
--- /dev/null
+++ b/lib/common/exec.js
@@ -0,0 +1 @@
+throw new Error('should have been replaced at build time with platform implementation')
diff --git a/lib/common/platform.js b/lib/common/platform.js
new file mode 100644
index 00000000..b236903d
--- /dev/null
+++ b/lib/common/platform.js
@@ -0,0 +1 @@
+throw new Error('should have been replaced at build time with platform implementation')
diff --git a/lib/plugin/Acceleration.js b/lib/common/plugin/Acceleration.js
similarity index 100%
rename from lib/plugin/Acceleration.js
rename to lib/common/plugin/Acceleration.js
diff --git a/lib/plugin/Camera.js b/lib/common/plugin/Camera.js
similarity index 100%
rename from lib/plugin/Camera.js
rename to lib/common/plugin/Camera.js
diff --git a/lib/plugin/CameraConstants.js b/lib/common/plugin/CameraConstants.js
similarity index 100%
rename from lib/plugin/CameraConstants.js
rename to lib/common/plugin/CameraConstants.js
diff --git a/lib/plugin/CaptureAudioOptions.js b/lib/common/plugin/CaptureAudioOptions.js
similarity index 100%
rename from lib/plugin/CaptureAudioOptions.js
rename to lib/common/plugin/CaptureAudioOptions.js
diff --git a/lib/plugin/CaptureError.js b/lib/common/plugin/CaptureError.js
similarity index 100%
rename from lib/plugin/CaptureError.js
rename to lib/common/plugin/CaptureError.js
diff --git a/lib/plugin/CaptureImageOptions.js b/lib/common/plugin/CaptureImageOptions.js
similarity index 100%
rename from lib/plugin/CaptureImageOptions.js
rename to lib/common/plugin/CaptureImageOptions.js
diff --git a/lib/plugin/CaptureVideoOptions.js b/lib/common/plugin/CaptureVideoOptions.js
similarity index 100%
rename from lib/plugin/CaptureVideoOptions.js
rename to lib/common/plugin/CaptureVideoOptions.js
diff --git a/lib/plugin/CompassError.js b/lib/common/plugin/CompassError.js
similarity index 100%
rename from lib/plugin/CompassError.js
rename to lib/common/plugin/CompassError.js
diff --git a/lib/plugin/CompassHeading.js b/lib/common/plugin/CompassHeading.js
similarity index 100%
rename from lib/plugin/CompassHeading.js
rename to lib/common/plugin/CompassHeading.js
diff --git a/lib/plugin/ConfigurationData.js b/lib/common/plugin/ConfigurationData.js
similarity index 100%
rename from lib/plugin/ConfigurationData.js
rename to lib/common/plugin/ConfigurationData.js
diff --git a/lib/plugin/Connection.js b/lib/common/plugin/Connection.js
similarity index 100%
rename from lib/plugin/Connection.js
rename to lib/common/plugin/Connection.js
diff --git a/lib/plugin/Contact.js b/lib/common/plugin/Contact.js
similarity index 100%
rename from lib/plugin/Contact.js
rename to lib/common/plugin/Contact.js
diff --git a/lib/plugin/ContactAddress.js b/lib/common/plugin/ContactAddress.js
similarity index 100%
rename from lib/plugin/ContactAddress.js
rename to lib/common/plugin/ContactAddress.js
diff --git a/lib/plugin/ContactError.js b/lib/common/plugin/ContactError.js
similarity index 100%
rename from lib/plugin/ContactError.js
rename to lib/common/plugin/ContactError.js
diff --git a/lib/plugin/ContactField.js b/lib/common/plugin/ContactField.js
similarity index 100%
rename from lib/plugin/ContactField.js
rename to lib/common/plugin/ContactField.js
diff --git a/lib/plugin/ContactFindOptions.js b/lib/common/plugin/ContactFindOptions.js
similarity index 100%
rename from lib/plugin/ContactFindOptions.js
rename to lib/common/plugin/ContactFindOptions.js
diff --git a/lib/plugin/ContactName.js b/lib/common/plugin/ContactName.js
similarity index 100%
rename from lib/plugin/ContactName.js
rename to lib/common/plugin/ContactName.js
diff --git a/lib/plugin/ContactOrganization.js b/lib/common/plugin/ContactOrganization.js
similarity index 100%
rename from lib/plugin/ContactOrganization.js
rename to lib/common/plugin/ContactOrganization.js
diff --git a/lib/plugin/Coordinates.js b/lib/common/plugin/Coordinates.js
similarity index 100%
rename from lib/plugin/Coordinates.js
rename to lib/common/plugin/Coordinates.js
diff --git a/lib/plugin/DirectoryEntry.js b/lib/common/plugin/DirectoryEntry.js
similarity index 100%
rename from lib/plugin/DirectoryEntry.js
rename to lib/common/plugin/DirectoryEntry.js
diff --git a/lib/plugin/DirectoryReader.js b/lib/common/plugin/DirectoryReader.js
similarity index 100%
rename from lib/plugin/DirectoryReader.js
rename to lib/common/plugin/DirectoryReader.js
diff --git a/lib/plugin/Entry.js b/lib/common/plugin/Entry.js
similarity index 100%
rename from lib/plugin/Entry.js
rename to lib/common/plugin/Entry.js
diff --git a/lib/plugin/File.js b/lib/common/plugin/File.js
similarity index 100%
rename from lib/plugin/File.js
rename to lib/common/plugin/File.js
diff --git a/lib/plugin/FileEntry.js b/lib/common/plugin/FileEntry.js
similarity index 100%
rename from lib/plugin/FileEntry.js
rename to lib/common/plugin/FileEntry.js
diff --git a/lib/plugin/FileError.js b/lib/common/plugin/FileError.js
similarity index 100%
rename from lib/plugin/FileError.js
rename to lib/common/plugin/FileError.js
diff --git a/lib/plugin/FileReader.js b/lib/common/plugin/FileReader.js
similarity index 100%
rename from lib/plugin/FileReader.js
rename to lib/common/plugin/FileReader.js
diff --git a/lib/plugin/FileSystem.js b/lib/common/plugin/FileSystem.js
similarity index 100%
rename from lib/plugin/FileSystem.js
rename to lib/common/plugin/FileSystem.js
diff --git a/lib/plugin/FileTransfer.js b/lib/common/plugin/FileTransfer.js
similarity index 100%
rename from lib/plugin/FileTransfer.js
rename to lib/common/plugin/FileTransfer.js
diff --git a/lib/plugin/FileTransferError.js b/lib/common/plugin/FileTransferError.js
similarity index 100%
rename from lib/plugin/FileTransferError.js
rename to lib/common/plugin/FileTransferError.js
diff --git a/lib/plugin/FileUploadOptions.js b/lib/common/plugin/FileUploadOptions.js
similarity index 100%
rename from lib/plugin/FileUploadOptions.js
rename to lib/common/plugin/FileUploadOptions.js
diff --git a/lib/plugin/FileUploadResult.js b/lib/common/plugin/FileUploadResult.js
similarity index 100%
rename from lib/plugin/FileUploadResult.js
rename to lib/common/plugin/FileUploadResult.js
diff --git a/lib/plugin/FileWriter.js b/lib/common/plugin/FileWriter.js
similarity index 100%
rename from lib/plugin/FileWriter.js
rename to lib/common/plugin/FileWriter.js
diff --git a/lib/plugin/Flags.js b/lib/common/plugin/Flags.js
similarity index 100%
rename from lib/plugin/Flags.js
rename to lib/common/plugin/Flags.js
diff --git a/lib/plugin/LocalFileSystem.js b/lib/common/plugin/LocalFileSystem.js
similarity index 100%
rename from lib/plugin/LocalFileSystem.js
rename to lib/common/plugin/LocalFileSystem.js
diff --git a/lib/plugin/Media.js b/lib/common/plugin/Media.js
similarity index 100%
rename from lib/plugin/Media.js
rename to lib/common/plugin/Media.js
diff --git a/lib/plugin/MediaError.js b/lib/common/plugin/MediaError.js
similarity index 100%
rename from lib/plugin/MediaError.js
rename to lib/common/plugin/MediaError.js
diff --git a/lib/plugin/MediaFile.js b/lib/common/plugin/MediaFile.js
similarity index 100%
rename from lib/plugin/MediaFile.js
rename to lib/common/plugin/MediaFile.js
diff --git a/lib/plugin/MediaFileData.js b/lib/common/plugin/MediaFileData.js
similarity index 100%
rename from lib/plugin/MediaFileData.js
rename to lib/common/plugin/MediaFileData.js
diff --git a/lib/plugin/Metadata.js b/lib/common/plugin/Metadata.js
similarity index 100%
rename from lib/plugin/Metadata.js
rename to lib/common/plugin/Metadata.js
diff --git a/lib/plugin/Position.js b/lib/common/plugin/Position.js
similarity index 100%
rename from lib/plugin/Position.js
rename to lib/common/plugin/Position.js
diff --git a/lib/plugin/PositionError.js b/lib/common/plugin/PositionError.js
similarity index 100%
rename from lib/plugin/PositionError.js
rename to lib/common/plugin/PositionError.js
diff --git a/lib/plugin/ProgressEvent.js b/lib/common/plugin/ProgressEvent.js
similarity index 100%
rename from lib/plugin/ProgressEvent.js
rename to lib/common/plugin/ProgressEvent.js
diff --git a/lib/plugin/accelerometer.js b/lib/common/plugin/accelerometer.js
similarity index 100%
rename from lib/plugin/accelerometer.js
rename to lib/common/plugin/accelerometer.js
diff --git a/lib/plugin/battery.js b/lib/common/plugin/battery.js
similarity index 100%
rename from lib/plugin/battery.js
rename to lib/common/plugin/battery.js
diff --git a/lib/plugin/capture.js b/lib/common/plugin/capture.js
similarity index 100%
rename from lib/plugin/capture.js
rename to lib/common/plugin/capture.js
diff --git a/lib/plugin/compass.js b/lib/common/plugin/compass.js
similarity index 100%
rename from lib/plugin/compass.js
rename to lib/common/plugin/compass.js
diff --git a/lib/plugin/contacts.js b/lib/common/plugin/contacts.js
similarity index 100%
rename from lib/plugin/contacts.js
rename to lib/common/plugin/contacts.js
diff --git a/lib/plugin/geolocation.js b/lib/common/plugin/geolocation.js
similarity index 100%
rename from lib/plugin/geolocation.js
rename to lib/common/plugin/geolocation.js
diff --git a/lib/plugin/network.js b/lib/common/plugin/network.js
similarity index 100%
rename from lib/plugin/network.js
rename to lib/common/plugin/network.js
diff --git a/lib/plugin/notification.js b/lib/common/plugin/notification.js
similarity index 100%
rename from lib/plugin/notification.js
rename to lib/common/plugin/notification.js
diff --git a/lib/plugin/requestFileSystem.js b/lib/common/plugin/requestFileSystem.js
similarity index 100%
rename from lib/plugin/requestFileSystem.js
rename to lib/common/plugin/requestFileSystem.js
diff --git a/lib/plugin/resolveLocalFileSystemURI.js b/lib/common/plugin/resolveLocalFileSystemURI.js
similarity index 100%
rename from lib/plugin/resolveLocalFileSystemURI.js
rename to lib/common/plugin/resolveLocalFileSystemURI.js
diff --git a/lib/utils.js b/lib/common/utils.js
similarity index 100%
rename from lib/utils.js
rename to lib/common/utils.js
diff --git a/lib/exec/errgen.js b/lib/errgen/exec.js
similarity index 100%
rename from lib/exec/errgen.js
rename to lib/errgen/exec.js
diff --git a/lib/platform/errgen.js b/lib/errgen/platform.js
similarity index 100%
rename from lib/platform/errgen.js
rename to lib/errgen/platform.js
diff --git a/lib/plugin/errgen/device.js b/lib/errgen/plugin/errgen/device.js
similarity index 100%
rename from lib/plugin/errgen/device.js
rename to lib/errgen/plugin/errgen/device.js
diff --git a/lib/exec/ios.js b/lib/ios/exec.js
similarity index 100%
rename from lib/exec/ios.js
rename to lib/ios/exec.js
diff --git a/lib/platform/ios.js b/lib/ios/platform.js
similarity index 100%
rename from lib/platform/ios.js
rename to lib/ios/platform.js
diff --git a/lib/plugin/ios/Entry.js b/lib/ios/plugin/ios/Entry.js
similarity index 100%
rename from lib/plugin/ios/Entry.js
rename to lib/ios/plugin/ios/Entry.js
diff --git a/lib/plugin/ios/FileReader.js b/lib/ios/plugin/ios/FileReader.js
similarity index 100%
rename from lib/plugin/ios/FileReader.js
rename to lib/ios/plugin/ios/FileReader.js
diff --git a/lib/plugin/ios/console.js b/lib/ios/plugin/ios/console.js
similarity index 100%
rename from lib/plugin/ios/console.js
rename to lib/ios/plugin/ios/console.js
diff --git a/lib/plugin/ios/device.js b/lib/ios/plugin/ios/device.js
similarity index 100%
rename from lib/plugin/ios/device.js
rename to lib/ios/plugin/ios/device.js
diff --git a/lib/plugin/ios/nativecomm.js b/lib/ios/plugin/ios/nativecomm.js
similarity index 100%
rename from lib/plugin/ios/nativecomm.js
rename to lib/ios/plugin/ios/nativecomm.js
diff --git a/lib/plugin/ios/notification.js b/lib/ios/plugin/ios/notification.js
similarity index 100%
rename from lib/plugin/ios/notification.js
rename to lib/ios/plugin/ios/notification.js
diff --git a/lib/exec/playbook.js b/lib/playbook/exec.js
similarity index 100%
rename from lib/exec/playbook.js
rename to lib/playbook/exec.js
diff --git a/lib/platform/playbook.js b/lib/playbook/platform.js
similarity index 100%
rename from lib/platform/playbook.js
rename to lib/playbook/platform.js
diff --git a/lib/plugin/playbook/device.js b/lib/playbook/plugin/playbook/device.js
similarity index 100%
rename from lib/plugin/playbook/device.js
rename to lib/playbook/plugin/playbook/device.js
diff --git a/lib/plugin/playbook/manager.js b/lib/playbook/plugin/playbook/manager.js
similarity index 100%
rename from lib/plugin/playbook/manager.js
rename to lib/playbook/plugin/playbook/manager.js
diff --git a/lib/bootstrap/errgen.js b/lib/scripts/bootstrap-errgen.js
similarity index 100%
rename from lib/bootstrap/errgen.js
rename to lib/scripts/bootstrap-errgen.js
diff --git a/lib/bootstrap/playbook.js b/lib/scripts/bootstrap-playbook.js
similarity index 100%
rename from lib/bootstrap/playbook.js
rename to lib/scripts/bootstrap-playbook.js
diff --git a/lib/bootstrap.js b/lib/scripts/bootstrap.js
similarity index 100%
rename from lib/bootstrap.js
rename to lib/scripts/bootstrap.js
diff --git a/lib/require.js b/lib/scripts/require.js
similarity index 100%
rename from lib/require.js
rename to lib/scripts/require.js
diff --git a/lib/exec/test.js b/lib/test/exec.js
similarity index 100%
rename from lib/exec/test.js
rename to lib/test/exec.js
diff --git a/lib/plugin/webworks/manager.js b/lib/webworks/plugin/webworks/manager.js
similarity index 100%
rename from lib/plugin/webworks/manager.js
rename to lib/webworks/plugin/webworks/manager.js
diff --git a/lib/exec/wp7.js b/lib/wp7/exec.js
similarity index 100%
rename from lib/exec/wp7.js
rename to lib/wp7/exec.js
diff --git a/lib/platform/wp7.js b/lib/wp7/platform.js
similarity index 100%
rename from lib/platform/wp7.js
rename to lib/wp7/platform.js
diff --git a/lib/plugin/wp7/device.js b/lib/wp7/plugin/wp7/device.js
similarity index 100%
rename from lib/plugin/wp7/device.js
rename to lib/wp7/plugin/wp7/device.js
diff --git a/test/runner.js b/test/runner.js
index 5e900679..502a7261 100644
--- a/test/runner.js
+++ b/test/runner.js
@@ -21,8 +21,8 @@ function collect(path, files, matches) {
 
 module.exports = {
     node: function () {
+        console.log('starting node-based tests')
         var jas = require("../thirdparty/jasmine/jasmine"),
-            loader = require('../lib/require'),
             TerminalReporter = require('./reporter').TerminalReporter,
             jsdom, document, window;
 
@@ -41,12 +41,21 @@ module.exports = {
             this[key] = window[key] = global[key] = jas[key];
         });
 
-        //hijack require
-        require = loader.require;
-        define = loader.define;
-
         //load in our modules
-        eval(packager.modules('test'));
+        var testLibName = _path.join(__dirname, '..', 'pkg', 'cordova.test-debug.js')
+        var testLib     = fs.readFileSync(testLibName, 'utf8')
+        try {
+            eval(testLib);
+        }
+        catch (e) {
+            console.log("error eval()ing " + testLibName + ": " + e)
+            console.log(e.stack)
+            throw e
+        }
+
+        //hijack require
+        require = window.cordova.require;
+        define  = window.cordova.define;
 
         //load in our tests
         collect(__dirname, tests);
@@ -65,14 +74,14 @@ module.exports = {
         env.execute();
     },
     browser: function () {
+        console.log('starting browser-based tests')
         var connect = require('connect'),
             html = fs.readFileSync(__dirname + "/suite.html", "utf-8"),
             doc,
             modules,
             specs,
             app = connect(
-                connect.static(__dirname + "/../lib/"),
-                connect.static(__dirname + "/../"),
+                connect.static(_path.join(__dirname, '..', 'thirdparty')),
                 connect.static(__dirname),
                 connect.router(function (app) {
                     app.get('/', function (req, res) {
diff --git a/test/suite.html b/test/suite.html
index ce4e392e..0e8e58bc 100644
--- a/test/suite.html
+++ b/test/suite.html
@@ -3,11 +3,11 @@
 <head>
   <title>EXTERMINATE!</title>
 
-  <link rel="shortcut icon" type="image/png" href="../thirdparty/jasmine/jasmine_favicon.png">
+  <link rel="shortcut icon" type="image/png" href="jasmine/jasmine_favicon.png">
 
-  <link rel="stylesheet" type="text/css" href="../thirdparty/jasmine/jasmine.css">
-  <script type="text/javascript" src="../thirdparty/jasmine/jasmine.js"></script>
-  <script type="text/javascript" src="../thirdparty/jasmine/jasmine-html.js"></script>
+  <link rel="stylesheet" type="text/css" href="jasmine/jasmine.css">
+  <script type="text/javascript" src="jasmine/jasmine.js"></script>
+  <script type="text/javascript" src="jasmine/jasmine-html.js"></script>
 
   <script type="text/javascript">
     (function() {