Move annotators into single directory