Switched to PSR-0
Changed namespace for generator