Reorganize index doc
Update completion helpers