Use PSR-4 loading and use new json