Refactoring to psr-4