Revert "Files moved for purposes of sanity."

This reverts commit 25dc4c8a0d17e350613f08105ff6225390fa8c73.