renamed and combined some file