diff --git a/src/Manager/Toolbar_Manager.php b/src/Manager/Toolbar_Manager.php
index e03e0b5..cdfafe7 100644
--- a/src/Manager/Toolbar_Manager.php
+++ b/src/Manager/Toolbar_Manager.php
@@ -4,7 +4,7 @@ namespace Rarst\Laps\Manager;
 
 use Rarst\Laps\Record\Recursive_Record_Iterator;
 use Rarst\Laps\Laps;
-use Rarst\Laps\Timeline_Iterator;
+use Rarst\Laps\Record\Timeline_Iterator;
 
 class Toolbar_Manager {
 
diff --git a/src/Timeline_Iterator.php b/src/Record/Timeline_Iterator.php
similarity index 92%
rename from src/Timeline_Iterator.php
rename to src/Record/Timeline_Iterator.php
index e9bc969..475a28f 100644
--- a/src/Timeline_Iterator.php
+++ b/src/Record/Timeline_Iterator.php
@@ -1,9 +1,6 @@
 <?php
 
-namespace Rarst\Laps;
-
-use Rarst\Laps\Record\Record_Interface;
-use Rarst\Laps\Record\Recursive_Record_Iterator;
+namespace Rarst\Laps\Record;
 
 class Timeline_Iterator implements \Iterator {