PSR-0 Fix Part 1