Fix package structure of TypeRef