updated structure to PSR-0