Moved iterators into their own files.
Fixed a minor bug.