modified structure to match gradle structure