moved some changes from gradle-plugin template