Fix Service + switch to gradle