Moved all groovy files to the groovy directories