There were a couple files missing, and a bunch that are no longer needed there.
Closes #356 (closed).