Refactor to PSR-4