Reorganizing consort.
Migrated annotation logic into tools/annotationtools.