Changes in file layout