Update composer and use PSR-4