Fix imports so they work when installed