move rogue Field and Index into core project