Moved to be PSR-0 compliant