Move watch responsibility to gradle