Fix imports and errors with packages
Merge branch 'fix_imports'