Fixing imports after the recent views/ refactor