some files renamed and callback functions calling
merge