Refactoring.
Renamed Collection* related classes to Container*.
Reformatting.