Add Phones folder
fixed conflicts in controller