Move AutoCompletion to Utils