Refactoring event listener registries preparing Droid