Started refactoring importController.js - changes still pending