WIP new note XML parser & refactor to adaptor.

normalization working with tests.