Revert "Lots of changes regarding file names; for checking who did what, see the previous version."

This reverts commit 13a03d4e1d1561c0c0f37e18cb291c8836851712.