Moved annotations to groovy source dir
Groovy-nized the annotation files