moving to gradle structure