Move simple-annotate to own directory