Added PSR-0 back to standard + custom bin