PIM 1348 : refactor installer