Moving collections out of other

@ndushay