Revert "More files/directory renaming."
This reverts commit afe812e2c203cf71894cfa30efd2e5659a913996.