Reformat and organize imports.
Merge pull request #19 from a0x77n/dev

Format and organize imports.