Moved iterator to own namespace