Changing library to be PSR-0 compliant