Changed readme TODO list, reorganized