Upgrade to psr-4