One final class move to make PSR-0 happy