misc: tweak style

[saghul]

• Remove blank lines in same import category blocks (usort leaves them in)
• Use snake_case for file names