Updates to respect PSR-0 spec