Move completer within util/