Remodeling to Gradle