Refactor composer

Correcção de erros.