Moved the listeners.

Signed-off-by: georgePadolsey <georgepadolsey@gmail.com>