rearrange all the files more concise