More imports, normalize constructor names in type-structs