Annotations moved to seperate folder. Rearranged interface to the cache and measuring.