Move Collection classes into collection namespace

Change-Id: I119048324f6ae78597ef060f7e70066d12d35715
Merge "Move Collection classes into collection namespace"