Fixed gradle build
Fixed gradle and started new base line