PSR-0 refactoring