Refactor a bunch of imports and rename some stuff
Merge pull request #4 from nvanderw/master

Change a bunch of imports and rename some stuff