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

This fixes issue #7