Make into single-collection package