Revert "Redesigned (and renamed) a big chunk of the task stuff. Still not finished!"

This reverts commit 5958d581658dcf451a1d056cdc54c29f3309228d.