adapt to new gradle plugin and dir structure