reorganized files, added in edit function-Fuyao