Reorganize and update TODO
Update README