Move universal package to single task.