PSR-0 Refactoring