Rearrange

rearrange the file structure