Moved listeners in own package