Refactor models.
Added Massage controller.