Various changes in the structure of the files