Refactor models using Struct.