Adding PSR-0 compliance