Added annotation, application, edit, editor, recording and work access. Tidied up hierarchy.