further refinemenets to the file layout