fix file tree and rm redundant files