Fix composer.json
PSR-4, new directories and new classes.