Updated PSR-0 to 4