Combined Iterator and Enumerator classes into a factory.
Replaced Hashtable with HashMap in Uri
Updated SFileFilter to remove dependency on the removed classes.