Fix import path and add missing file.