WIP - Fixing all code standards to PSR-2

WIP