FIX Composer

Fix library name for PSR-0
Add PSR-4