moved iterators to own folder