update to use CollectionUtils
move wrapper collections to own package