Package now follows psr-0 guidelines