Refactoring for new annotation-message structure and location

Also includes fixes for other NexSON changes, esp. multi-tree imports that result in one supporting file associated with multiple trees.