Switch to snake case and clean up import order

Closes #2