Merge pull request #2007 from lioncash/si Core: Move several files into the correct VS directory filter.
