Removed messy annotation extractor and rebuilt tokens by their requirements in order to allow for improved implementation of the annotation extractor.