Fixing imports after refactor