Fixing imports

will need to continue on rpi