They are closely related, so let's move them together, and clean up the .c file naming while we are at it.