Revert "For testing, get rid of extra files."

This reverts commit 35d9e225dc01b12c682c08393d9ffda9d7d376d9.
Try this again...