Many a changes

convert to Gradle