Rename the template VCs and File Group organization