Migrate to gradle structure dir