Merge change 2574

* changes:
  Sim-only files move, part 2/2.