0.6.0 - split into module and listener