Also move the file. I tried using the same code base for both the types of auto-completion and this has resulted in a huge mess. It's best to keep the logic completely seperate for the two.