Updated composer + PSR2