diff --git a/src/Manager/Toolbar_Manager.php b/src/Manager/Toolbar_Manager.php
index 8a38e7d..8cf1ded 100644
--- a/src/Manager/Toolbar_Manager.php
+++ b/src/Manager/Toolbar_Manager.php
@@ -3,9 +3,9 @@ declare( strict_types=1 );
 
 namespace Rarst\Laps\Manager;
 
-use Rarst\Laps\Record\Recursive_Record_Iterator;
+use Rarst\Laps\Record\Iterator\Recursive_Record_Iterator;
 use Rarst\Laps\Plugin;
-use Rarst\Laps\Record\Timeline_Iterator;
+use Rarst\Laps\Record\Iterator\Timeline_Iterator;
 
 /**
  * Implements toolbar menu and visualization.
diff --git a/src/Record/Recursive_Record_Iterator.php b/src/Record/Iterator/Recursive_Record_Iterator.php
similarity index 95%
rename from src/Record/Recursive_Record_Iterator.php
rename to src/Record/Iterator/Recursive_Record_Iterator.php
index 521ec52..c3a5804 100644
--- a/src/Record/Recursive_Record_Iterator.php
+++ b/src/Record/Iterator/Recursive_Record_Iterator.php
@@ -1,7 +1,9 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Iterator;
+
+use Rarst\Laps\Record\Record_Interface;
 
 /**
  * Processes records, recursively bumping overlapping ones to children.
diff --git a/src/Record/Timeline_Iterator.php b/src/Record/Iterator/Timeline_Iterator.php
similarity index 92%
rename from src/Record/Timeline_Iterator.php
rename to src/Record/Iterator/Timeline_Iterator.php
index ec5200f..18cd245 100644
--- a/src/Record/Timeline_Iterator.php
+++ b/src/Record/Iterator/Timeline_Iterator.php
@@ -1,7 +1,11 @@
 <?php
 declare( strict_types=1 );
 
-namespace Rarst\Laps\Record;
+namespace Rarst\Laps\Record\Iterator;
+
+use Rarst\Laps\Record\Record;
+use Rarst\Laps\Record\Record_Interface;
+use Rarst\Laps\Record\Iterator\Recursive_Record_Iterator;
 
 /**
  * Processes records into sets for display by template.
diff --git a/tests/Record/IteratorTest.php b/tests/Record/IteratorTest.php
index 2b98eae..b56224c 100644
--- a/tests/Record/IteratorTest.php
+++ b/tests/Record/IteratorTest.php
@@ -2,17 +2,17 @@
 
 namespace Rarst\Laps\Tests\Record;
 
-use Rarst\Laps\Record\Recursive_Record_Iterator;
+use Rarst\Laps\Record\Iterator\Recursive_Record_Iterator;
 use Rarst\Laps\Record\Record;
-use Rarst\Laps\Record\Timeline_Iterator;
+use Rarst\Laps\Record\Iterator\Timeline_Iterator;
 use Rarst\Laps\Tests\LapsTestCase;
 
 class IteratorTest extends LapsTestCase {
 
 	/**
-	 * @covers \Rarst\Laps\Record\Recursive_Record_Iterator
+	 * @covers \Rarst\Laps\Record\Iterator\Recursive_Record_Iterator
 	 *
-	 * @return Recursive_Record_Iterator
+	 * @return \Rarst\Laps\Record\Iterator\Recursive_Record_Iterator
 	 */
 	public function testRecord() {
 
@@ -41,7 +41,7 @@ class IteratorTest extends LapsTestCase {
 	}
 
 	/**
-	 * @covers \Rarst\Laps\Record\Timeline_Iterator
+	 * @covers \Rarst\Laps\Record\Iterator\Timeline_Iterator
 	 *
 	 * @depends testRecord
 	 */