Refactor collections organization.