[FIX] Missed reverting a few imports to relative import