Updating to PSR-4 strcucture