Updated layout of the files