Added completions for langauge-service. Some refactoring.