Fix missing imports and erroneously named files.