some rearrangement in structure of files