Moved container releated classes to new collection package