Move listeners to seperate package
Update for 1.6