Enhance directory layout, add Groovy, fix broken test