Renamed class ocollect to osource.
Refactored formatting classes.