IMPROVED : Reorganisation
ADDED : Support de Composer