Update the class to be PSR-0 compliant