Refactor company and address models