redid file organization
fixed conflicts