cleanup

You should also probably move the .groovy files in src/java to src/groovy