Refactor, ajout de packages