Re-structuring workspace for PSR-4 optimization