collection/refactor: complete moving collection classes around.