Moved listeners into new package, improved others