moved annotation classes to annotation file. added annotation reader test.