diff --git a/composer.json b/composer.json
index 83f264c3..40a75742 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "wp-cli/wp-cli": "^2.5"
+        "wp-cli/wp-cli": "^2.10"
     },
     "require-dev": {
         "wp-cli/cache-command": "^1 || ^2",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
deleted file mode 100644
index 16cff729..00000000
--- a/phpunit.xml.dist
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         colors="true"
-         verbose="true">
-    <testsuite>
-        <directory suffix="Test.php">tests</directory>
-    </testsuite>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/src/Option_Command.php b/src/Option_Command.php
index 53d44db3..3c341155 100644
--- a/src/Option_Command.php
+++ b/src/Option_Command.php
@@ -1,9 +1,9 @@
 <?php
 
-use WP_CLI\Entity\RecursiveDataStructureTraverser;
+use WP_CLI\Entity\Utils as EntityUtils;
 use WP_CLI\Formatter;
+use WP_CLI\Traverser\RecursiveDataStructureTraverser;
 use WP_CLI\Utils;
-use WP_CLI\Entity\Utils as EntityUtils;
 
 /**
  * Retrieves and sets site options, including plugin and WordPress settings.
diff --git a/src/Site_Option_Command.php b/src/Site_Option_Command.php
index d5201a60..cda5494f 100644
--- a/src/Site_Option_Command.php
+++ b/src/Site_Option_Command.php
@@ -1,9 +1,9 @@
 <?php
 
-use WP_CLI\Entity\RecursiveDataStructureTraverser;
+use WP_CLI\Entity\Utils as EntityUtils;
 use WP_CLI\Formatter;
+use WP_CLI\Traverser\RecursiveDataStructureTraverser;
 use WP_CLI\Utils;
-use WP_CLI\Entity\Utils as EntityUtils;
 
 /**
  * Adds, updates, deletes, and lists site options in a multisite installation.
diff --git a/src/WP_CLI/CommandWithMeta.php b/src/WP_CLI/CommandWithMeta.php
index d30ee93f..cdcff70d 100644
--- a/src/WP_CLI/CommandWithMeta.php
+++ b/src/WP_CLI/CommandWithMeta.php
@@ -5,8 +5,8 @@
 use Exception;
 use WP_CLI;
 use WP_CLI_Command;
-use WP_CLI\Entity\RecursiveDataStructureTraverser;
 use WP_CLI\Entity\Utils as EntityUtils;
+use WP_CLI\Traverser\RecursiveDataStructureTraverser;
 
 /**
  * Base class for WP-CLI commands that deal with metadata
diff --git a/src/WP_CLI/Entity/NonExistentKeyException.php b/src/WP_CLI/Entity/NonExistentKeyException.php
deleted file mode 100644
index 45d18d17..00000000
--- a/src/WP_CLI/Entity/NonExistentKeyException.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace WP_CLI\Entity;
-
-use OutOfBoundsException;
-
-class NonExistentKeyException extends OutOfBoundsException {
-	/** @var RecursiveDataStructureTraverser */
-	protected $traverser;
-
-	/**
-	 * @param RecursiveDataStructureTraverser $traverser
-	 */
-	public function set_traverser( $traverser ) {
-		$this->traverser = $traverser;
-	}
-
-	/**
-	 * @return RecursiveDataStructureTraverser
-	 */
-	public function get_traverser() {
-		return $this->traverser;
-	}
-}
diff --git a/src/WP_CLI/Entity/RecursiveDataStructureTraverser.php b/src/WP_CLI/Entity/RecursiveDataStructureTraverser.php
deleted file mode 100644
index 3d23da40..00000000
--- a/src/WP_CLI/Entity/RecursiveDataStructureTraverser.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace WP_CLI\Entity;
-
-use UnexpectedValueException;
-
-class RecursiveDataStructureTraverser {
-
-	/**
-	 * @var mixed The data to traverse set by reference.
-	 */
-	protected $data;
-
-	/**
-	 * @var null|string The key the data belongs to in the parent's data.
-	 */
-	protected $key;
-
-	/**
-	 * @var null|static The parent instance of the traverser.
-	 */
-	protected $parent;
-
-	/**
-	 * RecursiveDataStructureTraverser constructor.
-	 *
-	 * @param mixed       $data            The data to read/manipulate by reference.
-	 * @param string|int  $key             The key/property the data belongs to.
-	 * @param static|null $parent_instance The parent instance of the traverser.
-	 */
-	public function __construct( &$data, $key = null, $parent_instance = null ) {
-		$this->data   =& $data;
-		$this->key    = $key;
-		$this->parent = $parent_instance;
-	}
-
-	/**
-	 * Get the nested value at the given key path.
-	 *
-	 * @param string|int|array $key_path
-	 *
-	 * @return static
-	 */
-	public function get( $key_path ) {
-		return $this->traverse_to( (array) $key_path )->value();
-	}
-
-	/**
-	 * Get the current data.
-	 *
-	 * @return mixed
-	 */
-	public function value() {
-		return $this->data;
-	}
-
-	/**
-	 * Update a nested value at the given key path.
-	 *
-	 * @param string|int|array $key_path
-	 * @param mixed $value
-	 */
-	public function update( $key_path, $value ) {
-		$this->traverse_to( (array) $key_path )->set_value( $value );
-	}
-
-	/**
-	 * Update the current data with the given value.
-	 *
-	 * This will mutate the variable which was passed into the constructor
-	 * as the data is set and traversed by reference.
-	 *
-	 * @param mixed $value
-	 */
-	public function set_value( $value ) {
-		$this->data = $value;
-	}
-
-	/**
-	 * Unset the value at the given key path.
-	 *
-	 * @param $key_path
-	 */
-	public function delete( $key_path ) {
-		$this->traverse_to( (array) $key_path )->unset_on_parent();
-	}
-
-	/**
-	 * Define a nested value while creating keys if they do not exist.
-	 *
-	 * @param array $key_path
-	 * @param mixed $value
-	 */
-	public function insert( $key_path, $value ) {
-		try {
-			$this->update( $key_path, $value );
-		} catch ( NonExistentKeyException $exception ) {
-			$exception->get_traverser()->create_key();
-			$this->insert( $key_path, $value );
-		}
-	}
-
-	/**
-	 * Delete the key on the parent's data that references this data.
-	 */
-	public function unset_on_parent() {
-		$this->parent->delete_by_key( $this->key );
-	}
-
-	/**
-	 * Delete the given key from the data.
-	 *
-	 * @param $key
-	 */
-	public function delete_by_key( $key ) {
-		if ( is_array( $this->data ) ) {
-			unset( $this->data[ $key ] );
-		} else {
-			unset( $this->data->$key );
-		}
-	}
-
-	/**
-	 * Get an instance of the traverser for the given hierarchical key.
-	 *
-	 * @param array $key_path Hierarchical key path within the current data to traverse to.
-	 *
-	 * @throws NonExistentKeyException
-	 *
-	 * @return static
-	 */
-	public function traverse_to( array $key_path ) {
-		$current = array_shift( $key_path );
-
-		if ( null === $current ) {
-			return $this;
-		}
-
-		if ( ! $this->exists( $current ) ) {
-			$exception = new NonExistentKeyException( "No data exists for key \"{$current}\"" );
-			$exception->set_traverser( new static( $this->data, $current, $this->parent ) );
-			throw $exception;
-		}
-
-		foreach ( $this->data as $key => &$key_data ) {
-			if ( $key === $current ) {
-				$traverser = new static( $key_data, $key, $this );
-				return $traverser->traverse_to( $key_path );
-			}
-		}
-	}
-
-	/**
-	 * Create the key on the current data.
-	 *
-	 * @throws UnexpectedValueException
-	 */
-	protected function create_key() {
-		if ( is_array( $this->data ) ) {
-			$this->data[ $this->key ] = null;
-		} elseif ( is_object( $this->data ) ) {
-			$this->data->{$this->key} = null;
-		} else {
-			$type = gettype( $this->data );
-			throw new UnexpectedValueException(
-				"Cannot create key \"{$this->key}\" on data type {$type}"
-			);
-		}
-	}
-
-	/**
-	 * Check if the given key exists on the current data.
-	 *
-	 * @param string $key
-	 *
-	 * @return bool
-	 */
-	public function exists( $key ) {
-		return ( is_array( $this->data ) && array_key_exists( $key, $this->data ) ) ||
-			( is_object( $this->data ) && property_exists( $this->data, $key ) );
-	}
-}
diff --git a/tests/RecursiveDataStructureTraverserTest.php b/tests/RecursiveDataStructureTraverserTest.php
deleted file mode 100644
index c7aebce6..00000000
--- a/tests/RecursiveDataStructureTraverserTest.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-namespace WP_CLI\Entity\Tests;
-
-use WP_CLI\Entity\RecursiveDataStructureTraverser;
-use WP_CLI\Tests\TestCase;
-
-class RecursiveDataStructureTraverserTest extends TestCase {
-
-	/** @test */
-	public function it_can_get_a_top_level_array_value() {
-		$array = array(
-			'foo' => 'bar',
-		);
-
-		$traverser = new RecursiveDataStructureTraverser( $array );
-
-		$this->assertEquals( 'bar', $traverser->get( 'foo' ) );
-	}
-
-	/** @test */
-	public function it_can_get_a_top_level_object_value() {
-		$object = (object) array(
-			'foo' => 'bar',
-		);
-
-		$traverser = new RecursiveDataStructureTraverser( $object );
-
-		$this->assertEquals( 'bar', $traverser->get( 'foo' ) );
-	}
-
-	/** @test */
-	public function it_can_get_a_nested_array_value() {
-		$array = array(
-			'foo' => array(
-				'bar' => array(
-					'baz' => 'value',
-				),
-			),
-		);
-
-		$traverser = new RecursiveDataStructureTraverser( $array );
-
-		$this->assertEquals( 'value', $traverser->get( array( 'foo', 'bar', 'baz' ) ) );
-	}
-
-	/** @test */
-	public function it_can_get_a_nested_object_value() {
-		$object = (object) array(
-			'foo' => (object) array(
-				'bar' => 'baz',
-			),
-		);
-
-		$traverser = new RecursiveDataStructureTraverser( $object );
-
-		$this->assertEquals( 'baz', $traverser->get( array( 'foo', 'bar' ) ) );
-	}
-
-	/** @test */
-	public function it_can_set_a_nested_array_value() {
-		$array = array(
-			'foo' => array(
-				'bar' => 'baz',
-			),
-		);
-		$this->assertEquals( 'baz', $array['foo']['bar'] );
-
-		$traverser = new RecursiveDataStructureTraverser( $array );
-		$traverser->update( array( 'foo', 'bar' ), 'new' );
-
-		$this->assertEquals( 'new', $array['foo']['bar'] );
-	}
-
-	/** @test */
-	public function it_can_set_a_nested_object_value() {
-		$object = (object) array(
-			'foo' => (object) array(
-				'bar' => 'baz',
-			),
-		);
-		$this->assertEquals( 'baz', $object->foo->bar );
-
-		$traverser = new RecursiveDataStructureTraverser( $object );
-		$traverser->update( array( 'foo', 'bar' ), 'new' );
-
-		$this->assertEquals( 'new', $object->foo->bar );
-	}
-
-	/** @test */
-	public function it_can_update_an_integer_object_value() {
-		$object = (object) array(
-			'test_mode' => 0,
-		);
-		$this->assertEquals( 0, $object->test_mode );
-
-		$traverser = new RecursiveDataStructureTraverser( $object );
-		$traverser->update( array( 'test_mode' ), 1 );
-
-		$this->assertEquals( 1, $object->test_mode );
-	}
-
-	/** @test */
-	public function it_can_delete_a_nested_array_value() {
-		$array = array(
-			'foo' => array(
-				'bar' => 'baz',
-			),
-		);
-		$this->assertArrayHasKey( 'bar', $array['foo'] );
-
-		$traverser = new RecursiveDataStructureTraverser( $array );
-		$traverser->delete( array( 'foo', 'bar' ) );
-
-		$this->assertArrayNotHasKey( 'bar', $array['foo'] );
-	}
-
-	/** @test */
-	public function it_can_delete_a_nested_object_value() {
-		$object = (object) array(
-			'foo' => (object) array(
-				'bar' => 'baz',
-			),
-		);
-		$this->assertObjectHasAttribute( 'bar', $object->foo );
-
-		$traverser = new RecursiveDataStructureTraverser( $object );
-		$traverser->delete( array( 'foo', 'bar' ) );
-
-		$this->assertObjectNotHasAttribute( 'bar', $object->foo );
-	}
-
-	/** @test */
-	public function it_can_insert_a_key_into_a_nested_array() {
-		$array = array(
-			'foo' => array(
-				'bar' => 'baz',
-			),
-		);
-
-		$traverser = new RecursiveDataStructureTraverser( $array );
-		$traverser->insert( array( 'foo', 'new' ), 'new value' );
-
-		$this->assertArrayHasKey( 'new', $array['foo'] );
-		$this->assertEquals( 'new value', $array['foo']['new'] );
-	}
-
-	/** @test */
-	public function it_throws_an_exception_when_attempting_to_create_a_key_on_an_invalid_type() {
-		$data      = 'a string';
-		$traverser = new RecursiveDataStructureTraverser( $data );
-
-		try {
-			$traverser->insert( array( 'key' ), 'value' );
-		} catch ( \Exception $e ) {
-			$this->assertSame( 'a string', $data );
-			return;
-		}
-
-		$this->fail( 'Failed to assert that an exception was thrown when inserting a key into a string.' );
-	}
-}