Reorganized files. Refactoring code around iterator.