moving to gradle folder structure and newer tools