Fix imports

Part of #34 (doesn't cover class/function moves).