Remove Task
Move into Tasks namespace, complete annotations