reorganized todos