Added a way to specify format for MarketData.
More reorganizing and renaming.
Cleanup and small fixes. Prepared for release.