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

This reverts commit a92f45c3af5aebd135614dd3100dee9ca1902ec2.