Move Ada keywords to ada_defs
Rename
Rename
Remove logger