Clean up leftovers from rearranging files, as per previous commit
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904