Reordering file structure