Updated tasks.

Rearranges some packages.