Move wrapping of collections to correct package