Added go to declaration support for import module.
Minor refactor.