Fixing imports after refactory