Move commands to their own package. Refactor Task.