diff --git a/docs/api/MongoDB/CRUD.php b/docs/api/MongoDB/CRUD.php
deleted file mode 100644
index af9453ae..00000000
--- a/docs/api/MongoDB/CRUD.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-namespace MongoDB;
-
-interface WriteBatch {
-    function add($document);
-}
-
-
-class InsertBatch implements WriteBatch {
-    function add($document) {
-        $this->documents[] = $document;
-    }
-}
-
-class UpdateBatch implements WriteBatch {
-    function add($document) {
-        $this->documents[] = $document;
-    }
-}
-
-class DeleteBatch implements WriteBatch {
-    function add($document) {
-        $this->documents[] = $document;
-    }
-}
-
-class Query {
-    function __construct($query) {}
-}
-class Command {
-    function __construct($command) {}
-}
-
-
-
-
-class WriteResults {
-
-    /* Returns nModified, n, nUserted, .. */
-    function getNumbers() {
-    }
-
-    /* Returns how many operations were executed */
-    function getOpCount() {
-    }
-
-    /* Returns the server that the operation was executed on */
-    function getServer() {
-    }
-
-    /* Any stats available from the server */
-    function getTimer() {
-    }
-}
-
-class QueryResults {
-    function __construct(Server $server, $cursor_id, $firstBatch) {
-    }
-}
-
-
diff --git a/docs/api/MongoDB/Command/Command.php b/docs/api/MongoDB/Command/Command.php
new file mode 100644
index 00000000..ccdd45c4
--- /dev/null
+++ b/docs/api/MongoDB/Command/Command.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace MongoDB\Command;
+
+final class Command
+{
+    /**
+     * @param array|object $document Command document
+     */
+    public function __construct($document)
+    {
+        // ...
+    }
+}
diff --git a/docs/api/MongoDB/Command/CommandCursor.php b/docs/api/MongoDB/Command/CommandCursor.php
new file mode 100644
index 00000000..f853c74f
--- /dev/null
+++ b/docs/api/MongoDB/Command/CommandCursor.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace MongoDB\Command;
+
+// Note: consider combining implementation with \MongoDB\Query\QueryCursor
+final class CommandCursor implements \MongoDB\Cursor
+{
+    private $server;
+    private $batchSize;
+    private $cursorId;
+    private $firstBatch;
+
+    /**
+     * @param Server  $server
+     * @param integer $cursorId
+     * @param array   $firstBatch
+     */
+    public function __construct(Server $server, $cursorId, array $firstBatch)
+    {
+        $this->server = $server;
+        $this->cursorId = (integer) $cursorId;
+        $this->firstBatch = $firstBatch;
+    }
+
+    // Iterator methods...
+
+    /**
+     * @see \MongoDB\Cursor::getId()
+     */
+    public function getId()
+    {
+        return $this->cursorId;
+    }
+
+    /**
+     * @see \MongoDB\ServerResult::getServer()
+     */
+    public function getServer()
+    {
+        return $this->server;
+    }
+
+    /**
+     * @see \MongoDB\Cursor::setBatchSize()
+     */
+    public function setBatchSize($batchSize)
+    {
+        $this->batchSize = (integer) $batchSize;
+    }
+
+    // Note: this expects consistent command response documents from the server
+    static public function createFromCommandResult(CommandResult $result)
+    {
+        // extract $cursorId and $firstBatch from $result->getResponse()
+
+        return new static($result->getServer(), $cursorId, $firstBatch);
+    }
+}
diff --git a/docs/api/MongoDB/Command/CommandResult.php b/docs/api/MongoDB/Command/CommandResult.php
new file mode 100644
index 00000000..8ba37bf7
--- /dev/null
+++ b/docs/api/MongoDB/Command/CommandResult.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace MongoDB\Command;
+
+interface CommandResult extends \MongoDB\ServerResult
+{
+    /**
+     * @return array Original response document from the server
+     */
+    function getResponse();
+}
diff --git a/docs/api/MongoDB/Cursor.php b/docs/api/MongoDB/Cursor.php
new file mode 100644
index 00000000..8f481309
--- /dev/null
+++ b/docs/api/MongoDB/Cursor.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MongoDB;
+
+interface Cursor extends ServerResult, \Iterator
+{
+    /**
+     * @return integer Cursor identifier
+     */
+    function getId();
+
+    /**
+     * @param integer $batchSize
+     */
+    function setBatchSize($batchSize);
+}
diff --git a/docs/api/MongoDB/Management.php b/docs/api/MongoDB/Management.php
deleted file mode 100644
index a60e2a44..00000000
--- a/docs/api/MongoDB/Management.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-namespace MongoDB;
-
-class Server {
-    const TYPE_MONGOS     = 0x01;
-    const TYPE_STANDALONE = 0x02;
-    const TYPE_ARBITER    = 0x03;
-    const TYPE_SECONDARY  = 0x04;
-    const TYPE_PRIMARY    = 0x05;
-
-    /* These need to be final as they will not be called by the driver to retrieve the 
-     * information, these getters are only useful for userland */
-    final function getHostname() {}
-    final function getPort() {}
-    final function getLatency() {}
-    final function getMaxWireVersion() {}
-    final function getMinWireVersion() {}
-    final function getServerType() {}
-
-    /* extracting config info */
-    final function isPassive() {}
-    final function isDelayed() {}
-
-    final function executeQuery($namespace, \MongoDB\Query $query) {}
-    final function executeWrite($namespace, \MongoDB\WriteBatch $batch, WriteOptions $wo) {}
-}
-
-
-class Manager extends \SplObjectStorage {
-    function __construct(array $servers, $dbname, $connection_options) {
-    }
-
-    static function fromDSN($dsn) {
-    }
-
-    final function executeQuery($namespace, \MongoDB\Query $query, ReadPreference $rp) {
-        foreach($this->getConnectedServers() as $server) {
-            if ($server->matchesReadPreference($rp)) {
-                return $server->executeQuery($namespace, $query);
-            }
-        }
-        throw new NoServerMatchingReadPreference($rp);
-    }
-
-    final function executeWrite($namespace, \MongoDB\WriteBatch $batch, WriteOptions $wo) {
-        foreach($this->getConnectedServers() as $server) {
-            if ($server->isPrimary()) {
-                return $server->executeWrite($namespace, $batch, $wo);
-            }
-        }
-
-        throw new NoPrimaryAvailable;
-    }
-}
-
diff --git a/docs/api/MongoDB/Manager.php b/docs/api/MongoDB/Manager.php
new file mode 100644
index 00000000..2b7d5573
--- /dev/null
+++ b/docs/api/MongoDB/Manager.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace MongoDB;
+
+final class Manager extends \SplObjectStorage
+{
+    /**
+     * @param Server[] $servers
+     * @param string   $db      Database name
+     * @param array    $options Connection options
+     */
+    public function __construct(array $servers, $db, $options)
+    {
+    }
+
+    static public function fromDSN($dsn)
+    {
+    }
+
+    final public function executeCommand($namespace, \MongoDB\Query $query, \MongoDB\ReadPreference $rp)
+    {
+        foreach($this->getConnectedServers() as $server) {
+            if ($server->matchesReadPreference($rp)) {
+                return $server->executeQuery($namespace, $query);
+            }
+        }
+        throw new NoServerMatchingReadPreference($rp);
+    }
+
+    final public function executeQuery($namespace, \MongoDB\Query $query, \MongoDB\ReadPreference $rp)
+    {
+        foreach($this->getConnectedServers() as $server) {
+            if ($server->matchesReadPreference($rp)) {
+                return $server->executeQuery($namespace, $query);
+            }
+        }
+        throw new NoServerMatchingReadPreference($rp);
+    }
+
+    final function executeWrite($namespace, \MongoDB\WriteBatch $batch, \MongoDB\WriteOptions $wo)
+    {
+        foreach($this->getConnectedServers() as $server) {
+            if ($server->isPrimary()) {
+                return $server->executeWrite($namespace, $batch, $wo);
+            }
+        }
+
+        throw new NoPrimaryAvailable;
+    }
+}
diff --git a/docs/api/MongoDB/Query/Query.php b/docs/api/MongoDB/Query/Query.php
new file mode 100644
index 00000000..cd73b3e7
--- /dev/null
+++ b/docs/api/MongoDB/Query/Query.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace MongoDB\Query;
+
+final class Query
+{
+    /**
+     * @param array|object $query    Query document
+     * @param array|object $selector Selector document
+     * @param integer      $flags    Query flags
+     * @param integer      $limit    Limit
+     * @param integer      $skip     Skip
+     */
+    public function __construct($query, $selector, $flags, $skip, $limit)
+    {
+        // ...
+    }
+}
diff --git a/docs/api/MongoDB/Query/QueryCursor.php b/docs/api/MongoDB/Query/QueryCursor.php
new file mode 100644
index 00000000..9435dce9
--- /dev/null
+++ b/docs/api/MongoDB/Query/QueryCursor.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace MongoDB\Query;
+
+// Note: consider combining implementation with \MongoDB\Command\CommandCursor
+final class QueryCursor implements \MongoDB\Cursor
+{
+    private $server;
+    private $batchSize;
+    private $cursorId;
+
+    /**
+     * @param Server  $server
+     * @param integer $cursorId
+     */
+    public function __construct(Server $server, $cursorId)
+    {
+        $this->server = $server;
+        $this->cursorId = (integer) $cursorId;
+    }
+
+    // Iterator methods...
+
+    /**
+     * @see \MongoDB\Cursor::getId()
+     */
+    public function getId()
+    {
+        return $this->cursorId;
+    }
+
+    /**
+     * @see \MongoDB\ServerResult::getServer()
+     */
+    public function getServer()
+    {
+        return $this->server;
+    }
+
+    /**
+     * @see \MongoDB\Cursor::setBatchSize()
+     */
+    public function setBatchSize($batchSize)
+    {
+        $this->batchSize = (integer) $batchSize;
+    }
+}
diff --git a/docs/api/MongoDB/Query/QueryResult.php b/docs/api/MongoDB/Query/QueryResult.php
new file mode 100644
index 00000000..79621f0d
--- /dev/null
+++ b/docs/api/MongoDB/Query/QueryResult.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace MongoDB\Query;
+
+interface QueryResult extends \MongoDB\ServerResult, \Traversable
+{
+}
diff --git a/docs/api/MongoDB/Server.php b/docs/api/MongoDB/Server.php
new file mode 100644
index 00000000..3b6c678a
--- /dev/null
+++ b/docs/api/MongoDB/Server.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace MongoDB;
+
+class Server
+{
+    const TYPE_MONGOS     = 0x01;
+    const TYPE_STANDALONE = 0x02;
+    const TYPE_ARBITER    = 0x03;
+    const TYPE_SECONDARY  = 0x04;
+    const TYPE_PRIMARY    = 0x05;
+
+    /* These need to be final as they will not be called by the driver to
+     * retrieve the information; these getters are only useful for userland.
+     */
+    final public function getHostname() {}
+    final public function getPort() {}
+    final public function getLatency() {}
+    final public function getMaxWireVersion() {}
+    final public function getMinWireVersion() {}
+    final public function getServerType() {}
+
+    // extracting config info
+    final public function isPassive() {}
+    final public function isDelayed() {}
+
+    final public function executeCommand($namespace, \MongoDB\Command\Command $command, \MongoDB\ReadPreference $rp) {}
+    final public function executeQuery($namespace, \MongoDB\Query\Query $query, \MongoDB\ReadPreference $rp) {}
+    final public function executeWrite($namespace, \MongoDB\Write\WriteBatch $batch, \MongoDB\WriteOptions $wo) {}
+}
diff --git a/docs/api/MongoDB/ServerError.php b/docs/api/MongoDB/ServerError.php
new file mode 100644
index 00000000..11ee9e28
--- /dev/null
+++ b/docs/api/MongoDB/ServerError.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MongoDB;
+
+interface ServerError extends ServerResult
+{
+    /**
+     * @return integer Server error code
+     */
+    function getCode();
+
+    /**
+     * @return string Server error message
+     */
+    function getMessage();
+}
diff --git a/docs/api/MongoDB/ServerResult.php b/docs/api/MongoDB/ServerResult.php
new file mode 100644
index 00000000..84927dec
--- /dev/null
+++ b/docs/api/MongoDB/ServerResult.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace MongoDB;
+
+interface ServerResult
+{
+    /**
+     * @return Server Server on which the result originated
+     */
+    function getServer();
+}
diff --git a/docs/api/MongoDB/Write/BulkResult.php b/docs/api/MongoDB/Write/BulkResult.php
new file mode 100644
index 00000000..55623b18
--- /dev/null
+++ b/docs/api/MongoDB/Write/BulkResult.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface BulkResult extends InsertResult, UpdateResult, DeleteResult
+{
+    // Note: this interface would exist alongside Bulk API in the userland lib
+}
diff --git a/docs/api/MongoDB/Write/DeleteBatch.php b/docs/api/MongoDB/Write/DeleteBatch.php
new file mode 100644
index 00000000..515284bc
--- /dev/null
+++ b/docs/api/MongoDB/Write/DeleteBatch.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace MongoDB\Write;
+
+final class DeleteBatch extends WriteBatch
+{
+    private $documents;
+
+    /**
+     * @see WriteBatch::add()
+     */
+    public function add($document)
+    {
+        $this->documents[] = $document;
+    }
+
+    /**
+     * @see Countable::count()
+     */
+    public function count()
+    {
+        return count($this->documents);
+    }
+
+    /**
+     * @see WriteBatch::getDocuments()
+     */
+    public function getDocuments()
+    {
+        return $this->documents;
+    }
+}
diff --git a/docs/api/MongoDB/Write/DeleteResult.php b/docs/api/MongoDB/Write/DeleteResult.php
new file mode 100644
index 00000000..9bf41e59
--- /dev/null
+++ b/docs/api/MongoDB/Write/DeleteResult.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface DeleteResult extends WriteResult
+{
+    /**
+     * @return integer
+     */
+    function getNumRemoved();
+}
diff --git a/docs/api/MongoDB/Write/InsertBatch.php b/docs/api/MongoDB/Write/InsertBatch.php
new file mode 100644
index 00000000..ba9fd2d1
--- /dev/null
+++ b/docs/api/MongoDB/Write/InsertBatch.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace MongoDB\Write;
+
+final class InsertBatch extends WriteBatch
+{
+    private $documents;
+
+    /**
+     * @see WriteBatch::add()
+     */
+    public function add($document)
+    {
+        $this->documents[] = $document;
+    }
+
+    /**
+     * @see Countable::count()
+     */
+    public function count()
+    {
+        return count($this->documents);
+    }
+
+    /**
+     * @see WriteBatch::getDocuments()
+     */
+    public function getDocuments()
+    {
+        return $this->documents;
+    }
+}
diff --git a/docs/api/MongoDB/Write/InsertResult.php b/docs/api/MongoDB/Write/InsertResult.php
new file mode 100644
index 00000000..fe8e3082
--- /dev/null
+++ b/docs/api/MongoDB/Write/InsertResult.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface InsertResult extends WriteResult
+{
+    /**
+     * @return integer
+     */
+    function getNumInserted();
+}
diff --git a/docs/api/MongoDB/Write/UpdateBatch.php b/docs/api/MongoDB/Write/UpdateBatch.php
new file mode 100644
index 00000000..b88ed19a
--- /dev/null
+++ b/docs/api/MongoDB/Write/UpdateBatch.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace MongoDB\Write;
+
+final class UpdateBatch extends WriteBatch
+{
+    private $documents;
+
+    /**
+     * @see WriteBatch::add()
+     */
+    public function add($document)
+    {
+        $this->documents[] = $document;
+    }
+
+    /**
+     * @see Countable::count()
+     */
+    public function count()
+    {
+        return count($this->documents);
+    }
+
+    /**
+     * @see WriteBatch::getDocuments()
+     */
+    public function getDocuments()
+    {
+        return $this->documents;
+    }
+}
diff --git a/docs/api/MongoDB/Write/UpdateResult.php b/docs/api/MongoDB/Write/UpdateResult.php
new file mode 100644
index 00000000..38e7f1a9
--- /dev/null
+++ b/docs/api/MongoDB/Write/UpdateResult.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface UpdateResult extends WriteResult
+{
+    /**
+     * @return integer
+     */
+    function getNumMatched();
+
+    /**
+     * @return integer
+     */
+    function getNumModified();
+
+    /**
+     * @return integer
+     */
+    function getNumUpserted();
+
+    /**
+     * @return Upsert[]
+     */
+    function getUpserts();
+}
diff --git a/docs/api/MongoDB/Write/Upsert.php b/docs/api/MongoDB/Write/Upsert.php
new file mode 100644
index 00000000..571aaedc
--- /dev/null
+++ b/docs/api/MongoDB/Write/Upsert.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MongoDB\Write;
+
+final class Upsert
+{
+    /**
+     * @return mixed
+     */
+    function getId();
+
+    /**
+     * @return integer Batch index of the upsert
+     */
+    function getIndex();
+}
diff --git a/docs/api/MongoDB/Write/WriteBatch.php b/docs/api/MongoDB/Write/WriteBatch.php
new file mode 100644
index 00000000..e2fabd49
--- /dev/null
+++ b/docs/api/MongoDB/Write/WriteBatch.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface WriteBatch extends \Countable
+{
+    /**
+     * @param array|object Operation/document to add to the batch
+     */
+    function add($document);
+
+    /**
+     * @return array Array of operations/documents in the batch
+     */
+    function getDocuments();
+}
diff --git a/docs/api/MongoDB/Write/WriteConcernError.php b/docs/api/MongoDB/Write/WriteConcernError.php
new file mode 100644
index 00000000..fdff8c37
--- /dev/null
+++ b/docs/api/MongoDB/Write/WriteConcernError.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface WriteConcernError extends \MongoDB\ServerError
+{
+    /**
+     * @return array Additional metadata for the error (e.g. {"wtimeout": true})
+     */
+    function getInfo();
+}
diff --git a/docs/api/MongoDB/Write/WriteError.php b/docs/api/MongoDB/Write/WriteError.php
new file mode 100644
index 00000000..7128d2b0
--- /dev/null
+++ b/docs/api/MongoDB/Write/WriteError.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface WriteError extends \MongoDB\ServerError
+{
+    /**
+     * @return integer Batch index of the error
+     */
+    function getIndex();
+
+    /**
+     * @return array|object Operation or document responsible for the error
+     */
+    function getOperation();
+}
diff --git a/docs/api/MongoDB/Write/WriteResult.php b/docs/api/MongoDB/Write/WriteResult.php
new file mode 100644
index 00000000..94a204ab
--- /dev/null
+++ b/docs/api/MongoDB/Write/WriteResult.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace MongoDB\Write;
+
+interface WriteResult extends \MongoDB\ServerResult
+{
+    /**
+     * @return array Additional metadata for the operation(s) (e.g. timings)
+     */
+    function getInfo();
+
+    /**
+     * @return integer Number of operations that were executed
+     */
+    function getOpCount();
+
+    /**
+     * @return WriteError[]
+     */
+    function getWriteErrors();
+
+    /**
+     * @return WriteConcernError[]
+     */
+    function getWriteConcernErrors();
+}