[git]cleanup various files, and renamed