Update TODO
Rename Other to Trash