add groovy and spock support, add directories
fix merge conflicts