fixed gradle builds, simplified gradle build file