fixed
renamed model and controller
fixed