Moving around files and working some more on Groovy Unit Tests.
Fixed Groovy annotation bug for Unit Testing and library link issues.