Changed index generator to match new structure or projects