Turn class imports into proper imports.