updated to psr-4 and updated composer.json