File structure reshuffle