Various changes to support new flavor of import via Ink File Picker. Also various refactoring of the code to leverage in other services.