Moves completion engine init code to the proper place

Issue: #40