Partly converted to a more generic data structure making jazzr and essen models obsolete. Added annotation views