This renames a couple of files to better reflect their current contents, and moves a type. No lines of code actually changed.