Bug 990002 - Move import utilities to shared folder