Move one-offs into task files