Integrating entrust and refactoring code using psr-4
Finish entrust-integration