Move things to a completion module
Start move to config based completion engine
Move engine to new file