diff --git a/api/auth-store.js b/api/auth-store.js
index b60a1ff..3841939 100644
--- a/api/auth-store.js
+++ b/api/auth-store.js
@@ -1,6 +1,6 @@
 /**
  * Memory store for API key and token.
- * @module auth-store
+ * @module planet-client/api/auth-store
  * @private
  */
 
diff --git a/api/auth.js b/api/auth.js
index e8c3045..3990a8b 100644
--- a/api/auth.js
+++ b/api/auth.js
@@ -1,6 +1,6 @@
 /**
- * Provides methods for setting API authentication credentials.
- * @module auth
+ * Provides methods for authenticating with a Planet API account.
+ * @module planet-client/api/auth
  */
 
 var errors = require('./errors');
@@ -9,9 +9,10 @@ var store = require('./auth-store');
 var urls = require('./urls');
 
 /**
- * Submit credentials for authentication.
- * @param {string} email Email.
- * @param {string} password Password.
+ * Submit credentials for authentication.  Upon successful authentication, a
+ * token representing the user will be stored for subsequent API requests.
+ * @param {string} email The email associated with a Planet account.
+ * @param {string} password The password for a Planet account.
  * @return {Promise} A promise that resolves on successful login and is rejected
  *     otherwise.
  */
@@ -47,7 +48,9 @@ function logout() {
 }
 
 /**
- * Set an API key to be used for subsequent requests.
+ * Set an API key to be used for subsequent requests.  This is an alternative
+ * to submitting credentials with the [`login`](#module:planet-client/api/auth~login)
+ * method.  The stored key will be used for subsequent API requests.
  * @param {string} key An API key.
  */
 function setKey(key) {
diff --git a/api/errors.js b/api/errors.js
index ce3d50e..91a1655 100644
--- a/api/errors.js
+++ b/api/errors.js
@@ -1,32 +1,58 @@
 /**
- * Includes specific Error types generated by API requests.
- * @module errors
- * @private
+ * Includes specific `Error` types generated by API requests.  When a request
+ * method returns a promise that is rejected, you can use `instanceof` to
+ * determine what type of error you have.
+ *
+ * @module planet-client/api/errors
  */
 
 /**
- * An error based on a server response.
+ * The base class for all response errors.
  * @param {string} message Error message.
  * @param {XMLHttpRequest} response The response.
  * @param {string} body Any parsed response body.
  * @constructor
+ * @ignore
  */
 function ResponseError(message, response, body) {
+
+  /**
+   * A message providing details about the error.
+   * @type {string}
+   */
   this.message = message;
+
+  /**
+   * The server response.
+   * @type {IncomingMessage}
+   */
   this.response = response;
+
+  /**
+   * Any parsed response body.  For "expected" errors, this will be an object
+   * representing the JSON response body.
+   * @type {Object}
+   */
   this.body = body;
+
+  /**
+   * The stack trace for the error.
+   * @type {string}
+   */
   this.stack = (new Error()).stack;
+
 }
 ResponseError.prototype = new Error();
 ResponseError.prototype.name = 'ResponseError';
 
 /**
- * The request was bad (400).
+ * The request was bad (status `400`).
  * @param {string} message Error message.
  * @param {XMLHttpRequest} response The response.
  * @param {Object} body Any parsed response body (as JSON).
- * @extends {ResponseError}
+ * @extends {module:planet-client/api/errors~ResponseError}
  * @constructor
+ * @ignore
  */
 function BadRequest(message, response, body) {
   ResponseError.apply(this, arguments);
@@ -36,12 +62,13 @@ BadRequest.prototype = new ResponseError();
 BadRequest.prototype.name = 'BadRequest';
 
 /**
- * The request requires user authentication (401).
+ * The request requires user authentication (status `401`).
  * @param {string} message Error message.
  * @param {XMLHttpRequest} response The response.
  * @param {Object} body Any parsed response body (as JSON).
- * @extends {ResponseError}
+ * @extends {module:planet-client/api/errors~ResponseError}
  * @constructor
+ * @ignore
  */
 function Unauthorized(message, response, body) {
   ResponseError.apply(this, arguments);
@@ -51,12 +78,13 @@ Unauthorized.prototype = new ResponseError();
 Unauthorized.prototype.name = 'Unauthorized';
 
 /**
- * The client is forbidden from making the request (403).
+ * The client is forbidden from making the request (status `403`).
  * @param {string} message Error message.
  * @param {XMLHttpRequest} response The response.
  * @param {Object} body Any parsed response body (as JSON).
- * @extends {ResponseError}
+ * @extends {module:planet-client/api/errors~ResponseError}
  * @constructor
+ * @ignore
  */
 function Forbidden(message, response, body) {
   ResponseError.apply(this, arguments);
@@ -70,8 +98,9 @@ Forbidden.prototype.name = 'Forbidden';
  * @param {string} message Error message.
  * @param {XMLHttpRequest} response The response.
  * @param {string} body Any parsed response body.
- * @extends {ResponseError}
+ * @extends {module:planet-client/api/errors~ResponseError}
  * @constructor
+ * @ignore
  */
 function UnexpectedResponse(message, response, body) {
   ResponseError.apply(this, arguments);
@@ -81,9 +110,10 @@ UnexpectedResponse.prototype = new ResponseError();
 UnexpectedResponse.prototype.name = 'UnexpectedResponse';
 
 /**
- * An error generated when the request is aborted.
+ * An error generated when the request is terminated.
  * @param {string} message Error message.
  * @constructor
+ * @ignore
  */
 function AbortedRequest(message) {
   this.message = message;
diff --git a/api/mosaics.js b/api/mosaics.js
index d733fb5..0b702f3 100644
--- a/api/mosaics.js
+++ b/api/mosaics.js
@@ -1,6 +1,6 @@
 /**
  * Provides methods for getting scene metadata.
- * @module mosaics
+ * @module planet-client/api/mosaics
  */
 
 var Page = require('./page');
@@ -17,7 +17,9 @@ var util = require('./util');
  * @param {function(function())} options.terminator A function that is called
  *     with a function that can be called back to terminate the request.
  * @return {Promise.<Object>} A promise that resolves to mosaic metadata or is
- *     rejected with any error.
+ *     rejected with any error.  See the [`errors`
+ *     module](#module:planet-client/api/errors) for a list of the possible
+ *     error types.
  */
 function get(id, options) {
   options = options || {};
@@ -41,8 +43,10 @@ function get(id, options) {
  *     resources in the response.  True by default.
  * @param {function(function())} options.terminator A function that is called
  *     with a function that can be called back to terminate the request.
- * @return {Promise.<Page>} A promise that resolves to a page of mosaic
- *     metadata or is rejected with any error.
+ * @return {Promise.<module:planet-client/api/page~Page>} A promise that
+ *     resolves to a page of mosaic metadata or is rejected with any error.
+ *     See the [`errors` module](#module:planet-client/api/errors) for a list of
+ *     the possible error types.
  */
 function search(query, options) {
   options = options || {};
diff --git a/api/page.js b/api/page.js
index a7e60ea..45ced28 100644
--- a/api/page.js
+++ b/api/page.js
@@ -1,7 +1,6 @@
 /**
  * Provides a utility for working with pages of search results.
- * @module page
- * @private
+ * @module planet-client/api/page
  */
 
 var url = require('url');
@@ -13,15 +12,16 @@ var url = require('url');
  * @param {function(Object):Promise} factory Function that creates a promise of
  *     new data given a query object.
  * @constructor
+ * @ignore
  */
 function Page(data, factory) {
   var links = data.links;
 
   /**
-   * Get the previous page.  If there is no previous page, `previous` will be
-   *     `null`.
+   * Get the previous page.  If there is no previous page, `prev` will be
+   * `null`.
    * @param {Object} options Any request options.
-   * @return {Promise.<Page>} The previous page.
+   * @return {Promise.<module:planet-client/api/page~Page>} The previous page.
    * @method
    */
   this.prev = !links.prev ? null : function(options) {
@@ -29,10 +29,9 @@ function Page(data, factory) {
   };
 
   /**
-   * Get the next page.
+   * Get the next page.  If there is no next page, `next` will be `null`.
    * @param {Object} options Any request options.
-   * @return {Promise.<Page>} The next page.  If there is no next page,
-   *     `next` will be `null`.
+   * @return {Promise.<module:planet-client/api/page~Page>} The next page.
    * @method
    */
   this.next = !links.next ? null : function(options) {
diff --git a/api/quads.js b/api/quads.js
index 518c1c6..cd180c4 100644
--- a/api/quads.js
+++ b/api/quads.js
@@ -1,6 +1,6 @@
 /**
  * Provides methods for getting mosaic quad metadata.
- * @module quads
+ * @module planet-client/api/quads
  */
 
 var Page = require('./page');
@@ -19,6 +19,8 @@ var util = require('./util');
  *     with a function that can be called back to terminate the request.
  * @return {Promise.<Object>} A promise that resolves to quad metadata or is
  *     rejected with any error.
+ *     See the [`errors` module](#module:planet-client/api/errors) for a list of
+ *     the possible error types.
  */
 function get(mosaicId, quadId, options) {
   options = options || {};
@@ -43,8 +45,10 @@ function get(mosaicId, quadId, options) {
  *     resources in the response.  True by default.
  * @param {function(function())} options.terminator A function that is called
  *     with a function that can be called back to terminate the request.
- * @return {Promise.<Page>} A promise that resolves to a page of quad
- *     metadata or is rejected with any error.
+ * @return {Promise.<module:planet-client/api/page~Page>} A promise that
+ *     resolves to a page of quad metadata or is rejected with any error.
+ *     See the [`errors` module](#module:planet-client/api/errors) for a list of
+ *     the possible error types.
  */
 function search(mosaicId, query, options) {
   options = options || {};
@@ -75,6 +79,8 @@ function search(mosaicId, query, options) {
  *     with a function that can be called back to terminate the request.
  * @return {Promise.<Object>} A promise that resolves to quad metadata or is
  *     rejected with any error.
+ *     See the [`errors` module](#module:planet-client/api/errors) for a list of
+ *     the possible error types.
  */
 function scenes(mosaicId, quadId, options) {
   options = options || {};
diff --git a/api/request.js b/api/request.js
index bb114ef..a55caa6 100644
--- a/api/request.js
+++ b/api/request.js
@@ -1,6 +1,6 @@
 /**
  * Provides methods for issuing API requests.
- * @module requests
+ * @module planet-client/api/request
  * @private
  */
 
diff --git a/api/scenes.js b/api/scenes.js
index 7b11eb3..350acee 100644
--- a/api/scenes.js
+++ b/api/scenes.js
@@ -1,6 +1,6 @@
 /**
  * Provides methods getting scene metadata.
- * @module scenes
+ * @module planet-client/api/scenes
  */
 
 var Page = require('./page');
@@ -20,6 +20,8 @@ var util = require('./util');
  *     with a function that can be called back to terminate the request.
  * @return {Promise.<Object>} A promise that resolves to scene metadata or is
  *     rejected with any error.
+ *     See the [`errors` module](#module:planet-client/api/errors) for a list of
+ *     the possible error types.
  */
 function get(scene, options) {
   options = options || {};
@@ -49,8 +51,10 @@ function get(scene, options) {
  *     resources in the response.  True by default.
  * @param {function(function())} options.terminator A function that is called
  *     with a function that can be called back to terminate the request.
- * @return {Promise.<Page>} A promise that resolves to a page of scene
- *     metadata or is rejected with any error.
+ * @return {Promise.<module:planet-client/api/page~Page>} A promise that
+ *     resolves to a page of scene metadata or is rejected with any error.
+ *     See the [`errors` module](#module:planet-client/api/errors) for a list of
+ *     the possible error types.
  */
 function search(query, options) {
   options = options || {};
diff --git a/api/urls.js b/api/urls.js
index 5872b33..37b6c18 100644
--- a/api/urls.js
+++ b/api/urls.js
@@ -1,6 +1,6 @@
 /**
  * API URL utilities.
- * @module urls
+ * @module planet-client/api/urls
  * @private
  */
 
diff --git a/api/util.js b/api/util.js
index 665c85d..086525c 100644
--- a/api/util.js
+++ b/api/util.js
@@ -1,6 +1,6 @@
 /**
  * General utilities.
- * @module util
+ * @module planet-client/api/util
  * @private
  */
 
diff --git a/api/workspaces.js b/api/workspaces.js
index 33a0859..7da1be7 100644
--- a/api/workspaces.js
+++ b/api/workspaces.js
@@ -1,6 +1,6 @@
 /**
  * Provides methods for working with workspaces.
- * @module workspaces
+ * @module planet-client/api/workspaces
  * @private
  */
 
diff --git a/cli/find-mosaics.js b/cli/find-mosaics.js
index d21905e..916c157 100644
--- a/cli/find-mosaics.js
+++ b/cli/find-mosaics.js
@@ -2,7 +2,8 @@ var mosaics = require('../api/mosaics');
 
 /**
  * Recursively fetch all pages until the limit is reached.
- * @param {Promise.<Page>} promise A promise that resolves to a page of mosaics.
+ * @param {Promise.<module:planet-client/api/page~Page>} promise A promise that
+ *     resolves to a page of mosaics.
  * @param {Array} list An array of mosaic metadata.
  * @param {number} limit The limit.
  * @return {Promise.<Array>} An array that resolves to an array of mosaics.
diff --git a/cli/find-quads.js b/cli/find-quads.js
index 36417d6..aa1129f 100644
--- a/cli/find-quads.js
+++ b/cli/find-quads.js
@@ -44,7 +44,8 @@ function resolveQuery(opts) {
 
 /**
  * Recursively fetch all pages until the limit is reached.
- * @param {Promise.<Page>} promise A promise that resolves to a page of quads.
+ * @param {Promise.<module:planet-client/api/page~Page>} promise A promise that
+ *     resolves to a page of quads.
  * @param {Array} features An array of quad metadata.
  * @param {number} limit The limit.
  * @return {Promise.<Array>} An array that resolves to an array of quads.
diff --git a/cli/find-scenes.js b/cli/find-scenes.js
index 759ee18..2fc6180 100644
--- a/cli/find-scenes.js
+++ b/cli/find-scenes.js
@@ -133,7 +133,8 @@ function resolveQuery(opts) {
 
 /**
  * Recursively fetch all pages until the limit is reached.
- * @param {Promise.<Page>} promise A promise that resolves to a page of scenes.
+ * @param {Promise.<module:planet-client/api/page~Page>} promise A promise that
+ *     resolves to a page of scenes.
  * @param {Array} features An array of scene metadata.
  * @param {number} limit The limit.
  * @return {Promise.<Array>} An array that resolves to an array of scenes.
diff --git a/doc/config.json b/doc/config.json
deleted file mode 100644
index 31e6cc3..0000000
--- a/doc/config.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "source": {
-    "include": ["api"]
-  },
-  "opts": {
-    "destination": "./build/doc",
-    "encoding": "utf8",
-    "readme": "./doc/index.md",
-    "recurse": true,
-    "template": "./node_modules/minami"
-  },
-  "plugins": [
-    "plugins/markdown"
-  ],
-  "templates": {
-    "default": {
-      "layoutFile": "./doc/template/layout.tmpl",
-      "outputSourceFiles": false
-    }
-  }
-}
diff --git a/doc/index.md b/doc/index.md
deleted file mode 100644
index 74af878..0000000
--- a/doc/index.md
+++ /dev/null
@@ -1,40 +0,0 @@
-## planet-client
-
-A JavaScript client for [Planet's imagery API](https://www.planet.com/docs/).
-
-### Installation
-
-The `planet-client` requires Node >= 0.12.  Install the `planet-client` package `npm` (which comes with [Node](https://nodejs.org/)).
-
-    npm install planet-client
-
-### Using the Library
-
-The `planet-client` package can be used in a Node based project or in the browser with a CommonJS module loader (like [Browserify](http://browserify.org/) or [Webpack](http://webpack.github.io/)).
-
-The library requires a global [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) implementation.  This comes with Node >= 0.12 and [modern browsers](http://caniuse.com/#search=promise).  To use `planet-client` in an environment without `Promise`, you can [use a polyfill](https://www.google.com/search?q=promise+polyfill).
-
-With the above prerequisites, you can start using the `planet-client` package in your application:
-
-```js
-var planet = require('planet-client');
-
-// set up your API key for all future requests
-planet.auth.setKey(process.env.PL_API_KEY);
-
-var lastWeek = new Date(Date.now() - (7 * 24 * 60 * 60 * 1000));
-
-var query = {
-  'acquired.gte': lastWeek.toISOString()
-};
-
-planet.scenes.search(query)
-  .then(function(page) {
-    console.log('Total count: ' + page.data.count + ' scenes since ' + lastWeek);
-  })
-  .catch(function(err) {
-    console.error('Failed to fetch scenes:', err.message);
-  });
-```
-
-See the list of modules to the left for details on what is exported by the library.
diff --git a/doc/layouts/main.html b/doc/layouts/main.html
new file mode 100644
index 0000000..df9a415
--- /dev/null
+++ b/doc/layouts/main.html
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>{{ title }}</title>
+    <style>
+      html, body {
+        margin: 1em;
+        padding; 0;
+        font-family: "Open Sans",sans-serif,"Helvetica Neue",Helvetica,Arial,sans-serif;
+        background: #FFF;
+        color: #666;
+      }
+      a {
+        color: #00a9e9;
+        text-decoration: none;
+      }
+      a:hover,
+      a:focus {
+        color: #00729d;
+        text-decoration: none;
+      }
+      hr {
+        border: 0;
+        height: 1px;
+        background: #eee;
+      }
+      pre {
+        background: #eee;
+        padding: 1em;
+      }
+      code {
+        font-family: "Lucida Console", Monaco, monospace;
+        font-size: 0.9em;
+        color: #666;
+      }
+      a code .name {
+        color: #00a9e9;
+      }
+      a:hover code .name,
+      a:focus code .name {
+        color: #00729d;
+      }
+      #sidebar {
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        overflow: scroll;
+        width: 200px;
+        padding: 2em 2em 0 0;
+        box-sizing: border-box;
+      }
+      #sidebar h1 {
+        margin-top: 0.5em;
+        font-size: 1.5em
+      }
+      #sidebar h2 {
+        margin-top: 1em;
+        font-size: 1.2em
+      }
+      #sidebar ul {
+        margin: 0.5em 0;
+        list-style-type: circle;
+        padding: 0 20px;
+      }
+      #content {
+        margin-left: 200px;
+      }
+      section.separated {
+        border: 1px solid #eee;
+        padding: 0 2em;
+        margin-bottom: 3em;
+      }
+      .function,
+      .method,
+      .class {
+        margin-bottom: 2em;
+      }
+      .params {
+        padding: 0 30px;
+        list-style-type: circle;
+      }
+      .param {
+        margin-bottom: 0.5em;
+      }
+      .param .separator {
+        color: #666;
+      }
+      .param code.type {
+        color: #666;
+      }
+      .param p {
+        display: inline;
+      }
+      .returns {
+        padding: 0 30px;
+        list-style-type: circle;
+      }
+      .returns p {
+        display: inline;
+      }
+      .toc {
+        font-size: 0.8em;
+      }
+      .toc .module {
+        margin: 1em 0 0;
+        border: 0;
+        padding: 0;
+      }
+      .toc .function,
+      .toc .class {
+        margin: 0;
+      }
+    </style>
+  </head>
+  <body>
+  {{{ contents }}}
+  </body>
+</html>
diff --git a/doc/partials/class.html b/doc/partials/class.html
new file mode 100644
index 0000000..1e5403f
--- /dev/null
+++ b/doc/partials/class.html
@@ -0,0 +1,24 @@
+<h2 id="{{longname}}">
+  <a href="#{{longname}}">
+    {{#if ignore}}
+      <code>mod.<span class="name">{{name}}</span></code>
+    {{else}}
+      <code>var {{lower name}} = new mod.<span class="name">{{name}}</span>()</code>
+    {{/if}}
+  </a>
+</h2>
+<p class="description">{{md description}}</p>
+{{#if methods}}
+  {{#each methods}}
+    <div class="method">
+      {{>method this}}
+    </div>
+  {{/each}}
+{{/if}}
+{{#if members}}
+  {{#each members}}
+    <div class="member">
+      {{>member this}}
+    </div>
+  {{/each}}
+{{/if}}
diff --git a/doc/partials/function.html b/doc/partials/function.html
new file mode 100644
index 0000000..71f17d4
--- /dev/null
+++ b/doc/partials/function.html
@@ -0,0 +1,14 @@
+<h2 id="{{longname}}">
+  <a href="#{{longname}}">
+    <code>
+      mod.<span class="name">{{name}}</span>({{listParams params}})
+    </code>
+  </a>
+</h2>
+<p>{{md description}}</p>
+{{#if params}}
+  {{>params this}}
+{{/if}}
+{{#if returns}}
+  {{>returns this}}
+{{/if}}
diff --git a/doc/partials/member.html b/doc/partials/member.html
new file mode 100644
index 0000000..934f1bb
--- /dev/null
+++ b/doc/partials/member.html
@@ -0,0 +1,9 @@
+<h3 id="{{longname}}">
+  <a href="#{{longname}}">
+    <code>
+      {{instance memberof}}.<span class="name">{{name}}</span>
+    </code>
+  </a>
+  <span class="separator">:</span>&nbsp;{{>type this}}
+</h3>
+<p>{{md description}}</p>
diff --git a/doc/partials/method.html b/doc/partials/method.html
new file mode 100644
index 0000000..84ad023
--- /dev/null
+++ b/doc/partials/method.html
@@ -0,0 +1,14 @@
+<h3 id="{{longname}}">
+  <a href="#{{longname}}">
+    <code>
+      {{instance memberof}}.<span class="name">{{name}}</span>({{listParams params}})
+    </code>
+  </a>
+</h3>
+<p>{{md description}}</p>
+{{#if params}}
+  {{>params this}}
+{{/if}}
+{{#if returns}}
+  {{>returns this}}
+{{/if}}
diff --git a/doc/partials/module.html b/doc/partials/module.html
new file mode 100644
index 0000000..b2a3c85
--- /dev/null
+++ b/doc/partials/module.html
@@ -0,0 +1,25 @@
+<section class="module separated" id="{{longname}}">
+  <h1>
+    <a href="#{{longname}}"><code><span class="name">{{name}}</span></code></a>
+  </h1>
+  <p class="description">{{md description}}</p>
+  <hr>
+  <h2><code>var mod = require('{{name}}')</code></h2>
+
+  {{#if classes}}
+    {{#each classes}}
+      <div class="class">
+        {{>class this}}
+      </div>
+    {{/each}}
+  {{/if}}
+
+  {{#if functions}}
+    {{#each functions}}
+      <div class="function">
+        {{>function this}}
+      </div>
+    {{/each}}
+  {{/if}}
+
+</section>
diff --git a/doc/partials/params.html b/doc/partials/params.html
new file mode 100644
index 0000000..bf61f78
--- /dev/null
+++ b/doc/partials/params.html
@@ -0,0 +1,9 @@
+<h4>Arguments</h4>
+<ul class="params">
+  {{#each params}}
+    <li class="param">
+      <code class="name">{{name}}</code>&nbsp;<span class="separator">:</span>
+      {{>type this}} - {{md description}}
+    </li>
+  {{/each}}
+</ul>
diff --git a/doc/partials/returns.html b/doc/partials/returns.html
new file mode 100644
index 0000000..80eee1d
--- /dev/null
+++ b/doc/partials/returns.html
@@ -0,0 +1,4 @@
+<h4>Returns</h4>
+<ul class="returns">
+  <li>{{>type returns.[0]}} - {{md returns.[0].description}}</li>
+</ul>
diff --git a/doc/partials/toc.html b/doc/partials/toc.html
new file mode 100644
index 0000000..1ee273c
--- /dev/null
+++ b/doc/partials/toc.html
@@ -0,0 +1,33 @@
+<div class="toc">
+  <h1><a href="{{root}}/">Planet Client</a></h1>
+  <hr>
+  <h2><a href="{{root}}/api/">API Modules</a></h2>
+  {{#if api}}
+    {{#each modules}}
+      <div class="module">
+        <a href="#{{longname}}">
+          <code><span class="name">{{name}}</span></code>
+        </a>
+      </div>
+      <ul class="classes">
+      {{#each classes}}
+        <li class="class">
+          <a href="#{{longname}}">
+            <code><span class="name">{{name}}</span></code>
+          </a>
+        </li>
+      {{/each}}
+      </ul>
+      <ul class="functions">
+      {{#each functions}}
+        <li class="function">
+          <a href="#{{longname}}">
+            <code><span class="name">{{name}}</span></code>
+          </a>
+        </li>
+      {{/each}}
+      </ul>
+    {{/each}}
+  {{/if}}
+  <h2><a href="{{root}}/cli/">CLI Usage</a></h2>
+</div>
diff --git a/doc/partials/type.html b/doc/partials/type.html
new file mode 100644
index 0000000..a03dbf2
--- /dev/null
+++ b/doc/partials/type.html
@@ -0,0 +1,3 @@
+<code class="type">
+  {{#each type.names}}{{#if @index}}|{{/if}}{{linkType this}}{{/each}}
+</code>
diff --git a/doc/src/api/index.html b/doc/src/api/index.html
new file mode 100644
index 0000000..e37e9ea
--- /dev/null
+++ b/doc/src/api/index.html
@@ -0,0 +1,18 @@
+---
+layout: main.html
+title: API Docs
+---
+<section id="sidebar">
+  {{>toc this api="active" root=".."}}
+</section>
+<div id="content">
+  <section class="separated">
+    <h1>API Modules</h1>
+    <p>
+      The <code>planet-client</code> package is organized as a collection of modules that roughly follow the structure of the <a href="https://www.planet.com/docs/">HTTP API</a>.  The API provides access to individual <a href="#module:planet-client/api/scenes">scenes</a> from a variety of providers and <a href="#module:planet-client/api/mosaics">mosaics</a> of those scenes.
+    </p>
+  </section>
+  {{#each modules}}
+    {{>module this}}
+  {{/each}}
+</div>
diff --git a/doc/src/cli/index.html b/doc/src/cli/index.html
new file mode 100644
index 0000000..e9f5fa2
--- /dev/null
+++ b/doc/src/cli/index.html
@@ -0,0 +1,48 @@
+---
+layout: main.html
+title: CLI Docs
+---
+<section id="sidebar">
+  {{>toc this cli="active" root=".."}}
+</section>
+
+<section id="content" class="separated">
+
+  <h1>CLI Usage</h1>
+
+  <p>
+    The <code>planet-client</code> package provides a <code>planet</code> executable.  This can be installed globally (<code>npm install --global planet-client</code>), or if you install it locally, you can add the executable to your path (<code>export PATH=path/to/node_modules/.bin:$PATH</code>).
+  </p>
+
+  <p>
+    The general syntax for the <code>planet</code> executable is <code>planet [options]</code>.  To see a list of commands, run the following:
+  </p>
+
+  <pre><code>planet --help</code></pre>
+
+  <p>
+    You can get help for a specific command by adding <code>--help</code> to the command name (e.g. <code>planet find-scenes --help</code>).
+  </p>
+
+  <p>
+    To take advantage of command line completion with the <code>planet</code> executable, you can run the following in bash:
+  </p>
+
+  <pre><code>eval "$(planet completion)"</code></pre>
+
+  <p>
+    To enable this every time you start a new shell, you can append the output of <code>planet completion</code> to your <code>.bashrc</code>:
+  </p>
+
+  <pre><code>planet completion >> ~/.bashrc</code></pre>
+
+  <p>
+    The CLI will be fully documented when it is a bit more stable.  For now, you can get a preview of what's available with this video:
+  </p>
+
+  <a href="https://vimeo.com/134018559">
+    <img src="https://raw.githubusercontent.com/wiki/planetlabs/planet-client-js/planet-client.png"
+        style="display: block; width: 80%; margin: 0 auto;">
+  </a>
+
+</section>
diff --git a/doc/src/index.html b/doc/src/index.html
new file mode 100644
index 0000000..9f6dd18
--- /dev/null
+++ b/doc/src/index.html
@@ -0,0 +1,58 @@
+---
+layout: main.html
+title: Planet Client
+---
+
+<section id="sidebar">
+  {{>toc this root="."}}
+</section>
+
+<section id="content" class="separated">
+  <h1><code>planet-client</code></h1>
+
+  <p>
+    A JavaScript client for <a href="https://www.planet.com/docs/">Planet's imagery API</a>.
+  </p>
+
+  <h2 id="installation">Installation</h2>
+
+  <p>
+    Install the <code>planet-client</code> package with <code>npm</code> (which comes with <a href="https://nodejs.org/">Node</a>).
+  </p>
+
+  <pre><code>npm install planet-client</code></pre>
+
+  <p>
+    The <code>planet-client</code> package provides <a href="#using-the-library">a library</a> for use in your application and a <code>planet</code> executable for <a href="#using-the-cli">command line use</a>. See details on both below.
+  </p>
+
+  <h2 id="using-the-library">Using the Library</h2>
+
+  <p>
+    The <code>planet-client</code> package can be used in a Node based project or in the browser with a CommonJS module loader (like <a href="http://browserify.org/">Browserify</a> or <a href="http://webpack.github.io/">Webpack</a>).
+  </p>
+
+  <p>
+    The library requires a global <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise"><code>Promise</code></a> implementation.  This comes with Node &gt;= 0.12 and <a href="http://caniuse.com/#search=promise">modern browsers</a>.  To use <code>planet-client</code> in an environment without <code>Promise</code>, you can <a href="https://www.google.com/search?q=promise+polyfill">use a polyfill</a>.
+  </p>
+
+  <p>
+    With the above prerequisites, you can start using the <code>planet-client</code> package in your application.  See the <a href="./api/">client API documentation</a> for details on using the library.
+  </p>
+
+  <h2 id="using-the-cli">Using the CLI</h2>
+
+  <p>
+    The <code>planet-client</code> package provides a <code>planet</code> executable. This can be installed globally (<code>npm install --global planet-client</code>), or if you install it locally, you can add the executable to your path (<code>export PATH=$PATH:path/to/node_modules/.bin</code>).
+  </p>
+
+  <p>
+    The general syntax for the planet executable is planet <command> [options]. To see a list of commands, run the following:
+  </p>
+
+  <pre><code>planet --help</code></pre>
+
+  <p>
+    See the <a href="./cli/">CLI docs</a> for more details on using the <code>planet</code> command.
+  </p>
+</section>
diff --git a/doc/template/layout.tmpl b/doc/template/layout.tmpl
deleted file mode 100644
index d8b211f..0000000
--- a/doc/template/layout.tmpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title><?js= title ?> - Documentation</title>
-
-    <script src="scripts/prettify/prettify.js"></script>
-    <script src="scripts/prettify/lang-css.js"></script>
-    <!--[if lt IE 9]>
-      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-    <link type="text/css" rel="stylesheet" href="https://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
-    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
-    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
-</head>
-<body>
-
-<input type="checkbox" id="nav-trigger" class="nav-trigger" />
-<label for="nav-trigger" class="navicon-button x">
-  <div class="navicon"></div>
-</label>
-
-<label for="nav-trigger" class="overlay"></label>
-
-<nav>
-    <?js= this.nav ?>
-</nav>
-
-<div id="main">
-    <?js if (title != 'Home') { ?>
-    <h1 class="page-title"><?js= title ?></h1>
-    <?js } ?>
-
-    <?js= content ?>
-</div>
-
-
-<script>prettyPrint();</script>
-</body>
-</html>
diff --git a/package.json b/package.json
index 18ce1e5..c6ef3a9 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,9 @@
     "test-debug": "mocha --debug-brk --recursive test",
     "start": "watchy --watch bin,examples,api,cli,test -- npm test",
     "postpublish": "npm run publish-doc",
-    "doc": "jsdoc --configure doc/config.json",
+    "apidoc": "jsdoc --template jsdoc-json --destination build/api.json api",
+    "doc": "npm run apidoc && node --harmony-generators tasks/build-docs.js",
+    "start-doc": "watchy --watch doc,api,tasks -- npm run doc",
     "publish-doc": "npm run doc && gh-pages --dist build/doc"
   },
   "bin": {
@@ -30,7 +32,13 @@
     "eslint": "^0.22.1",
     "eslint-config-planet": "^2.0.0",
     "gh-pages": "^0.3.1",
+    "handlebars": "^3.0.3",
     "jsdoc": "^3.3.2",
+    "jsdoc-json": "^2.0.0",
+    "marked": "^0.3.5",
+    "metalsmith": "^2.0.1",
+    "metalsmith-in-place": "^1.3.1",
+    "metalsmith-layouts": "^1.3.0",
     "minami": "^1.1.0",
     "mocha": "^2.2.5",
     "nyc": "^3.1.0",
diff --git a/tasks/build-docs.js b/tasks/build-docs.js
new file mode 100644
index 0000000..f02acc3
--- /dev/null
+++ b/tasks/build-docs.js
@@ -0,0 +1,205 @@
+var Metalsmith = require('metalsmith');
+var handlebars = require('handlebars');
+var inPlace = require('metalsmith-in-place');
+var layouts = require('metalsmith-layouts');
+var marked = require('marked');
+
+var pkg = require('../package.json');
+var api = require('../build/api.json');
+
+function getNamed(name, array) {
+  var item;
+  for (var i = 0, ii = array.length; i < ii; ++i) {
+    if (array[i].name === name) {
+      item = array[i];
+      break;
+    }
+  }
+  if (!item) {
+    item = {name: name};
+    array.push(item);
+  }
+  return item;
+}
+
+var MODULE_NAME_RE = /^module:([\w-\/]+)~/;
+
+function getModuleName(longname) {
+  var match = longname.match(MODULE_NAME_RE);
+  if (!match) {
+    throw new Error('Expected to parse a module name from ' + longname);
+  }
+  return match[1];
+}
+
+var CLASS_NAME_RE = /^module:[\w-\/]+~([A-Z]\w+)$/;
+
+function getClassName(memberof) {
+  var match = memberof.match(CLASS_NAME_RE);
+  if (!match) {
+    throw new Error('Expected to parse a class name from ' + memberof);
+  }
+  return match[1];
+}
+
+function getModule(longname, modules) {
+  var name = getModuleName(longname);
+  return getNamed(name, modules);
+}
+
+function getClass(memberof, classes) {
+  var name = getClassName(memberof);
+  return getNamed(name, classes);
+}
+
+function organizeDocs(docs) {
+  var modules = [];
+  for (var i = 0, ii = docs.length; i < ii; ++i) {
+    var doc = docs[i];
+    var module, cls;
+    switch (doc.kind) {
+      case 'module':
+        module = getNamed(doc.name, modules);
+        assign(module, doc);
+        break;
+      case 'class':
+        module = getModule(doc.longname, modules);
+        if (!module.classes) {
+          module.classes = [];
+        }
+        cls = getClass(doc.longname, module.classes);
+        assign(cls, doc);
+        break;
+      case 'member':
+        module = getModule(doc.longname, modules);
+        cls = getClass(doc.memberof, module.classes);
+        if (!cls.members) {
+          cls.members = [];
+        }
+        cls.members.push(doc);
+        break;
+      case 'function':
+        module = getModule(doc.longname, modules);
+        if (doc.scope === 'instance') {
+          if (!module.classes) {
+            module.classes = [];
+          }
+          cls = getClass(doc.memberof, module.classes);
+          if (!cls.methods) {
+            cls.methods = [];
+          }
+          cls.methods.push(doc);
+        } else {
+          if (!module.functions) {
+            module.functions = [];
+          }
+          module.functions.push(doc);
+        }
+        break;
+      default:
+        //pass
+    }
+  }
+  return modules;
+}
+
+function assign(target, source) {
+  for (var key in source) {
+    target[key] = source[key];
+  }
+  return target;
+}
+
+function main(callback) {
+
+  var modules = organizeDocs(api.docs).filter(function(module) {
+    return module.access !== 'private';
+  }).sort(function(a, b) {
+    return a.name < b.name ? -1 : 1;
+  });
+
+  var smith = new Metalsmith('.')
+      .source('doc/src')
+      .destination('build/doc')
+      .concurrency(25)
+      .metadata({
+        version: pkg.version,
+        modules: modules
+      })
+      .use(inPlace({
+        engine: 'handlebars',
+        partials: 'doc/partials',
+        helpers: {
+          instance: function(memberof) {
+            var className = getClassName(memberof);
+            return className.charAt(0).toLowerCase() + className.slice(1);
+          },
+          listParams: function(params) {
+            if (!params) {
+              return '';
+            }
+            return params.map(function(param) {
+              return param.name;
+            }).filter(function(name) {
+              return name.indexOf('.') === -1;
+            }).join(', ');
+          },
+          linkType: function(type) {
+            var openIndex = type.lastIndexOf('<');
+            var closeIndex = type.indexOf('>');
+            var match, link;
+            if (openIndex >= 0 && closeIndex > openIndex) {
+              match = type.slice(openIndex + 1, closeIndex).match(
+                  CLASS_NAME_RE);
+              if (match) {
+                link = new handlebars.SafeString(
+                    type.slice(0, openIndex + 1).replace('<', '&lt;') +
+                    '<a href="#' + match[0] + '">' + match[1] + '</a>' +
+                    type.slice(closeIndex).replace('>', '&gt;'));
+              } else {
+                link = type;
+              }
+            } else {
+              match = type.match(CLASS_NAME_RE);
+              if (match) {
+                link = new handlebars.SafeString(
+                    '<a href="#' + match[0] + '>' + match[1] + '</a>');
+              } else {
+                link = type;
+              }
+            }
+            return link;
+          },
+          lower: function(str) {
+            return str.charAt(0).toLowerCase() + str.slice(1);
+          },
+          md: function(str) {
+            return new handlebars.SafeString(marked(str));
+          }
+        }
+      }))
+      .use(layouts({
+        engine: 'handlebars',
+        directory: 'doc/layouts'
+      }))
+      .build(function(err) {
+        callback(err);
+      });
+
+  return smith;
+}
+
+if (require.main === module) {
+  main(function(err) {
+    if (err) {
+      process.stderr.write(
+          'Building docs failed.  See the full trace below.\n\n' +
+          err.stack + '\n');
+      process.exit(1);
+    } else {
+      process.exit(0);
+    }
+  });
+}
+
+module.exports = main;