Changed a significant portion of the file naming conventions in order to avoid duplicate smartnets.  Didn't realize exactly how the grc block namespace worked before.
Including modified and deleted things as well.