Convert to single-collection package