Revert "Rearrange"

This reverts commit df8918ac5857bf558258e509c2fb3345c2823d36.
Move textcomplete to refactor