Re-organized imports to avoid dependencies check breaking the package install

This fixes issue #7
Merge pull request #8 from hamstah/master

Fixes issue #7