Preliminary work for annotation transformer

16 files changed