Move TODOs to file TODO