Reverted back to PSR-0 code style