PSR-4 and repository refactorization