Transitioned to Gradle based project