See #517 and #663 for background. Feel free to add your commentary there, but again, I think we should merge the directory changes without the `spec_prereq` changes.