[FIX] Wrong imports after refactor