BUG-865: Move ModuleImportImpl and hide it