Beta 6: Migration to Gradle