Refactoring to gradle portal standard convention. fixing deps