Beta 6: Coversion to Gradle