re structure file layout