Moved the listeners.

Signed-off-by: georgePadolsey <georgepadolsey@gmail.com>

Just As a reference with all the SQL references. If you see code patterns emerging then create a method for it. You have a ridiculously long plugin because of that and plainly because of time I won't fix that for you :P