Fixed imports and classes following holoviews refactor