Sort out dependencies

This alpabetizes tasks and updates dependencies.