Migrated to Gradle build