Move iterators to separate namespace