Change import names to match package
Merge pull request #2 from zenweasel/master

Change import names to match package