composer refactored with psr standards