rearranged folder and remove some file