refactor models.{} to models.master.{}