Simplify the import controller

 -  refactor the cases.