Move some files around so that the names better match the expected behavior.