More PSR-2 implementation and added composer.json