Update and reorganize TODO file