Refactor a few modules for better style

Always name the file the same thing as whatever it's exporting, but in snake_case, of course.