- Using PSR-4
- Corrected coding style to meet PSR-2