Added tests for PSTReader, added portable hierarchial mail support.
Refactored code for reuse.