Move callback to the root
Rename