Fix imports and paths