Changed to new Gradle setup. Moved over WD code