move/remove some files not fit here;
start to combine those two parts