rename some code and remove redundant file