PSR-0 refactor