Add ability to feature flip callmeback with new directives
Remove legacy callback files
Callback spelling fix